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

Style changes

Browse Source
This commit is contained in:
serso
2016-03-15 21:51:59 +01:00
parent fc2ceb4b55
commit 5103111d49
58 changed files with 75 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/res/values/colors.xml
View File

@@ -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>

8
app/src/main/res/values/styles.xml
View File

@@ -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">

20
app/src/main/res/values/theme.xml
View File

@@ -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>

2
app/src/main/res/values/theme_old_blue.xml
View File

@@ -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">

2
app/src/main/res/values/theme_old_gray.xml
View File

@@ -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">

2
app/src/main/res/values/theme_old_violet.xml
View File

@@ -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">