TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Themes refactored

Browse Source
This commit is contained in:
serso
2015-02-07 18:06:03 +01:00
parent 323011391c
commit c46a276f3f
87 changed files with 346 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
android-app/src/main/res/values/attributes.xml
View File

@@ -23,17 +23,10 @@
<resources>
<attr name="cpp_digit_button_style" format="reference"/>
<attr name="cpp_control_button_style" format="reference"/>
<attr name="cpp_control_image_button_style" format="reference"/>
<attr name="cpp_operation_button_style" format="reference"/>
<attr name="cpp_fragment_layout_style" format="reference"/>
<attr name="cpp_fragment_title_style" format="reference"/>
<attr name="cpp_button_style" format="reference"/>
<attr name="cpp_pane_style" format="reference"/>
<attr name="cpp_pane_style_transparent" format="reference"/>
<attr name="cpp_main_layout_style" format="reference"/>
<attr name="cpp_main_multi_pane_layout_style" format="reference"/>
<attr name="cpp_button_style_digit" format="reference"/>
<attr name="cpp_button_style_control" format="reference"/>
<attr name="cpp_button_style_control_image" format="reference"/>
<attr name="cpp_button_style_operation" format="reference"/>
<attr name="cpp_main_bg" format="reference"/>
</resources>

113
android-app/src/main/res/values/styles.xml
View File

@@ -40,16 +40,7 @@
<item name="android:textSize">@dimen/cpp_text_size</item>
</style>
<style name="cpp_button_style">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:focusable">true</item>
<item name="android:background">@drawable/metro_blue_button</item>
<item name="android:textSize">@dimen/cpp_button_text_size</item>
<item name="android:textColor">@color/cpp_button_text</item>
</style>
<style name="cpp_keyboard_button_style">
<style name="CppKeyboardButton">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_weight">1</item>
@@ -62,7 +53,7 @@
<item name="android:scaleType">centerInside</item>
</style>
<style name="cpp_onscreen_editor_style" parent="cpp_editor_style">
<style name="cpp_onscreen_editor_style" parent="CppText.Editor">
<item name="android:ellipsize">none</item>
<item name="android:singleLine">true</item>
<item name="android:maxLines">1</item>
@@ -71,7 +62,7 @@
<item name="android:scrollbars">horizontal</item>
</style>
<style name="cpp_editor_style" parent="cpp_default_text">
<style name="CppText.Editor" parent="CppText">
<item name="android:text">""</item>
<item name="android:gravity">left|top</item>
<item name="android:layout_width">fill_parent</item>
@@ -79,22 +70,22 @@
<item name="android:textSize">@dimen/cpp_editor_text_size</item>
</style>
<style name="cpp_editor_mobile_style" parent="cpp_editor_style">
<style name="CppText.Editor.Mobile" parent="CppText.Editor">
<item name="android:textSize">@dimen/cpp_editor_text_size_mobile</item>
</style>
<style name="cpp_display_style" parent="cpp_default_text">
<style name="CppText.Display" parent="CppText">
<item name="android:gravity">top|right</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:textSize">@dimen/cpp_display_text_size</item>
</style>
<style name="cpp_onscreen_display_style" parent="cpp_display_style">
<style name="CppText.Display.Onscreen" parent="CppText.Display">
<item name="android:textSize">@dimen/cpp_onscreen_display_text_size</item>
</style>
<style name="cpp_about_style" parent="cpp_default_text">
<style name="CppText.About" parent="CppText">
<item name="android:gravity">center</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
@@ -102,12 +93,11 @@
<item name="android:padding">5dp</item>
</style>
<style name="cpp_default_text">
<style name="CppText">
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@color/cpp_text</item>
</style>
<style name="cpp_simple_metro_digit_button_style" parent="metro_digit_button_style">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
<item name="android:background">@drawable/metro_widget_button_dark</item>
@@ -127,21 +117,21 @@
<item name="android:background">@drawable/metro_widget_button_light</item>
</style>
<style name="cpp_widget_main_layout_style" parent="cpp_default_main_layout_style">
<style name="cpp_widget_main_layout_style" parent="CppMain">
<item name="android:background">@color/cpp_main_bg</item>
<item name="android:padding">1dp</item>
<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
</style>
<style name="cpp_widget_editor_style" parent="cpp_editor_style">
<style name="cpp_widget_editor_style" parent="CppText.Editor">
<item name="android:textSize">@dimen/cpp_widget_editor_text_size</item>
</style>
<style name="cpp_widget_display_style" parent="cpp_display_style">
<style name="cpp_widget_display_style" parent="CppText.Display">
<item name="android:textSize">@dimen/cpp_widget_display_text_size</item>
</style>
<style name="cpp_onscreen_main_layout_style" parent="cpp_default_main_layout_style">
<style name="cpp_onscreen_main_layout_style" parent="CppMain">
<item name="android:background">@color/cpp_main_bg</item>
<item name="android:padding">1dp</item>
</style>
@@ -201,4 +191,83 @@
<item name="materialColor">@color/cpp_wizard_button_selector</item>
<item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
</style>
<style name="CppFragmentTitle">
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">@dimen/cpp_fragment_title_text_size</item>
<item name="android:paddingLeft">@dimen/cpp_pane_margin</item>
</style>
<style name="CppPaneStyle">
<item name="android:layout_marginLeft">@dimen/cpp_pane_margin</item>
<item name="android:layout_marginTop">@dimen/cpp_pane_margin</item>
<item name="android:padding">@dimen/cpp_pane_padding</item>
<item name="android:background">@drawable/pane_background</item>
</style>
<style name="CppPaneStyle.Transparent" parent="CppPaneStyle">
<item name="android:background">@android:color/transparent</item>
<item name="android:padding">0dp</item>
</style>
<style name="CppMain">
<item name="android:baselineAligned">false</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">match_parent</item>
</style>
<style name="CppMain.Multipane" parent="CppMain">
<item name="android:paddingRight">@dimen/cpp_pane_padding</item>
<item name="android:paddingBottom">@dimen/cpp_pane_padding</item>
</style>
<style name="CppFragment">
<item name="android:layout_margin">0dp</item>
<item name="android:padding">0dp</item>
<item name="android:orientation">vertical</item>
</style>
<style name="CppDialog">
<item name="android:padding">6dp</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:orientation">vertical</item>
<item name="android:layout_gravity">center_horizontal</item>
</style>
<style name="CppListViewItem">
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:paddingBottom">20dp</item>
<item name="android:paddingTop">20dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:minHeight">72dp</item>
<item name="android:gravity">center_vertical|left</item>
</style>
<style name="CppFab">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">bottom|end</item>
<item name="android:layout_margin">16dp</item>
<item name="fab_colorNormal">@color/cpp_metro_button</item>
<item name="fab_colorPressed">@color/cpp_metro_button</item>
<item name="fab_colorRipple">?attr/colorControlHighlight</item>
</style>
<style name="CppListView">
<item name="android:id">@android:id/list</item>
<item name="android:dividerHeight">1px</item>
<item name="android:divider">@color/cpp_list_divider</item>
<item name="android:cacheColorHint">@android:color/transparent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:fadingEdge">none</item>
<item name="android:paddingLeft">@dimen/cpp_pane_padding</item>
<item name="android:paddingRight">@dimen/cpp_pane_padding</item>
<item name="android:layout_marginBottom">@dimen/cpp_pane_padding</item>
</style>
</resources>

