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

Styles

Browse Source
This commit is contained in:
serso
2016-03-14 23:02:48 +01:00
parent 636800178c
commit 539be7399c
37 changed files with 189 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,6 @@
<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_pane_bg" format="reference" />
<attr name="cpp_fab_bg" format="reference" />
<attr name="cpp_wizard_button_bg" format="reference" />

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

@@ -35,33 +35,27 @@
<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_metro_button_dark">#ff000000</color>
<color name="cpp_metro_button">@color/grey_900</color>
<color name="cpp_metro_button_lighter">@color/grey_850</color>
<color name="cpp_metro_button_light">@color/grey_800</color>
<color name="cpp_metro_blue">#10648c</color>
<color name="cpp_material_blue">#0a4766</color>
<color name="cpp_material_blue_lighter">#0d5980</color>
<color name="cpp_material_blue_lighter_lighter">#0f6b99</color>
<color name="cpp_material_light">#ff37b295</color>
<color name="cpp_material_light_darker">#ff309e84</color>
<color name="cpp_material_light_disabled">#c1d2ef</color>
<color name="cpp_metro_green">#088e3a</color>
<color name="cpp_metro_purple">#651456</color>
<color name="cpp_widget_cursor">#ff707070</color>
<color name="cpp_widget_ripple">#40ffffff</color>
<color name="cpp_wizard_disabled_text">#66ffffff</color>
<color name="cpp_material_accent">#fafafa</color>
<color name="cpp_material_accent">#FAFAFA</color>
<color name="cpp_material_actionbar">@color/grey_900</color>
<color name="cpp_material_actionbar_light">@color/grey_800</color>
<color name="black">#000000</color>
<color name="cpp_pane_bg">@color/grey_900</color>
<color name="cpp_pane_bg_light">#ffeae5e3</color>
<color name="grey_900">#212121</color>
<color name="grey_950">#101010</color>
<color name="grey_800">#424242</color>
<color name="grey_850">#313131</color>
<color name="grey_900">#212121</color>
<color name="grey_950">#101010</color>
<color name="blue_900">#0D47A1</color>
<color name="blue_800">#1565C0</color>
<color name="blue_850">#1156B1</color>
<color name="teal_400">#26A69A</color>
<color name="teal_500">#009688</color>
<color name="teal_600">#00897B</color>
<color name="green_800">#2e7d32</color>
<color name="pink_900">#880e4f</color>
</resources>

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

@@ -212,48 +212,12 @@
<item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
</style>
<style name="CppPane.Multipane.Left" parent="CppPane.Multipane">
<item name="android:layout_marginLeft">0dp</item>
</style>
<style name="CppPane.Multipane.Right" parent="CppPane.Multipane">
<item name="android:layout_marginRight">0dp</item>
</style>
<style name="CppPane.Multipane" parent="CppPane">
<item name="android:padding">5dp</item>
<item name="android:layout_marginLeft">@dimen/cpp_pane_margin</item>
<item name="android:layout_marginTop">@dimen/cpp_pane_margin</item>
<item name="android:layout_marginRight">@dimen/cpp_pane_margin</item>
<item name="android:layout_marginBottom">@dimen/cpp_pane_margin</item>
</style>
<style name="CppPane">
<item name="android:padding">0dp</item>
<item name="android:background">?attr/cpp_pane_bg</item>
<item name="android:orientation">horizontal</item>
</style>
<style name="CppPane.Transparent.Bottom" parent="CppPane.Transparent">
<item name="android:layout_marginTop">@dimen/cpp_pane_margin</item>
</style>
<style name="CppPane.Transparent" parent="CppPane">
<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">0dp</item>
<item name="android:paddingBottom">0dp</item>
</style>
<style name="CppFragment">
<item name="android:layout_margin">0dp</item>
<item name="android:padding">0dp</item>
@@ -334,13 +298,13 @@
</style>
<style name="CppToolbar" parent="@style/Widget.AppCompat.Toolbar">
<item name="android:background">@color/cpp_material_actionbar</item>
<item name="android:background">@color/grey_900</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
</style>
<style name="CppToolbar.Light" parent="CppToolbar">
<item name="android:background">@color/cpp_material_actionbar_light</item>
<item name="android:background">@color/grey_800</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
</style>

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

