Style changes

app/src/main/res/color/cpp_wizard_button_selector.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/cpp_wizard_button_pressed" android:state_enabled="true" android:state_pressed="true" />
-    <item android:color="@color/cpp_wizard_button_disabled" android:state_enabled="false" />
-    <item android:color="@color/cpp_wizard_button_normal" />
+    <item android:color="@color/grey_600" android:state_enabled="true" android:state_pressed="true" />
+    <item android:color="@color/grey_300" android:state_enabled="false" />
+    <item android:color="@color/grey_800" />
 </selector>

app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml

@@ -27,7 +27,7 @@
     a:insetTop="@dimen/cpp_button_padding">
 
     <shape>
-        <solid a:color="@color/cpp_wizard_button_normal" />
+        <solid a:color="@color/grey_800" />
         <corners a:radius="@dimen/cpp_button_corner" />
     </shape>
 </inset>

app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml

@@ -26,7 +26,7 @@
     a:insetRight="@dimen/cpp_button_padding"
     a:insetTop="@dimen/cpp_button_padding">
     <shape>
-        <solid a:color="@color/cpp_wizard_button_pressed" />
+        <solid a:color="@color/grey_600" />
         <corners a:radius="@dimen/cpp_button_corner" />
     </shape>
 </inset>

app/src/main/res/layout-land/cpp_app_keyboard.xml

@@ -44,10 +44,10 @@
 
         <include layout="@layout/cpp_app_button_9" />
 
-        <include layout="@layout/cpp_app_button_multiplication" />
-
         <include layout="@layout/cpp_app_button_division" />
 
+        <include layout="@layout/cpp_app_button_multiplication" />
+
         <include layout="@layout/cpp_app_button_memory" />
 
     </LinearLayout>
@@ -69,10 +69,10 @@
 
         <include layout="@layout/cpp_app_button_6" />
 
-        <include layout="@layout/cpp_app_button_plus" />
-
         <include layout="@layout/cpp_app_button_minus" />
 
+        <include layout="@layout/cpp_app_button_plus" />
+
         <include layout="@layout/cpp_app_button_history" />
 
     </LinearLayout>

app/src/main/res/values/colors.xml

@@ -21,27 +21,24 @@
   -->
 
 <resources>
-    <color name="cpp_text">#ffe6e6e6</color>
+    <color name="cpp_text">@color/grey_300</color>
     <color name="cpp_text_error">@color/cpp_text_inverse</color>
-    <color name="cpp_text_inverse">#424242</color>
+    <color name="cpp_text_inverse">@color/grey_800</color>
     <color name="cpp_text_inverse_error">@color/cpp_text</color>
 
-    <color name="cpp_kb_button_text">#ffd4d4d4</color>
     <color name="cpp_button_text">#ffffffff</color>
-    <color name="cpp_button_text_operator">#ffffff99</color>
-    <color name="cpp_selected_angle_unit_text">#ffffff99</color>
-    <color name="cpp_main_bg">@color/grey_950</color>
-    <color name="cpp_main_bg_light">#fff6f1ef</color>
-    <color name="cpp_wizard_button_normal">#424242</color>
-    <color name="cpp_wizard_button_disabled">#616161</color>
-    <color name="cpp_wizard_button_pressed">#757575</color>
-    <color name="cpp_widget_cursor">#ff707070</color>
+    <color name="cpp_bg">@color/grey_950</color>
+    <color name="cpp_bg_light">@color/grey_100</color>
+    <color name="cpp_widget_cursor">@color/grey_600</color>
 
     <color name="cpp_wizard_disabled_text">#66ffffff</color>
-    <color name="cpp_material_accent">#fafafa</color>
+    <color name="cpp_material_accent">@color/grey_100</color>
 
     <color name="black">#000000</color>
 
+    <color name="grey_100">#f5f5f5</color>
+    <color name="grey_300">#e0e0e0</color>
+    <color name="grey_600">#757575</color>
     <color name="grey_800">#424242</color>
     <color name="grey_850">#313131</color>
     <color name="grey_900">#212121</color>
