diff --git a/android-app/src/main/AndroidManifest.xml b/android-app/src/main/AndroidManifest.xml
index a5dddd38..491b5f15 100644
--- a/android-app/src/main/AndroidManifest.xml
+++ b/android-app/src/main/AndroidManifest.xml
@@ -46,11 +46,11 @@
-
+
-
+
@@ -60,20 +60,20 @@
-
+
-
-
-
+
+
+
-
+
-
+
@@ -89,11 +89,11 @@
-
+
-
+
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java b/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
index 5eb1a880..ced401c6 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
@@ -101,13 +101,13 @@ public final class Preferences {
public static enum Theme {
- default_theme(R.style.cpp_gray_theme, R.style.Theme_Wizard),
- violet_theme(R.style.cpp_violet_theme, R.style.Theme_Wizard),
- light_blue_theme(R.style.cpp_light_blue_theme, R.style.Theme_Wizard),
- metro_blue_theme(R.style.cpp_metro_blue_theme, R.style.Theme_Wizard),
- metro_purple_theme(R.style.cpp_metro_purple_theme, R.style.Theme_Wizard),
- metro_green_theme(R.style.cpp_metro_green_theme, R.style.Theme_Wizard),
- material_theme(R.style.cpp_material_theme, R.style.Theme_Wizard),
+ default_theme(R.style.Cpp_Theme_Gray, R.style.Cpp_Theme_Wizard),
+ violet_theme(R.style.Cpp_Theme_Violet, R.style.Cpp_Theme_Wizard),
+ light_blue_theme(R.style.Cpp_Theme_Blue, R.style.Cpp_Theme_Wizard),
+ metro_blue_theme(R.style.cpp_metro_blue_theme, R.style.Cpp_Theme_Wizard),
+ metro_purple_theme(R.style.cpp_metro_purple_theme, R.style.Cpp_Theme_Wizard),
+ metro_green_theme(R.style.cpp_metro_green_theme, R.style.Cpp_Theme_Wizard),
+ material_theme(R.style.Cpp_Theme_Material, R.style.Cpp_Theme_Wizard),
;
private final int themeId;
diff --git a/android-app/src/main/res/layout-land/main_calculator.xml b/android-app/src/main/res/layout-land/main_calculator.xml
index 22e0e676..439d9af0 100644
--- a/android-app/src/main/res/layout-land/main_calculator.xml
+++ b/android-app/src/main/res/layout-land/main_calculator.xml
@@ -24,7 +24,7 @@
+ style="@style/CppMain">
diff --git a/android-app/src/main/res/layout-land/main_calculator_mobile.xml b/android-app/src/main/res/layout-land/main_calculator_mobile.xml
index 010d17a0..0d0a9616 100644
--- a/android-app/src/main/res/layout-land/main_calculator_mobile.xml
+++ b/android-app/src/main/res/layout-land/main_calculator_mobile.xml
@@ -24,7 +24,7 @@
+ style="@style/CppMain">
diff --git a/android-app/src/main/res/layout-large-land/main_calculator.xml b/android-app/src/main/res/layout-large-land/main_calculator.xml
index 6d1335c3..964055e8 100644
--- a/android-app/src/main/res/layout-large-land/main_calculator.xml
+++ b/android-app/src/main/res/layout-large-land/main_calculator.xml
@@ -24,7 +24,7 @@
+ style="@style/CppMain.Multipane">
@@ -62,7 +62,7 @@
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
- style="?cpp_pane_style"/>
+ style="@style/CppPaneStyle"/>
@@ -71,6 +71,6 @@
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="2"
- style="?cpp_pane_style_transparent"/>
+ style="@style/CppPaneStyle.Transparent"/>
diff --git a/android-app/src/main/res/layout-large/cpp_app_display.xml b/android-app/src/main/res/layout-large/cpp_app_display.xml
index 58045b62..a092ad2d 100644
--- a/android-app/src/main/res/layout-large/cpp_app_display.xml
+++ b/android-app/src/main/res/layout-large/cpp_app_display.xml
@@ -24,7 +24,7 @@
@@ -32,11 +32,11 @@
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
- style="?cpp_fragment_title_style"/>
+ style="@style/CppFragmentTitle"/>
@@ -32,11 +32,11 @@
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
- style="?cpp_fragment_title_style"/>
+ style="@style/CppFragmentTitle"/>
+ style="@style/CppMain.Multipane">
@@ -62,7 +62,7 @@
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
- style="?cpp_pane_style"/>
+ style="@style/CppPaneStyle"/>
@@ -71,6 +71,6 @@
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="2"
- style="?cpp_pane_style_transparent"/>
+ style="@style/CppPaneStyle.Transparent"/>
diff --git a/android-app/src/main/res/layout-xlarge-land/main_calculator.xml b/android-app/src/main/res/layout-xlarge-land/main_calculator.xml
index 5ee4e95b..253afd97 100644
--- a/android-app/src/main/res/layout-xlarge-land/main_calculator.xml
+++ b/android-app/src/main/res/layout-xlarge-land/main_calculator.xml
@@ -24,7 +24,7 @@
+ style="@style/CppMain.Multipane">
@@ -62,7 +62,7 @@
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
- style="?cpp_pane_style"/>
+ style="@style/CppPaneStyle"/>
@@ -71,6 +71,6 @@
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="1"
- style="?cpp_pane_style_transparent"/>
+ style="@style/CppPaneStyle.Transparent"/>
diff --git a/android-app/src/main/res/layout-xlarge/cpp_app_display.xml b/android-app/src/main/res/layout-xlarge/cpp_app_display.xml
index 58045b62..a092ad2d 100644
--- a/android-app/src/main/res/layout-xlarge/cpp_app_display.xml
+++ b/android-app/src/main/res/layout-xlarge/cpp_app_display.xml
@@ -24,7 +24,7 @@
@@ -32,11 +32,11 @@
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
- style="?cpp_fragment_title_style"/>
+ style="@style/CppFragmentTitle"/>
@@ -32,11 +32,11 @@
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
- style="?cpp_fragment_title_style"/>
+ style="@style/CppFragmentTitle"/>
+ style="@style/CppMain.Multipane">
@@ -62,7 +62,7 @@
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
- style="?cpp_pane_style"/>
+ style="@style/CppPaneStyle"/>
@@ -71,6 +71,6 @@
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="1"
- style="?cpp_pane_style_transparent"/>
+ style="@style/CppPaneStyle.Transparent"/>
diff --git a/android-app/src/main/res/layout/about_fragment.xml b/android-app/src/main/res/layout/about_fragment.xml
index ce76decb..450e8d89 100644
--- a/android-app/src/main/res/layout/about_fragment.xml
+++ b/android-app/src/main/res/layout/about_fragment.xml
@@ -51,7 +51,7 @@
a:text="@string/c_about_content"
a:layout_height="match_parent"
a:layout_width="match_parent"
- style="@style/cpp_about_style" />
+ style="@style/CppText.About" />
+ style="@style/CppText.About" />
+ style="@style/CppText.About" />
diff --git a/android-app/src/main/res/layout/cpp_app_button_0.xml b/android-app/src/main/res/layout/cpp_app_button_0.xml
index b127c190..78169b15 100644
--- a/android-app/src/main/res/layout/cpp_app_button_0.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_0.xml
@@ -29,4 +29,4 @@
a:text="0"
c:textDown="000"
c:directionTextScale="0.5"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_1.xml b/android-app/src/main/res/layout/cpp_app_button_1.xml
index b26f801e..64731c97 100644
--- a/android-app/src/main/res/layout/cpp_app_button_1.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_1.xml
@@ -29,4 +29,4 @@
c:textUp="sin"
c:textLeft="A"
c:textDown="asin"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_2.xml b/android-app/src/main/res/layout/cpp_app_button_2.xml
index 5aaf4526..9404148d 100644
--- a/android-app/src/main/res/layout/cpp_app_button_2.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_2.xml
@@ -29,4 +29,4 @@
c:textUp="cos"
c:textLeft="B"
c:textDown="acos"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_3.xml b/android-app/src/main/res/layout/cpp_app_button_3.xml
index 5ce477a1..b56b7bf4 100644
--- a/android-app/src/main/res/layout/cpp_app_button_3.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_3.xml
@@ -29,4 +29,4 @@
c:textUp="tan"
c:textLeft="C"
c:textDown="atan"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_4.xml b/android-app/src/main/res/layout/cpp_app_button_4.xml
index ff52122e..7e222325 100644
--- a/android-app/src/main/res/layout/cpp_app_button_4.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_4.xml
@@ -28,4 +28,4 @@
c:textUp="x"
c:textLeft="D"
c:textDown="y"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_5.xml b/android-app/src/main/res/layout/cpp_app_button_5.xml
index cead4e30..6696b00e 100644
--- a/android-app/src/main/res/layout/cpp_app_button_5.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_5.xml
@@ -28,4 +28,4 @@
c:textUp="t"
c:textLeft="E"
c:textDown="j"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_6.xml b/android-app/src/main/res/layout/cpp_app_button_6.xml
index 595d1013..8edf82f9 100644
--- a/android-app/src/main/res/layout/cpp_app_button_6.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_6.xml
@@ -30,4 +30,4 @@
c:textLeft="F"
c:textDown="rad"
c:directionTextScale="0.33;0.30;0.33;0.33"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_7.xml b/android-app/src/main/res/layout/cpp_app_button_7.xml
index f9476f18..4654e753 100644
--- a/android-app/src/main/res/layout/cpp_app_button_7.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_7.xml
@@ -30,4 +30,4 @@
c:textLeft="0b:"
c:textDown="!"
c:directionTextScale="0.5;0.5;0.5;0.33"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_8.xml b/android-app/src/main/res/layout/cpp_app_button_8.xml
index ecf5e237..2dea06ed 100644
--- a/android-app/src/main/res/layout/cpp_app_button_8.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_8.xml
@@ -30,4 +30,4 @@
c:textLeft="0d:"
c:textDown="lg"
c:directionTextScale="0.5;0.5;0.5;0.33"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_9.xml b/android-app/src/main/res/layout/cpp_app_button_9.xml
index e74543e8..00c1aec5 100644
--- a/android-app/src/main/res/layout/cpp_app_button_9.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_9.xml
@@ -30,4 +30,4 @@
c:textLeft="0x:"
c:textUp="π"
c:directionTextScale="0.5;0.5;0.5;0.33"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_clear.xml b/android-app/src/main/res/layout/cpp_app_button_clear.xml
index 7f4814f7..406853fa 100644
--- a/android-app/src/main/res/layout/cpp_app_button_clear.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_clear.xml
@@ -30,4 +30,4 @@
c:textDown="bin"
c:textLeft="hex"
a:textStyle="bold"
- style="?cpp_control_image_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_copy.xml b/android-app/src/main/res/layout/cpp_app_button_copy.xml
index 4e6d97f3..4001d448 100644
--- a/android-app/src/main/res/layout/cpp_app_button_copy.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_copy.xml
@@ -25,4 +25,4 @@
\ No newline at end of file
+ style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_division.xml b/android-app/src/main/res/layout/cpp_app_button_division.xml
index 07fe6c25..81e7deba 100644
--- a/android-app/src/main/res/layout/cpp_app_button_division.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_division.xml
@@ -29,4 +29,4 @@
a:text="/"
c:textDown="√"
c:directionTextScale="0.5"
- style="?cpp_operation_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_operation"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_donate.xml b/android-app/src/main/res/layout/cpp_app_button_donate.xml
index 4b3bf267..b2f8c90d 100644
--- a/android-app/src/main/res/layout/cpp_app_button_donate.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_donate.xml
@@ -25,4 +25,4 @@
\ No newline at end of file
+ style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_dot.xml b/android-app/src/main/res/layout/cpp_app_button_dot.xml
index da2b9201..1db91357 100644
--- a/android-app/src/main/res/layout/cpp_app_button_dot.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_dot.xml
@@ -28,4 +28,4 @@
a:text="."
c:textUp=","
c:directionTextScale="0.5"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_empty.xml b/android-app/src/main/res/layout/cpp_app_button_empty.xml
index 0aab0311..d37328e8 100644
--- a/android-app/src/main/res/layout/cpp_app_button_empty.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_empty.xml
@@ -21,4 +21,4 @@
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_equals.xml b/android-app/src/main/res/layout/cpp_app_button_equals.xml
index 03de2907..615c3d9e 100644
--- a/android-app/src/main/res/layout/cpp_app_button_equals.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_equals.xml
@@ -28,4 +28,4 @@
a:text="="
c:textDown="@string/cpp_plot_button_text"
c:directionTextScale="0.5;0.5;0.33;0.5"
- style="?cpp_control_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_erase.xml b/android-app/src/main/res/layout/cpp_app_button_erase.xml
index 66275c07..351938ec 100644
--- a/android-app/src/main/res/layout/cpp_app_button_erase.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_erase.xml
@@ -25,4 +25,4 @@
\ No newline at end of file
+ style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_functions.xml b/android-app/src/main/res/layout/cpp_app_button_functions.xml
index a91df2a0..c2cf5977 100644
--- a/android-app/src/main/res/layout/cpp_app_button_functions.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_functions.xml
@@ -29,4 +29,4 @@
c:textUp="+ƒ"
a:text="ƒ(x)"
a:textStyle="italic"
- style="?cpp_control_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_history.xml b/android-app/src/main/res/layout/cpp_app_button_history.xml
index 8db1a982..795b853f 100644
--- a/android-app/src/main/res/layout/cpp_app_button_history.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_history.xml
@@ -28,5 +28,5 @@
c:textUp="@string/c_undo"
c:textDown="@string/c_redo"
c:directionTextScale="0.27"
- style="?cpp_control_button_style"
+ style="?attr/cpp_button_style_control"
a:textStyle="bold"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_left.xml b/android-app/src/main/res/layout/cpp_app_button_left.xml
index 8b50fdf1..366ed24b 100644
--- a/android-app/src/main/res/layout/cpp_app_button_left.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_left.xml
@@ -28,4 +28,4 @@
c:textUp="◁◁"
a:text="◁"
c:directionTextScale="0.5"
- style="?cpp_control_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_minus.xml b/android-app/src/main/res/layout/cpp_app_button_minus.xml
index 1a788f36..a002ace1 100644
--- a/android-app/src/main/res/layout/cpp_app_button_minus.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_minus.xml
@@ -27,4 +27,4 @@
c:textDown="∂,…"
a:text="-"
c:directionTextScale="0.4"
- style="?cpp_operation_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_operation"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_multiplication.xml b/android-app/src/main/res/layout/cpp_app_button_multiplication.xml
index e1ad1f11..5b796e09 100644
--- a/android-app/src/main/res/layout/cpp_app_button_multiplication.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_multiplication.xml
@@ -29,5 +29,5 @@
c:textUp="^"
c:textDown="^2"
c:textLeft="Π"
- style="?cpp_operation_button_style"
+ style="?attr/cpp_button_style_operation"
c:directionTextScale="0.5"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_operators.xml b/android-app/src/main/res/layout/cpp_app_button_operators.xml
index 73d260e3..ddfb85aa 100644
--- a/android-app/src/main/res/layout/cpp_app_button_operators.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_operators.xml
@@ -25,4 +25,4 @@
\ No newline at end of file
+ style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_paste.xml b/android-app/src/main/res/layout/cpp_app_button_paste.xml
index c184b789..46eada43 100644
--- a/android-app/src/main/res/layout/cpp_app_button_paste.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_paste.xml
@@ -25,4 +25,4 @@
\ No newline at end of file
+ style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_plus.xml b/android-app/src/main/res/layout/cpp_app_button_plus.xml
index 221e9c29..8e325228 100644
--- a/android-app/src/main/res/layout/cpp_app_button_plus.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_plus.xml
@@ -28,4 +28,4 @@
c:textUp="°"
c:textDown="E"
a:text="+"
- style="?cpp_operation_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_operation"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_right.xml b/android-app/src/main/res/layout/cpp_app_button_right.xml
index 8d4524d4..e8a44f7e 100644
--- a/android-app/src/main/res/layout/cpp_app_button_right.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_right.xml
@@ -28,4 +28,4 @@
c:textUp="▷▷"
a:text="▷"
c:directionTextScale="0.5"
- style="?cpp_control_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml b/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
index 919e47cc..eddb52dd 100644
--- a/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
@@ -30,4 +30,4 @@
c:textDown=")"
c:textLeft="(…)"
c:directionTextScale="0.5;0.5;0.5;0.33"
- style="?cpp_digit_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_vars.xml b/android-app/src/main/res/layout/cpp_app_button_vars.xml
index e8ec4c3a..f57b82b9 100644
--- a/android-app/src/main/res/layout/cpp_app_button_vars.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_vars.xml
@@ -29,4 +29,4 @@
c:textUp="+π"
a:text="π,…"
a:textStyle="italic"
- style="?cpp_control_button_style"/>
\ No newline at end of file
+ style="?attr/cpp_button_style_control"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_display.xml b/android-app/src/main/res/layout/cpp_app_display.xml
index 462bb091..ebbd962e 100644
--- a/android-app/src/main/res/layout/cpp_app_display.xml
+++ b/android-app/src/main/res/layout/cpp_app_display.xml
@@ -24,7 +24,7 @@
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_dialog_fragment.xml b/android-app/src/main/res/layout/cpp_dialog_fragment.xml
index d1a9dd61..fbd5bfa6 100644
--- a/android-app/src/main/res/layout/cpp_dialog_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_dialog_fragment.xml
@@ -24,7 +24,7 @@
+ style="@style/CppDialog">
@@ -32,7 +32,7 @@
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
- style="?cpp_fragment_title_style"/>
+ style="@style/CppFragmentTitle"/>
diff --git a/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml b/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
index 9063d3a1..82a3e35b 100644
--- a/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
+++ b/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
@@ -24,6 +24,6 @@
+ style="@style/CppDialog">
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml b/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
index 998af24a..15371764 100644
--- a/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
@@ -24,7 +24,7 @@
@@ -60,6 +60,6 @@
-
+
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_plot_range_fragment.xml b/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
index dc0e5343..a9dabd0b 100644
--- a/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
@@ -24,7 +24,7 @@
+ style="?attr/cpp_button_style_control" />
diff --git a/android-app/src/main/res/layout/feedback.xml b/android-app/src/main/res/layout/feedback.xml
index 36dd965a..a41a3c61 100644
--- a/android-app/src/main/res/layout/feedback.xml
+++ b/android-app/src/main/res/layout/feedback.xml
@@ -28,7 +28,7 @@
diff --git a/android-app/src/main/res/layout/history_fragment.xml b/android-app/src/main/res/layout/history_fragment.xml
index 8bac8d7d..97608aa7 100644
--- a/android-app/src/main/res/layout/history_fragment.xml
+++ b/android-app/src/main/res/layout/history_fragment.xml
@@ -24,14 +24,14 @@
@@ -41,11 +41,11 @@
a:layout_width="match_parent"
a:layout_height="match_parent">
-
+
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/history_item.xml b/android-app/src/main/res/layout/history_item.xml
index f7cd030f..f30d5cac 100644
--- a/android-app/src/main/res/layout/history_item.xml
+++ b/android-app/src/main/res/layout/history_item.xml
@@ -24,7 +24,7 @@
+ style="@style/CppListViewItem">
+ style="@style/CppMain">
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/main_empty_multi_pane.xml b/android-app/src/main/res/layout/main_empty_multi_pane.xml
index 20359ebc..0b22da69 100644
--- a/android-app/src/main/res/layout/main_empty_multi_pane.xml
+++ b/android-app/src/main/res/layout/main_empty_multi_pane.xml
@@ -24,7 +24,7 @@
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/math_entities_fragment.xml b/android-app/src/main/res/layout/math_entities_fragment.xml
index e7a0c60e..175371a8 100644
--- a/android-app/src/main/res/layout/math_entities_fragment.xml
+++ b/android-app/src/main/res/layout/math_entities_fragment.xml
@@ -24,14 +24,14 @@
@@ -41,11 +41,11 @@
a:layout_width="match_parent"
a:layout_height="match_parent">
-
+
diff --git a/android-app/src/main/res/layout/math_entity.xml b/android-app/src/main/res/layout/math_entity.xml
index f5398f84..b2510c9c 100644
--- a/android-app/src/main/res/layout/math_entity.xml
+++ b/android-app/src/main/res/layout/math_entity.xml
@@ -25,7 +25,7 @@
@@ -34,7 +34,7 @@
a:id="@+id/fragmentTitle"
a:layout_height="wrap_content"
a:layout_width="match_parent"
- style="?cpp_fragment_title_style"/>
+ style="@style/CppFragmentTitle"/>
diff --git a/android-app/src/main/res/layout/notespp_announce.xml b/android-app/src/main/res/layout/notespp_announce.xml
index 0175318e..962005fc 100644
--- a/android-app/src/main/res/layout/notespp_announce.xml
+++ b/android-app/src/main/res/layout/notespp_announce.xml
@@ -28,7 +28,7 @@
diff --git a/android-app/src/main/res/layout/onscreen_display.xml b/android-app/src/main/res/layout/onscreen_display.xml
index 72d8c2ee..d4e21f08 100644
--- a/android-app/src/main/res/layout/onscreen_display.xml
+++ b/android-app/src/main/res/layout/onscreen_display.xml
@@ -8,7 +8,7 @@
diff --git a/android-app/src/main/res/layout/release_notes_fragment.xml b/android-app/src/main/res/layout/release_notes_fragment.xml
index 475cd290..0c66e137 100644
--- a/android-app/src/main/res/layout/release_notes_fragment.xml
+++ b/android-app/src/main/res/layout/release_notes_fragment.xml
@@ -35,7 +35,7 @@
a:layout_weight="1"
a:gravity="top|left"
a:scrollbars="vertical"
- style="@style/cpp_about_style"/>
+ style="@style/CppText.About"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_metro_blue.xml b/android-app/src/main/res/values/theme_metro_blue.xml
index 0f5d301b..913b620a 100644
--- a/android-app/src/main/res/values/theme_metro_blue.xml
+++ b/android-app/src/main/res/values/theme_metro_blue.xml
@@ -22,7 +22,7 @@
-
@@ -48,18 +48,18 @@
- 6dp
-
-
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_metro_green.xml b/android-app/src/main/res/values/theme_metro_green.xml
index 154451fb..4e783016 100644
--- a/android-app/src/main/res/values/theme_metro_green.xml
+++ b/android-app/src/main/res/values/theme_metro_green.xml
@@ -27,7 +27,7 @@
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_metro_purple.xml b/android-app/src/main/res/values/theme_metro_purple.xml
index 9fbab8bc..94e44289 100644
--- a/android-app/src/main/res/values/theme_metro_purple.xml
+++ b/android-app/src/main/res/values/theme_metro_purple.xml
@@ -27,7 +27,7 @@
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_light_blue.xml b/android-app/src/main/res/values/theme_old_blue.xml
similarity index 60%
rename from android-app/src/main/res/values/theme_light_blue.xml
rename to android-app/src/main/res/values/theme_old_blue.xml
index 860b2a0b..43a9dcc4 100644
--- a/android-app/src/main/res/values/theme_light_blue.xml
+++ b/android-app/src/main/res/values/theme_old_blue.xml
@@ -22,27 +22,27 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_old_gray.xml b/android-app/src/main/res/values/theme_old_gray.xml
new file mode 100644
index 00000000..3cbd54f7
--- /dev/null
+++ b/android-app/src/main/res/values/theme_old_gray.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_violet.xml b/android-app/src/main/res/values/theme_old_violet.xml
similarity index 60%
rename from android-app/src/main/res/values/theme_violet.xml
rename to android-app/src/main/res/values/theme_old_violet.xml
index a414abbe..202dd32b 100644
--- a/android-app/src/main/res/values/theme_violet.xml
+++ b/android-app/src/main/res/values/theme_old_violet.xml
@@ -22,26 +22,26 @@
-
-
-
-
-
\ No newline at end of file