@@ -23,15 +23,14 @@
<resources>
<style name="Cpp.Theme" parent="@style/Theme.AppCompat.NoActionBar">
<item name="colorPrimary">@color/cpp_metro_button</item>
<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="colorPrimary">@color/grey_900</item>
<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="cpp_main_bg">@color/cpp_main_bg</item>
<item name="cpp_pane_bg">@drawable/pane</item>
<item name="cpp_fab_bg">@color/grey_900</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>
<item name="cpp_card_style">@style/CardView.Dark</item>
@@ -50,8 +49,8 @@
<style name="Cpp.Theme.Dialog" parent="@style/Theme.AppCompat.DialogWhenLarge">
<item name="android:windowBackground">@color/cpp_main_bg</item>
<item name="colorPrimary">@color/cpp_metro_button</item>
<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="colorPrimary">@color/grey_900</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/cpp_material_accent</item>
<item name="windowNoTitle">true</item>
@@ -60,8 +59,7 @@
<item name="android:windowIsTranslucent">true</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
<item name="cpp_pane_bg">@drawable/pane</item>
<item name="cpp_fab_bg">@color/grey_900</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>
<item name="cpp_toolbar_style">@style/CppToolbar</item>
@@ -70,13 +68,12 @@
</style>
<style name="Cpp.Theme.Dialog.Alert" parent="@style/Theme.AppCompat.Dialog.Alert">
<item name="colorPrimary">@color/cpp_metro_button</item>
<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="colorPrimary">@color/grey_900</item>
<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_pane_bg">@drawable/pane</item>
<item name="cpp_fab_bg">@color/grey_900</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>
<item name="cpp_toolbar_style">@style/CppToolbar</item>
@@ -87,13 +84,12 @@
<style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.NoActionBar">
<item name="android:windowBackground">@color/cpp_main_bg_light</item>
<item name="colorPrimary">@color/cpp_material_light</item>
<item name="colorPrimaryDark">@color/cpp_material_light</item>
<item name="colorAccent">@color/cpp_material_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_pane_bg">@drawable/pane_light</item>
<item name="cpp_fab_bg">@color/cpp_material_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>
<item name="cpp_card_style">@style/CardView.Light</item>
@@ -105,9 +101,9 @@
<style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.DialogWhenLarge">
<item name="android:windowBackground">@color/cpp_main_bg_light</item>
<item name="colorPrimary">@color/cpp_material_light</item>
<item name="colorPrimaryDark">@color/cpp_material_light</item>
<item name="colorAccent">@color/cpp_material_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="windowNoTitle">true</item>
<item name="android:windowNoTitle">true</item>
@@ -115,8 +111,7 @@
<item name="android:windowIsTranslucent">true</item>
<item name="cpp_main_bg">@color/cpp_main_bg_light</item>
<item name="cpp_pane_bg">@drawable/pane_light</item>
<item name="cpp_fab_bg">@color/cpp_material_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>
<item name="cpp_toolbar_style">@style/CppToolbar.Light</item>
@@ -125,13 +120,12 @@
</style>
<style name="Cpp.Theme.Light.Dialog.Alert" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
<item name="colorPrimary">@color/cpp_material_light</item>
<item name="colorPrimaryDark">@color/cpp_material_light</item>
<item name="colorAccent">@color/cpp_material_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_pane_bg">@drawable/pane_light</item>
<item name="cpp_fab_bg">@color/cpp_material_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>
<item name="cpp_toolbar_style">@style/CppToolbar.Light</item>

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

@@ -26,11 +26,19 @@
<item name="android:background">@drawable/material_button_light</item>
</style>
<style name="CppKeyboardButton.Material.Light.Digit.Highlighted" parent="CppKeyboardButton">
<item name="android:background">@drawable/material_button_light_darker</item>
</style>
<style name="CppKeyboardButton.Material.Light.Operation" parent="CppKeyboardButton.Material.Digit">
<item name="android:background">@drawable/material_button_light_primary</item>
<item name="directionTextAlpha">0.7</item>
</style>
<style name="CppKeyboardButton.Material.Light.Operation.Highlighted" parent="CppKeyboardButton.Material.Light.Operation">
<item name="android:background">@drawable/material_button_light_primary_darker</item>
</style>
<style name="CppKeyboardButton.Material.Light.Control" parent="CppKeyboardButton.Material.Light.Digit" />
<style name="CppHeaderButton.Material.Light" parent="CppKeyboardButton.Material.Light.Control">
@@ -60,21 +68,25 @@
<style name="Cpp.Theme.Material.Light" parent="Cpp.Theme.Light">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Material.Light.Digit.Highlighted</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation</item>
<item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Material.Light.Operation.Highlighted</item>
</style>
<style name="Cpp.Theme.Material.Light.Dialog" parent="Cpp.Theme.Light.Dialog">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation
</item>
<item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Material.Light.Digit.Highlighted</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation</item>
<item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Material.Light.Operation.Highlighted</item>
</style>
<style name="Cpp.Theme.Material.Light.Dialog.Alert" parent="Cpp.Theme.Light.Dialog.Alert">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation
</item>
<item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Material.Light.Digit.Highlighted</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation</item>
<item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Material.Light.Operation.Highlighted</item>
</style>
</resources>

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

@@ -66,7 +66,9 @@
<style name="Cpp.Theme.Metro.Blue" parent="Cpp.Theme">
<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>
</style>
</resources>

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

@@ -22,12 +22,14 @@
<resources>
<style name="metro_green_operation_button_style" parent="CppKeyboardButton.Metro.Blue.Digit">
<style name="CppKeyboardButton.Metro.Green.Operation" parent="CppKeyboardButton.Metro.Blue.Digit">
<item name="android:background">@drawable/metro_button_green</item>
</style>
<style name="Cpp.Theme.Metro.Green" parent="Cpp.Theme.Metro.Blue">
<item name="cpp_button_style_operation">@style/metro_green_operation_button_style</item>
<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>
</resources>

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

@@ -22,12 +22,14 @@
<resources>
<style name="metro_purple_operation_button_style" parent="CppKeyboardButton.Metro.Blue.Digit">
<style name="CppKeyboardButton.Metro.Purple.Digit" parent="CppKeyboardButton.Metro.Blue.Digit">
<item name="android:background">@drawable/metro_button_purple</item>
</style>
<style name="Cpp.Theme.Metro.Purple" parent="Cpp.Theme.Metro.Blue">
<item name="cpp_button_style_operation">@style/metro_purple_operation_button_style</item>
<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>
</resources>