@@ -57,5 +54,6 @@
 
     <color name="green_800">#2e7d32</color>
     <color name="pink_900">#880e4f</color>
+    <color name="yellow_100">#ffff8d</color>
 
 </resources>

app/src/main/res/values/styles.xml

@@ -109,13 +109,13 @@
     </style>
 
     <style name="CppMain.Widget" parent="CppMain">
-        <item name="android:background">@color/cpp_main_bg</item>
+        <item name="android:background">@color/cpp_bg</item>
         <item name="android:padding">1dp</item>
         <item name="android:layout_margin">@dimen/cpp_widget_margin</item>
     </style>
 
     <style name="CppMain.Widget.Light" parent="CppMain.Widget">
-        <item name="android:background">@color/cpp_main_bg_light</item>
+        <item name="android:background">@color/cpp_bg_light</item>
     </style>
 
     <style name="CppText.Editor.Widget" parent="CppText.Editor.BaseWidget"/>
@@ -140,12 +140,12 @@
     </style>
 
     <style name="CppMain.Onscreen" parent="CppMain">
-        <item name="android:background">@color/cpp_main_bg</item>
+        <item name="android:background">@color/cpp_bg</item>
         <item name="android:padding">@dimen/cpp_onscreen_main_padding</item>
     </style>
 
     <style name="CppMain.Onscreen.Light" parent="CppMain.Onscreen">
-        <item name="android:background">@color/cpp_main_bg_light</item>
+        <item name="android:background">@color/cpp_bg_light</item>
     </style>
 
     <style name="WizardLabel.Last" parent="WizardLabel">

app/src/main/res/values/theme.xml

@@ -27,9 +27,9 @@
         <item name="colorPrimaryDark">@color/black</item>
         <item name="colorAccent">@color/cpp_material_accent</item>
 
-        <item name="android:windowBackground">@color/cpp_main_bg</item>
+        <item name="android:windowBackground">@color/cpp_bg</item>
 
-        <item name="cpp_main_bg">@color/cpp_main_bg</item>
+        <item name="cpp_main_bg">@color/cpp_bg</item>
         <item name="cpp_fab_bg">@color/blue_900</item>
         <item name="cpp_text_color">@color/cpp_text</item>
         <item name="cpp_text_color_error">@color/cpp_text_error</item>
@@ -47,7 +47,7 @@
     </style>
 
     <style name="Cpp.Theme.Dialog" parent="@style/Theme.AppCompat.DialogWhenLarge">
-        <item name="android:windowBackground">@color/cpp_main_bg</item>
+        <item name="android:windowBackground">@color/cpp_bg</item>
 
         <item name="colorPrimary">@color/grey_900</item>
         <item name="colorPrimaryDark">@color/black</item>
@@ -58,7 +58,7 @@
         <item name="windowActionBar">false</item>
         <item name="android:windowIsTranslucent">true</item>
 
-        <item name="cpp_main_bg">@color/cpp_main_bg</item>
+        <item name="cpp_main_bg">@color/cpp_bg</item>
         <item name="cpp_fab_bg">@color/blue_900</item>
         <item name="cpp_text_color">@color/cpp_text</item>
         <item name="cpp_text_color_error">@color/cpp_text_error</item>
@@ -72,7 +72,7 @@
         <item name="colorPrimaryDark">@color/black</item>
         <item name="colorAccent">@color/cpp_material_accent</item>
 
-        <item name="cpp_main_bg">@color/cpp_main_bg</item>
+        <item name="cpp_main_bg">@color/cpp_bg</item>
         <item name="cpp_fab_bg">@color/blue_900</item>
         <item name="cpp_text_color">@color/cpp_text</item>
         <item name="cpp_text_color_error">@color/cpp_text_error</item>
@@ -82,13 +82,13 @@
     </style>
 
     <style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowBackground">@color/cpp_main_bg_light</item>