27
android-app/src/main/res/values/theme.xml
View File

@@ -22,26 +22,35 @@
<resources>
<style name="Theme" parent="Theme.Base"></style>
<style name="Theme.Dialog" parent="Theme.Base.Dialog"></style>
<style name="Cpp.Theme" parent="Cpp.Theme.Base"/>
<style name="Theme.Base" parent="@style/Theme.AppCompat"></style>
<style name="Theme.Base.Dialog" parent="@style/Theme.AppCompat.Dialog">
<style name="Cpp.Theme.Dialog" parent="Cpp.Theme.Base.Dialog"/>
<style name="Cpp.Theme.Base" parent="@style/Theme.AppCompat">
<item name="android:windowBackground">@color/cpp_main_bg</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
</style>
<style name="Cpp.Theme.Base.Dialog" parent="@style/Theme.AppCompat.Dialog">
<item name="android:windowNoTitle">false</item>
<item name="android:windowTitleBackgroundStyle">@android:color/transparent</item>
<item name="windowActionBar">false</item>
<item name="android:windowCloseOnTouchOutside">false</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
</style>
<style name="Theme.Wizard.Purchase" parent="cpp_metro_blue_theme">
<style name="Cpp.Theme.Wizard.Purchase" parent="cpp_metro_blue_theme">
<item name="android:windowNoTitle">true</item>
<item name="android:background">@color/cpp_metro_button_light</item>
</style>
<style name="Theme.Wizard" parent="@style/cpp_metro_blue_theme">
<style name="Cpp.Theme.Wizard" parent="@style/cpp_metro_blue_theme">
<item name="android:windowBackground">@color/cpp_wizard_bg</item>
</style>
<style name="Theme.Settings.Base" parent="@style/cpp_metro_blue_theme">
<style name="Cpp.Theme.Settings.Base" parent="@style/cpp_metro_blue_theme">
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionBar">false</item>
<item name="toolbarStyle">@style/Widget.Toolbar</item>
@@ -49,8 +58,8 @@
<item name="android:textColorSecondary">@color/cpp_wizard_secondary</item>
<item name="android:textColorPrimary">@color/cpp_wizard_primary</item>
</style>
<style name="Theme.Settings" parent="Theme.Settings.Base">
</style>
<style name="Cpp.Theme.Settings" parent="Cpp.Theme.Settings.Base"/>
<style name="Widget.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
<item name="android:background">?attr/colorPrimary</item>

