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-19 18:33:20 +01:00
parent b9432db42a
commit 9f542099fd
21 changed files with 130 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@
<attr name="cpp_button_style_control_highlighted" format="reference" />
<attr name="cpp_button_style_operation" format="reference" />
<attr name="cpp_button_style_operation_highlighted" format="reference" />
<attr name="cpp_main_bg" format="reference" />
<attr name="cpp_editor_bg" format="reference" />
<attr name="cpp_fab_bg" format="reference" />
<attr name="cpp_wizard_button_bg" format="reference" />

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

@@ -27,7 +27,8 @@
<color name="cpp_text_inverse_error">@color/cpp_text</color>
<color name="cpp_button_text">#ffffffff</color>
<color name="cpp_bg">@color/grey_950</color>
<color name="cpp_editor_bg">@color/grey_950</color>
<color name="cpp_bg">@color/grey_850</color>
<color name="cpp_bg_light">@color/grey_100</color>
<color name="cpp_widget_cursor">@color/grey_600</color>

1
app/src/main/res/values/dimens.xml
View File

@@ -6,7 +6,6 @@
<dimen name="cpp_widget_display_text_size">25sp</dimen>
<dimen name="cpp_widget_margin">6dp</dimen>
<dimen name="min_expanded_height_lock_screen">300dp</dimen>
<dimen name="cpp_text_size">20sp</dimen>
<dimen name="cpp_button_padding">1px</dimen>
<dimen name="cpp_direction_text_default_padding">2dp</dimen>
<dimen name="cpp_direction_text_min_size">9dp</dimen>

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

@@ -22,10 +22,6 @@
<resources>
<style name="cpp_default_text_size">
<item name="android:textSize">@dimen/cpp_text_size</item>
</style>
<style name="CppKeyboardButton" parent="BaseCppKeyboardButton"/>
<style name="BaseCppKeyboardButton">
<item name="android:layout_width">0dp</item>
@@ -109,7 +105,7 @@
</style>
<style name="CppMain.Widget" parent="CppMain">
<item name="android:background">@color/cpp_bg</item>
<item name="android:background">@color/cpp_editor_bg</item>
<item name="android:padding">1dp</item>
<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
</style>
@@ -140,7 +136,7 @@
</style>
<style name="CppMain.Onscreen" parent="CppMain">
<item name="android:background">@color/cpp_bg</item>
<item name="android:background">@color/cpp_editor_bg</item>
<item name="android:padding">@dimen/cpp_onscreen_main_padding</item>
</style>
@@ -287,8 +283,6 @@
<style name="CppListView">
<item name="android:id">@android:id/list</item>
<item name="android:dividerHeight">1px</item>
<item name="android:divider">@drawable/divider</item>
<item name="android:cacheColorHint">@android:color/transparent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>

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

@@ -22,6 +22,10 @@
<resources>
<style name="Cpp.Theme.Calculator" parent="@style/Cpp.Theme">
<item name="android:windowBackground">@color/cpp_editor_bg</item>
</style>
<style name="Cpp.Theme" parent="@style/Theme.AppCompat.NoActionBar">
<item name="colorPrimary">@color/grey_900</item>
<item name="colorPrimaryDark">@color/black</item>
@@ -29,7 +33,7 @@
<item name="android:windowBackground">@color/cpp_bg</item>
<item name="cpp_main_bg">@color/cpp_bg</item>
<item name="cpp_editor_bg">@color/cpp_editor_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,8 +51,6 @@
</style>
<style name="Cpp.Theme.Dialog" parent="@style/Theme.AppCompat.DialogWhenLarge">
<item name="android:windowBackground">@color/cpp_bg</item>
<item name="colorPrimary">@color/grey_900</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/cpp_material_accent</item>
@@ -58,7 +60,7 @@
<item name="windowActionBar">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="cpp_main_bg">@color/cpp_bg</item>
<item name="cpp_editor_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 +74,7 @@
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/cpp_material_accent</item>
<item name="cpp_main_bg">@color/cpp_bg</item>
<item name="cpp_editor_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>
@@ -88,7 +90,7 @@
<item name="colorPrimaryDark">@color/teal_400</item>
<item name="colorAccent">@color/teal_400</item>
<item name="cpp_main_bg">@color/cpp_bg_light</item>
<item name="cpp_editor_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,8 +101,6 @@
</style>
<style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.DialogWhenLarge">
<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>
@@ -110,7 +110,7 @@
<item name="windowActionBar">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="cpp_main_bg">@color/cpp_bg_light</item>
<item name="cpp_editor_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_bg_light</item>
<item name="cpp_editor_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>
@@ -134,6 +134,7 @@
</style>
<style name="Cpp.Theme.Wizard" parent="Cpp.Theme.Material">
<item name="android:windowBackground">@color/grey_950</item>
<item name="windowNoTitle">true</item>
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>