+        <item name="android:windowBackground">@color/cpp_bg_light</item>
 
         <item name="colorPrimary">@color/teal_400</item>
         <item name="colorPrimaryDark">@color/teal_400</item>
         <item name="colorAccent">@color/teal_400</item>
 
-        <item name="cpp_main_bg">@color/cpp_main_bg_light</item>
+        <item name="cpp_main_bg">@color/cpp_bg_light</item>
         <item name="cpp_fab_bg">@color/teal_400</item>
         <item name="cpp_text_color">@color/cpp_text_inverse</item>
         <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
@@ -99,7 +99,7 @@
     </style>
 
     <style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.DialogWhenLarge">
-        <item name="android:windowBackground">@color/cpp_main_bg_light</item>
+        <item name="android:windowBackground">@color/cpp_bg_light</item>
 
         <item name="colorPrimary">@color/teal_400</item>
         <item name="colorPrimaryDark">@color/teal_400</item>
@@ -110,7 +110,7 @@
         <item name="windowActionBar">false</item>
         <item name="android:windowIsTranslucent">true</item>
 
-        <item name="cpp_main_bg">@color/cpp_main_bg_light</item>
+        <item name="cpp_main_bg">@color/cpp_bg_light</item>
         <item name="cpp_fab_bg">@color/teal_400</item>
         <item name="cpp_text_color">@color/cpp_text_inverse</item>
         <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
@@ -124,7 +124,7 @@
         <item name="colorPrimaryDark">@color/teal_400</item>
         <item name="colorAccent">@color/teal_400</item>
 
-        <item name="cpp_main_bg">@color/cpp_main_bg_light</item>
+        <item name="cpp_main_bg">@color/cpp_bg_light</item>
         <item name="cpp_fab_bg">@color/teal_400</item>
         <item name="cpp_text_color">@color/cpp_text_inverse</item>
         <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>

app/src/main/res/values/theme_old_blue.xml

@@ -31,7 +31,7 @@
     </style>
 
     <style name="CppKeyboardButton.Blue.Operation" parent="CppKeyboardButton.Blue.Digit">
-        <item name="android:textColor">@color/cpp_button_text_operator</item>
+        <item name="android:textColor">@color/yellow_100</item>
     </style>
 
     <style name="Cpp.Theme.Blue" parent="Cpp.Theme">

app/src/main/res/values/theme_old_gray.xml

@@ -31,7 +31,7 @@
     </style>
 
     <style name="CppKeyboardButton.Gray.Operation" parent="CppKeyboardButton.Gray.Digit">
-        <item name="android:textColor">@color/cpp_button_text_operator</item>
+        <item name="android:textColor">@color/yellow_100</item>
     </style>
 
     <style name="Cpp.Theme.Gray" parent="Cpp.Theme">

app/src/main/res/values/theme_old_violet.xml

@@ -27,7 +27,7 @@
     </style>
 
     <style name="CppKeyboardButton.Violet.Operation" parent="CppKeyboardButton.Violet.Digit">
-        <item name="android:textColor">@color/cpp_button_text_operator</item>
+        <item name="android:textColor">@color/yellow_100</item>
     </style>
 
     <style name="CppKeyboardButton.Violet.Control" parent="CppKeyboardButton">

app/src/main/res/xml/preferences_appearance.xml

@@ -39,13 +39,6 @@
         a:key="gui.vibrateOnKeypress"
         a:title="@string/cpp_prefs_vibrate_on_keypress" />
 
-    <ListPreference
-        a:entries="@array/p_multiplication_sign_values"
-        a:entryValues="@array/p_multiplication_sign_values"
-        a:key="engine.multiplicationSign"
-        a:summary="@string/c_calc_multiplication_sign_summary"
-        a:title="@string/c_calc_multiplication_sign" />
-
     <ListPreference
         a:entries="@array/p_theme_names"
         a:entryValues="@array/p_theme_values"