173
android-app/src/main/res/values/theme_gray.xml
View File

@@ -1,173 +0,0 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<resources>
<style name="cpp_default_digit_button_style" parent="cpp_keyboard_button_style">
<item name="android:background">@drawable/gray_button</item>
</style>
<style name="cpp_dialog">
<item name="android:padding">6dp</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:orientation">vertical</item>
<item name="android:layout_gravity">center_horizontal</item>
</style>
<style name="cpp_default_control_button_style" parent="cpp_keyboard_button_style">
<item name="android:background">@drawable/gray_button_dark</item>
</style>
<style name="cpp_default_operation_button_style" parent="cpp_default_digit_button_style">
<item name="android:textColor">@color/cpp_button_text_operator</item>
</style>
<style name="cpp_default_control_image_button_style" parent="cpp_default_control_button_style">
<item name="android:padding">6dp</item>
</style>
<style name="ListViewItem">
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:paddingBottom">20dp</item>
<item name="android:paddingTop">20dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:minHeight">72dp</item>
<item name="android:gravity">center_vertical|left</item>
</style>
<style name="Fab">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">bottom|end</item>
<item name="android:layout_margin">16dp</item>
<item name="fab_colorNormal">@color/cpp_metro_button</item>
<item name="fab_colorPressed">@color/cpp_metro_button</item>
<item name="fab_colorRipple">?attr/colorControlHighlight</item>
</style>
<style name="ListView">
<item name="android:id">@android:id/list</item>
<item name="android:dividerHeight">1px</item>
<item name="android:divider">@color/cpp_list_divider</item>
<item name="android:cacheColorHint">@android:color/transparent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:fadingEdge">none</item>
<item name="android:paddingLeft">@dimen/cpp_pane_padding</item>
<item name="android:paddingRight">@dimen/cpp_pane_padding</item>
<item name="android:layout_marginBottom">@dimen/cpp_pane_padding</item>
</style>
<style name="cpp_default_fragment_title_style">
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">@dimen/cpp_fragment_title_text_size</item>
<item name="android:paddingLeft">@dimen/cpp_pane_margin</item>
</style>
<style name="cpp_default_button_style" parent="cpp_button_style">
<item name="android:paddingTop">5dp</item>
<item name="android:paddingBottom">5dp</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:paddingRight">10dp</item>
</style>
<style name="cpp_default_pane_style_transparent" parent="cpp_default_pane_style">
<item name="android:background">@android:color/transparent</item>
<item name="android:padding">0dp</item>
</style>
<style name="cpp_default_pane_style">
<item name="android:layout_marginLeft">@dimen/cpp_pane_margin</item>
<item name="android:layout_marginTop">@dimen/cpp_pane_margin</item>
<item name="android:padding">@dimen/cpp_pane_padding</item>
<item name="android:background">@drawable/pane_background</item>
</style>
<style name="cpp_default_main_multi_pane_layout_style" parent="cpp_default_main_layout_style">
<item name="android:paddingRight">@dimen/cpp_pane_padding</item>
<item name="android:paddingBottom">@dimen/cpp_pane_padding</item>
</style>
<style name="cpp_default_fragment_multi_pane_layout_style" parent="cpp_default_fragment_layout_style"></style>
<style name="cpp_default_fragment_layout_style">
<item name="android:layout_margin">0dp</item>
<item name="android:padding">0dp</item>
<item name="android:orientation">vertical</item>
</style>
<style name="cpp_default_main_layout_style">
<item name="android:baselineAligned">false</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">match_parent</item>
</style>
<style name="cpp_gray_theme" parent="Theme">
<item name="android:windowBackground">@color/cpp_main_bg</item>
<!-- buttons -->
<item name="cpp_digit_button_style">@style/cpp_default_digit_button_style</item>
<item name="cpp_control_button_style">@style/cpp_default_control_button_style</item>
<item name="cpp_control_image_button_style">@style/cpp_default_control_image_button_style</item>
<item name="cpp_operation_button_style">@style/cpp_default_operation_button_style</item>
<!-- other -->
<item name="cpp_fragment_title_style">@style/cpp_default_fragment_title_style</item>
<item name="cpp_button_style">@style/cpp_default_button_style</item>
<item name="cpp_main_layout_style">@style/cpp_default_main_layout_style</item>
<item name="cpp_main_multi_pane_layout_style">@style/cpp_default_main_multi_pane_layout_style</item>
<item name="cpp_fragment_layout_style">@style/cpp_default_fragment_layout_style</item>
<item name="cpp_pane_style">@style/cpp_default_pane_style</item>
<item name="cpp_pane_style_transparent">@style/cpp_default_pane_style_transparent</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
</style>
<style name="cpp_gray_dialog_theme" parent="Theme.Dialog">
<item name="android:windowCloseOnTouchOutside">false</item>
<!-- buttons -->
<item name="cpp_digit_button_style">@style/cpp_default_digit_button_style</item>
<item name="cpp_control_button_style">@style/cpp_default_control_button_style</item>
<item name="cpp_control_image_button_style">@style/cpp_default_control_image_button_style</item>
<item name="cpp_operation_button_style">@style/cpp_default_operation_button_style</item>
<!-- other -->
<item name="cpp_fragment_title_style">@style/cpp_default_fragment_title_style</item>
<item name="cpp_button_style">@style/cpp_default_button_style</item>
<item name="cpp_main_layout_style">@style/cpp_default_main_layout_style</item>
<item name="cpp_main_multi_pane_layout_style">@style/cpp_default_main_multi_pane_layout_style</item>
<item name="cpp_fragment_layout_style">@style/cpp_default_fragment_layout_style</item>
<item name="cpp_pane_style">@style/cpp_default_pane_style</item>
<item name="cpp_pane_style_transparent">@style/cpp_default_pane_style_transparent</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
</style>
</resources>