4
app/src/main/res/values/theme_material.xml
View File

@@ -64,6 +64,10 @@
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
</style>
<style name="Cpp.Theme.Material.Calculator" parent="Cpp.Theme.Material">
<item name="android:windowBackground">@color/cpp_editor_bg</item>
</style>
<style name="Cpp.Theme.Material" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>

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

@@ -26,7 +26,7 @@
<item name="android:background">@drawable/material_button_light</item>
</style>
<style name="CppKeyboardButton.Material.Light.Digit.Highlighted" parent="CppKeyboardButton">
<style name="CppKeyboardButton.Material.Light.Digit.Highlighted" parent="CppKeyboardButton.Material.Light.Digit">
<item name="android:background">@drawable/material_button_light_darker</item>
</style>

14
app/src/main/res/values/theme_metro_blue.xml
View File

@@ -69,6 +69,20 @@
<item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Metro.Blue.Control</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Metro.Blue.Operation</item>
<item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Metro.Blue.Operation</item>
<item name="cpp_fab_bg">@color/blue_900</item>
</style>
<style name="Cpp.Theme.Metro.Blue.Dialog" parent="Cpp.Theme.Dialog">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Metro.Blue.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Metro.Blue.Control</item>
<item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Metro.Blue.Control</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Metro.Blue.Operation</item>
<item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Metro.Blue.Operation</item>
<item name="cpp_fab_bg">@color/blue_900</item>
</style>
<style name="Cpp.Theme.Metro.Blue.Calculator" parent="Cpp.Theme.Metro.Blue">
<item name="android:windowBackground">@color/cpp_editor_bg</item>
</style>
</resources>

10
app/src/main/res/values/theme_metro_green.xml
View File

@@ -32,4 +32,14 @@
<item name="cpp_fab_bg">@color/green_800</item>
</style>
<style name="Cpp.Theme.Metro.Green.Dialog" parent="Cpp.Theme.Metro.Blue.Dialog">
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Metro.Green.Operation</item>
<item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Metro.Green.Operation</item>
<item name="cpp_fab_bg">@color/green_800</item>
</style>
<style name="Cpp.Theme.Metro.Green.Calculator" parent="Cpp.Theme.Metro.Green">
<item name="android:windowBackground">@color/cpp_editor_bg</item>
</style>
</resources>

10
app/src/main/res/values/theme_metro_purple.xml
View File

@@ -32,4 +32,14 @@
<item name="cpp_fab_bg">@color/pink_900</item>
</style>
<style name="Cpp.Theme.Metro.Purple.Dialog" parent="Cpp.Theme.Metro.Blue.Dialog">
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Metro.Purple.Digit</item>
<item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Metro.Purple.Digit</item>
<item name="cpp_fab_bg">@color/pink_900</item>
</style>
<style name="Cpp.Theme.Metro.Purple.Calculator" parent="Cpp.Theme.Metro.Purple">
<item name="android:windowBackground">@color/cpp_editor_bg</item>
</style>
</resources>