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

Onscreen calculator now supports themes

Browse Source
This commit is contained in:
serso
2015-06-16 12:57:42 +02:00
parent e27b7e549f
commit 1d677f1c58
117 changed files with 2152 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android-app/src/main/res/values/arrays.xml
View File

@@ -36,6 +36,19 @@
<item>metro_purple_theme</item>
</string-array>
<string-array name="p_onscreen_theme_names">
<item>@string/p_onscreen_use_app_theme</item>
<item>@string/p_material_theme</item>
<item>@string/p_material_light_theme</item>
<item>@string/p_metro_blue_theme</item>
</string-array>
<string-array name="p_onscreen_theme_values" translatable="false">
<item>default_theme</item>
<item>material_theme</item>
<item>material_light_theme</item>
<item>metro_blue_theme</item>
</string-array>
<string-array name="p_grouping_separator_names">
<item>@string/p_grouping_separator_no</item>
<item>@string/p_grouping_separator_apostrophe</item>

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

@@ -37,4 +37,5 @@
<dimen name="activity_vertical_margin">5dp</dimen>
<dimen name="control_margin">5dp</dimen>
<dimen name="cpp_min_drag_distance">25dp</dimen>
<dimen name="cpp_onscreen_main_padding">1dp</dimen>
</resources>

33
android-app/src/main/res/values/styles.xml
View File

@@ -40,6 +40,10 @@
<item name="directionTextColor">@color/cpp_button_text</item>
</style>
<style name="CppText.Editor.Onscreen.Light" parent="CppText.Editor.Onscreen">
<item name="android:textColor">@color/cpp_text_inverse</item>
</style>
<style name="CppText.Editor.Onscreen" parent="CppText.Editor">
<item name="android:ellipsize">none</item>
<item name="android:singleLine">true</item>
@@ -75,6 +79,10 @@
<item name="android:textColor">@color/cpp_text</item>
</style>
<style name="CppText.Display.Onscreen.Light" parent="CppText.Display.Onscreen">
<item name="android:textColor">@color/cpp_text_inverse</item>
</style>
<style name="CppText.About">
<item name="android:gravity">center</item>
<item name="android:layout_width">fill_parent</item>
@@ -88,25 +96,6 @@
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="cpp_simple_metro_digit_button_style" parent="metro_digit_button_style">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
<item name="android:background">@drawable/metro_widget_button_dark</item>
</style>
<style name="cpp_simple_metro_control_button_style" parent="metro_control_button_style">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
<item name="android:background">@drawable/metro_widget_button_light</item>
</style>
<style name="cpp_simple_metro_blue_operation_button_style" parent="metro_blue_operation_button_style">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
<item name="android:background">@drawable/metro_widget_button</item>
</style>
<style name="cpp_simple_metro_control_image_button_style" parent="metro_control_image_button_style">
<item name="android:background">@drawable/metro_widget_button_light</item>
</style>
<style name="CppMain.Widget" parent="CppMain">
<item name="android:background">@color/cpp_main_bg</item>
<item name="android:padding">1dp</item>
@@ -125,7 +114,11 @@
<style name="CppMain.Onscreen" parent="CppMain">
<item name="android:background">@color/cpp_main_bg</item>
<item name="android:padding">1dp</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>
</style>
<style name="WizardLabel.Last" parent="WizardLabel">

1
android-app/src/main/res/values/text_strings.xml
View File

@@ -64,6 +64,7 @@
<string name="p_metro_blue_theme">Metro Blue</string>
<string name="p_metro_green_theme">Metro Green</string>
<string name="p_metro_purple_theme">Metro Purple</string>
<string name="p_onscreen_use_app_theme">App theme</string>
<string name="p_material_theme">Material</string>
<string name="p_material_light_theme">Material Light</string>
<string name="c_calc_result_precision_summary">Precision of the result value (all calculations are done with maximum precision regardless of the value of this option)</string>

25
android-app/src/main/res/values/theme_material.xml
View File

@@ -27,6 +27,8 @@
<item name="android:stateListAnimator">@null</item>
</style>
<style name="CppKeyboardButton.Material.Control" parent="CppKeyboardButton.Material.Digit"/>
<style name="CppKeyboardButton.Material.Operation" parent="CppKeyboardButton.Material.Digit">
<item name="android:background">@drawable/material_blue_button</item>
</style>
@@ -35,6 +37,29 @@
<item name="android:padding">6dp</item>
</style>
<style name="CppHeaderButton.Material" parent="CppKeyboardButton.Material.Control">
<item name="android:layout_width">30dp</item>
<item name="android:layout_height">30dp</item>
<item name="android:layout_weight">0</item>
<item name="android:padding">0dp</item>
<item name="android:textSize">@dimen/cpp_onscreen_header_button_text_size</item>
</style>
<style name="CppKeyboardButton.Material.Simple.Digit" parent="CppKeyboardButton.Material.Digit">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
</style>
<style name="CppKeyboardButton.Material.Simple.Control" parent="CppKeyboardButton.Material.Control">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
</style>
<style name="CppKeyboardButton.Material.Simple.Control.Image" parent="CppKeyboardButton.Material.Control.Image">
</style>
<style name="CppKeyboardButton.Material.Simple.Operation" parent="CppKeyboardButton.Material.Operation">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</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>