22
android-app/src/main/res/values/theme_metro_blue.xml
View File

@@ -22,7 +22,7 @@
<resources>
<style name="metro_digit_button_style" parent="cpp_keyboard_button_style">
<style name="metro_digit_button_style" parent="CppKeyboardButton">
<item name="android:background">@drawable/metro_button_dark</item>
</style>
@@ -48,18 +48,18 @@
<item name="android:padding">6dp</item>
</style>
<style name="cpp_metro_blue_theme" parent="cpp_gray_theme">
<item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
<item name="cpp_control_button_style">@style/metro_control_button_style</item>
<item name="cpp_control_image_button_style">@style/metro_control_image_button_style</item>
<item name="cpp_operation_button_style">@style/metro_blue_operation_button_style</item>
<style name="cpp_metro_blue_theme" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/metro_digit_button_style</item>
<item name="cpp_button_style_control">@style/metro_control_button_style</item>
<item name="cpp_button_style_control_image">@style/metro_control_image_button_style</item>
<item name="cpp_button_style_operation">@style/metro_blue_operation_button_style</item>
</style>
<style name="cpp_metro_blue_dialog_theme" parent="cpp_gray_dialog_theme">
<item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
<item name="cpp_control_button_style">@style/metro_control_button_style</item>
<item name="cpp_control_image_button_style">@style/metro_control_image_button_style</item>
<item name="cpp_operation_button_style">@style/metro_blue_operation_button_style</item>
<style name="Cpp.Theme.Dialog.Material" parent="Cpp.Theme.Dialog">
<item name="cpp_button_style_digit">@style/metro_digit_button_style</item>
<item name="cpp_button_style_control">@style/metro_control_button_style</item>
<item name="cpp_button_style_control_image">@style/metro_control_image_button_style</item>
<item name="cpp_button_style_operation">@style/metro_blue_operation_button_style</item>
</style>
</resources>

2
android-app/src/main/res/values/theme_metro_green.xml
View File

@@ -27,7 +27,7 @@
</style>
<style name="cpp_metro_green_theme" parent="cpp_metro_blue_theme">
<item name="cpp_operation_button_style">@style/metro_green_operation_button_style</item>
<item name="cpp_button_style_operation">@style/metro_green_operation_button_style</item>
</style>
</resources>

2
android-app/src/main/res/values/theme_metro_purple.xml
View File

@@ -27,7 +27,7 @@
</style>
<style name="cpp_metro_purple_theme" parent="cpp_metro_blue_theme">
<item name="cpp_operation_button_style">@style/metro_purple_operation_button_style</item>
<item name="cpp_button_style_operation">@style/metro_purple_operation_button_style</item>
</style>
</resources>

