changes: themes support, scale for direction text
This commit is contained in:
@@ -6,9 +6,9 @@
|
||||
|
||||
<resources>
|
||||
<string-array name="p_theme_names">
|
||||
<item>Default</item>
|
||||
<item>Violet</item>
|
||||
<item>Light blue</item>
|
||||
<item>@string/p_default_theme</item>
|
||||
<item>@string/p_violet_theme</item>
|
||||
<item>@string/p_light_blue_theme</item>
|
||||
</string-array>
|
||||
<string-array name="p_theme_values">
|
||||
<item>default_theme</item>
|
||||
|
@@ -12,5 +12,7 @@
|
||||
</declare-styleable>
|
||||
|
||||
<attr name="digitButtonStyle" format="reference" />
|
||||
<attr name="controlButtonStyle" format="reference" />
|
||||
<attr name="controlImageButtonStyle" format="reference" />
|
||||
|
||||
</resources>
|
||||
|
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="c_app_name">Calculator</string>
|
||||
<string name="c_app_settings">Calculator</string>
|
||||
<string name="c_app_name">Calculator++</string>
|
||||
<string name="c_app_settings">Settings</string>
|
||||
<string name="c_syntax_error">Syntax error</string>
|
||||
<string name="c_result_copied">Result copied to clipboard!</string>
|
||||
<string name="c_settings">Settings</string>
|
||||
@@ -76,4 +76,10 @@
|
||||
<string name="c_app_history">History</string>
|
||||
<string name="c_char_is_not_accepted">Character \'%s\' is not accepted in variable name!</string>
|
||||
<string name="c_calc_theme">Theme</string>
|
||||
<string name="p_default_theme">Default</string>
|
||||
<string name="p_violet_theme">Violet</string>
|
||||
<string name="p_light_blue_theme">Light Blue</string>
|
||||
<string name="c_calc_result_precision_summary">Precision of result value (all calculations are done with maximum precision regardless of the value of this option)</string>
|
||||
<string name="c_calc_color_display_summary">Enables/disables colouring and styling in calculator editor</string>
|
||||
<string name="c_calc_theme_summary">Sets the theme for calculator</string>
|
||||
</resources>
|
||||
|
@@ -30,9 +30,25 @@
|
||||
<item name="android:background">@drawable/light_blue_button</item>
|
||||
</style>
|
||||
|
||||
<style name="control_button_style" parent="button_style"/>
|
||||
<style name="default_control_button_style" parent="button_style"/>
|
||||
|
||||
<style name="control_image_button_style" parent="control_button_style">
|
||||
<style name="violet_control_button_style" parent="button_style">
|
||||
<item name="android:background">@drawable/dark_violet_button</item>
|
||||
</style>
|
||||
|
||||
<style name="light_blue_control_button_style" parent="button_style">
|
||||
<item name="android:background">@drawable/dark_blue_button</item>
|
||||
</style>
|
||||
|
||||
<style name="default_control_image_button_style" parent="default_control_button_style">
|
||||
<item name="android:padding">6dp</item>
|
||||
</style>
|
||||
|
||||
<style name="violet_control_image_button_style" parent="violet_control_button_style">
|
||||
<item name="android:padding">6dp</item>
|
||||
</style>
|
||||
|
||||
<style name="light_blue_control_image_button_style" parent="light_blue_control_button_style">
|
||||
<item name="android:padding">6dp</item>
|
||||
</style>
|
||||
|
||||
@@ -68,14 +84,20 @@
|
||||
|
||||
<style name="default_theme">
|
||||
<item name="digitButtonStyle">@style/default_digit_button_style</item>
|
||||
<item name="controlButtonStyle">@style/default_control_button_style</item>
|
||||
<item name="controlImageButtonStyle">@style/default_control_image_button_style</item>
|
||||
</style>
|
||||
|
||||
<style name="violet_theme">
|
||||
<item name="digitButtonStyle">@style/violet_digit_button_style</item>
|
||||
<item name="controlButtonStyle">@style/violet_control_button_style</item>
|
||||
<item name="controlImageButtonStyle">@style/violet_control_image_button_style</item>
|
||||
</style>
|
||||
|
||||
<style name="light_blue_theme">
|
||||
<item name="digitButtonStyle">@style/light_blue_digit_button_style</item>
|
||||
<item name="controlButtonStyle">@style/light_blue_control_button_style</item>
|
||||
<item name="controlImageButtonStyle">@style/light_blue_control_image_button_style</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
Reference in New Issue
Block a user