25
android-app/src/main/res/values/theme_material_light.xml
View File

@@ -35,6 +35,31 @@
<item name="android:padding">6dp</item>
</style>
<style name="CppKeyboardButton.Material.Light.Control" parent="CppKeyboardButton.Material.Light.Digit"/>
<style name="CppHeaderButton.Material.Light" parent="CppKeyboardButton.Material.Light.Control">
<item name="android:layout_width">30dp</item>
<item name="android:layout_height">30dp</item>
<item name="android:layout_weight">0</item>
<item name="android:padding">0dp</item>
<item name="android:textSize">@dimen/cpp_onscreen_header_button_text_size</item>
</style>
<style name="CppKeyboardButton.Material.Light.Simple.Digit" parent="CppKeyboardButton.Material.Light.Digit">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
</style>
<style name="CppKeyboardButton.Material.Light.Simple.Control" parent="CppKeyboardButton.Material.Light.Control">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
</style>
<style name="CppKeyboardButton.Material.Light.Simple.Control.Image" parent="CppKeyboardButton.Material.Light.Control.Image">
</style>
<style name="CppKeyboardButton.Material.Light.Simple.Operation" parent="CppKeyboardButton.Material.Light.Operation">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
</style>
<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>

37
android-app/src/main/res/values/theme_metro_blue.xml
View File

@@ -22,15 +22,15 @@
<resources>
<style name="metro_digit_button_style" parent="CppKeyboardButton">
<style name="CppKeyboardButton.Metro.Blue.Digit" parent="CppKeyboardButton">
<item name="android:background">@drawable/metro_button_dark</item>
</style>
<style name="metro_control_button_style" parent="metro_digit_button_style">
<style name="CppKeyboardButton.Metro.Blue.Control" parent="CppKeyboardButton.Metro.Blue.Digit">
<item name="android:background">@drawable/metro_button_light</item>
</style>
<style name="onscreen_header_button_style" parent="metro_control_button_style">
<style name="CppHeaderButton.Metro.Blue" parent="CppKeyboardButton.Metro.Blue.Control">
<item name="android:layout_width">30dp</item>
<item name="android:layout_height">30dp</item>
<item name="android:layout_weight">0</item>
@@ -39,19 +39,38 @@
<item name="android:background">@drawable/metro_widget_button_light</item>
</style>
<style name="metro_blue_operation_button_style" parent="metro_digit_button_style">
<style name="CppKeyboardButton.Metro.Blue.Operation" parent="CppKeyboardButton.Metro.Blue.Digit">
<item name="android:background">@drawable/metro_blue_button</item>
</style>
<style name="metro_control_image_button_style" parent="metro_control_button_style">
<style name="CppKeyboardButton.Metro.Blue.Control.Image" parent="CppKeyboardButton.Metro.Blue.Control">
<item name="android:padding">6dp</item>
</style>
<style name="CppKeyboardButton.Metro.Simple.Digit" parent="CppKeyboardButton.Metro.Blue.Digit">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
<item name="android:background">@drawable/metro_widget_button_dark</item>
</style>
<style name="CppKeyboardButton.Metro.Simple.Control" parent="CppKeyboardButton.Metro.Blue.Control">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
<item name="android:background">@drawable/metro_widget_button_light</item>
</style>
<style name="CppKeyboardButton.Metro.Simple.Operation" parent="CppKeyboardButton.Metro.Blue.Operation">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
<item name="android:background">@drawable/metro_widget_button</item>
</style>
<style name="CppKeyboardButton.Metro.Simple.Control.Image" parent="CppKeyboardButton.Metro.Blue.Control.Image">
<item name="android:background">@drawable/metro_widget_button_light</item>
</style>
<style name="cpp_metro_blue_theme" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/metro_digit_button_style</item>
<item name="cpp_button_style_control">@style/metro_control_button_style</item>
<item name="cpp_button_style_control_image">@style/metro_control_image_button_style</item>
<item name="cpp_button_style_operation">@style/metro_blue_operation_button_style</item>
<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_image">@style/CppKeyboardButton.Metro.Blue.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Metro.Blue.Operation</item>
</style>
</resources>

2
android-app/src/main/res/values/theme_metro_green.xml
View File

@@ -22,7 +22,7 @@
<resources>
<style name="metro_green_operation_button_style" parent="metro_digit_button_style">
<style name="metro_green_operation_button_style" parent="CppKeyboardButton.Metro.Blue.Digit">
<item name="android:background">@drawable/metro_button_green</item>
</style>

2
android-app/src/main/res/values/theme_metro_purple.xml
View File

@@ -22,7 +22,7 @@
<resources>
<style name="metro_purple_operation_button_style" parent="metro_digit_button_style">
<style name="metro_purple_operation_button_style" parent="CppKeyboardButton.Metro.Blue.Digit">
<item name="android:background">@drawable/metro_button_purple</item>
</style>