18
android-app/src/main/res/values/theme_light_blue.xml → android-app/src/main/res/values/theme_old_blue.xml
View File

@@ -22,27 +22,27 @@
<resources>
<style name="light_blue_digit_button_style" parent="cpp_keyboard_button_style">
<style name="CppKeyboardButton.Blue.Digit" parent="CppKeyboardButton">
<item name="android:background">@drawable/blue_button</item>
</style>
<style name="light_blue_control_button_style" parent="cpp_keyboard_button_style">
<style name="CppKeyboardButton.Blue.Control" parent="CppKeyboardButton">
<item name="android:background">@drawable/blue_button_dark</item>
</style>
<style name="light_blue_operation_button_style" parent="light_blue_digit_button_style">
<style name="CppKeyboardButton.Blue.Operation" parent="CppKeyboardButton.Blue.Digit">
<item name="android:textColor">@color/cpp_button_text_operator</item>
</style>
<style name="light_blue_control_image_button_style" parent="light_blue_control_button_style">
<style name="CppKeyboardButton.Blue.Control.Image" parent="CppKeyboardButton.Blue.Control">
<item name="android:padding">6dp</item>
</style>
<style name="cpp_light_blue_theme" parent="cpp_gray_theme">
<item name="cpp_digit_button_style">@style/light_blue_digit_button_style</item>
<item name="cpp_control_button_style">@style/light_blue_control_button_style</item>
<item name="cpp_control_image_button_style">@style/light_blue_control_image_button_style</item>
<item name="cpp_operation_button_style">@style/light_blue_operation_button_style</item>
<style name="Cpp.Theme.Blue" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Blue.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Blue.Control</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Blue.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Blue.Operation</item>
</style>
</resources>

55
android-app/src/main/res/values/theme_old_gray.xml Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<resources>
<style name="CppKeyboardButton.Gray.Digit" parent="CppKeyboardButton">
<item name="android:background">@drawable/gray_button</item>
</style>
<style name="CppKeyboardButton.Gray.Control" parent="CppKeyboardButton">
<item name="android:background">@drawable/gray_button_dark</item>
</style>
<style name="CppKeyboardButton.Gray.Operation" parent="CppKeyboardButton.Gray.Digit">
<item name="android:textColor">@color/cpp_button_text_operator</item>
</style>
<style name="CppKeyboardButton.Gray.Control.Image" parent="CppKeyboardButton.Gray.Control">
<item name="android:padding">6dp</item>
</style>
<style name="Cpp.Theme.Gray" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Gray.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Gray.Control</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Gray.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Gray.Operation</item>
</style>
<style name="Cpp.Theme.Dialog.Gray" parent="Cpp.Theme.Dialog">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Gray.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Gray.Control</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Gray.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Gray.Operation</item>
</style>
</resources>

18
android-app/src/main/res/values/theme_violet.xml → android-app/src/main/res/values/theme_old_violet.xml
View File

@@ -22,26 +22,26 @@
<resources>
<style name="violet_digit_button_style" parent="cpp_keyboard_button_style">
<style name="CppKeyboardButton.Violet.Digit" parent="CppKeyboardButton">
<item name="android:background">@drawable/violet_button</item>
</style>
<style name="violet_operation_button_style" parent="violet_digit_button_style">
<style name="CppKeyboardButton.Violet.Operation" parent="CppKeyboardButton.Violet.Digit">
<item name="android:textColor">@color/cpp_button_text_operator</item>
</style>
<style name="violet_control_button_style" parent="cpp_keyboard_button_style">
<style name="CppKeyboardButton.Violet.Control" parent="CppKeyboardButton">
<item name="android:background">@drawable/violet_button_dark</item>
</style>
<style name="violet_control_image_button_style" parent="violet_control_button_style">
<style name="CppKeyboardButton.Violet.Control.Image" parent="CppKeyboardButton.Violet.Control">
<item name="android:padding">6dp</item>
</style>
<style name="cpp_violet_theme" parent="cpp_gray_theme">
<item name="cpp_digit_button_style">@style/violet_digit_button_style</item>
<item name="cpp_control_button_style">@style/violet_control_button_style</item>
<item name="cpp_control_image_button_style">@style/violet_control_image_button_style</item>
<item name="cpp_operation_button_style">@style/violet_operation_button_style</item>
<style name="Cpp.Theme.Violet" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Violet.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Violet.Control</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Violet.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Violet.Operation</item>
</style>
</resources>