Changes
This commit is contained in:
@@ -5,19 +5,18 @@
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<color name="magic_flame">#00ffffff</color>
|
||||
<color name="button_text_color">#ffffffff</color>
|
||||
<color name="button_operator_text_color">#ffffff99</color>
|
||||
<color name="button_ce_text_color">#ffffffff</color>
|
||||
<color name="default_text_color">#ffffffff</color>
|
||||
<color name="display_error_text_color">#ff393939</color>
|
||||
<color name="widget_cursor_color">#ff707070</color>
|
||||
<color name="selected_angle_unit_text_color">#ffffff99</color>
|
||||
<color name="default_background">#ff000000</color>
|
||||
<color name="pane_background">#ff1f1f1f</color>
|
||||
<color name="metro_button_background">#ff1f1f1f</color>
|
||||
<color name="metro_blue_color">#10648c</color>
|
||||
<color name="metro_green_color">#088e3a</color>
|
||||
<color name="metro_purple_color">#651456</color>
|
||||
<color name="metro_light_button_background">#393939</color>
|
||||
<color name="cpp_button_text_color">#ffffffff</color>
|
||||
<color name="cpp_button_operator_text_color">#ffffff99</color>
|
||||
<color name="cpp_button_ce_text_color">#ffffffff</color>
|
||||
<color name="cpp_default_text_color">#ffffffff</color>
|
||||
<color name="cpp_display_error_text_color">#ff393939</color>
|
||||
<color name="cpp_widget_cursor_color">#ff707070</color>
|
||||
<color name="cpp_selected_angle_unit_text_color">#ffffff99</color>
|
||||
<color name="cpp_default_background">#ff000000</color>
|
||||
<color name="cpp_pane_background">#ff1f1f1f</color>
|
||||
<color name="cpp_metro_button_background">#ff1f1f1f</color>
|
||||
<color name="cpp_metro_blue_color">#10648c</color>
|
||||
<color name="cpp_metro_green_color">#088e3a</color>
|
||||
<color name="cpp_metro_purple_color">#651456</color>
|
||||
<color name="cpp_metro_light_button_background">#393939</color>
|
||||
</resources>
|
@@ -1,27 +1,27 @@
|
||||
<resources>
|
||||
<dimen name="text_size">20sp</dimen>
|
||||
<dimen name="button_margin">0.5dp</dimen>
|
||||
<dimen name="display_margin_land">2.5dp</dimen>
|
||||
<dimen name="cpp_text_size">20sp</dimen>
|
||||
<dimen name="cpp_button_margin">0.5dp</dimen>
|
||||
<dimen name="cpp_display_margin_land">2.5dp</dimen>
|
||||
|
||||
<dimen name="fragment_text_size">15sp</dimen>
|
||||
<dimen name="fragment_title_text_size">20sp</dimen>
|
||||
<dimen name="cpp_fragment_text_size">15sp</dimen>
|
||||
<dimen name="cpp_fragment_title_text_size">20sp</dimen>
|
||||
|
||||
<dimen name="keyboard_button_text_size">30dp</dimen>
|
||||
<dimen name="button_text_size">20dp</dimen>
|
||||
<dimen name="button_text_size_mobile">25dp</dimen>
|
||||
<dimen name="display_text_size">25sp</dimen>
|
||||
<dimen name="editor_text_size">25sp</dimen>
|
||||
<dimen name="pane_margin">5dp</dimen>
|
||||
<dimen name="pane_padding">5dp</dimen>
|
||||
<dimen name="math_entity_text_size">20sp</dimen>
|
||||
<dimen name="math_entity_description_text_size">15sp</dimen>
|
||||
<dimen name="cpp_keyboard_button_text_size">30dp</dimen>
|
||||
<dimen name="cpp_button_text_size">20dp</dimen>
|
||||
<dimen name="cpp_button_text_size_mobile">25dp</dimen>
|
||||
<dimen name="cpp_display_text_size">25sp</dimen>
|
||||
<dimen name="cpp_editor_text_size">25sp</dimen>
|
||||
<dimen name="cpp_pane_margin">5dp</dimen>
|
||||
<dimen name="cpp_pane_padding">5dp</dimen>
|
||||
<dimen name="cpp_math_entity_text_size">20sp</dimen>
|
||||
<dimen name="cpp_math_entity_description_text_size">15sp</dimen>
|
||||
|
||||
<dimen name="widget_editor_text_size">25sp</dimen>
|
||||
<dimen name="widget_keyboard_button_text_size">20dp</dimen>
|
||||
<dimen name="widget_display_text_size">25sp</dimen>
|
||||
<dimen name="widget_margin">6dp</dimen>
|
||||
<dimen name="cpp_widget_editor_text_size">25sp</dimen>
|
||||
<dimen name="cpp_widget_keyboard_button_text_size">20dp</dimen>
|
||||
<dimen name="cpp_widget_display_text_size">25sp</dimen>
|
||||
<dimen name="cpp_widget_margin">6dp</dimen>
|
||||
|
||||
<!--only for not multipane-->
|
||||
<dimen name="editor_padding">5dp</dimen>
|
||||
<dimen name="display_padding">3dp</dimen>
|
||||
<dimen name="cpp_editor_padding">5dp</dimen>
|
||||
<dimen name="cpp_display_padding">3dp</dimen>
|
||||
</resources>
|
@@ -6,77 +6,77 @@
|
||||
|
||||
<resources>
|
||||
|
||||
<style name="WindowTitle">
|
||||
<style name="cpp_window_title">
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:textAppearance">@style/TextAppearance_WindowTitle</item>
|
||||
<item name="android:textAppearance">@style/cpp_text_appearance_window_title</item>
|
||||
<item name="android:shadowColor">#BB000000</item>
|
||||
<item name="android:shadowRadius">2.75</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance_WindowTitle">
|
||||
<style name="cpp_text_appearance_window_title">
|
||||
<item name="android:textColor">#fff</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="default_text_size">
|
||||
<item name="android:textSize">@dimen/text_size</item>
|
||||
<style name="cpp_default_text_size">
|
||||
<item name="android:textSize">@dimen/cpp_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="button_style">
|
||||
<style name="cpp_button_style">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:focusable">true</item>
|
||||
<item name="android:background">@drawable/metro_blue_button</item>
|
||||
<item name="android:textSize">@dimen/button_text_size</item>
|
||||
<item name="android:textColor">@color/button_text_color</item>
|
||||
<item name="android:textSize">@dimen/cpp_button_text_size</item>
|
||||
<item name="android:textColor">@color/cpp_button_text_color</item>
|
||||
</style>
|
||||
|
||||
<style name="keyboard_button_style">
|
||||
<style name="cpp_keyboard_button_style">
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">fill_parent</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:focusable">true</item>
|
||||
<item name="android:background">@drawable/metro_button_dark</item>
|
||||
<item name="android:layout_margin">@dimen/button_margin</item>
|
||||
<item name="android:textSize">@dimen/keyboard_button_text_size</item>
|
||||
<item name="android:textColor">@color/button_text_color</item>
|
||||
<item name="android:layout_margin">@dimen/cpp_button_margin</item>
|
||||
<item name="android:textSize">@dimen/cpp_keyboard_button_text_size</item>
|
||||
<item name="android:textColor">@color/cpp_button_text_color</item>
|
||||
</style>
|
||||
|
||||
<style name="editor_style" parent="default_text">
|
||||
<style name="cpp_editor_style" parent="cpp_default_text">
|
||||
<item name="android:gravity">left|top</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">fill_parent</item>
|
||||
<item name="android:textSize">@dimen/editor_text_size</item>
|
||||
<item name="android:textSize">@dimen/cpp_editor_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="display_style" parent="default_text">
|
||||
<style name="cpp_display_style" parent="cpp_default_text">
|
||||
<item name="android:gravity">top|right</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">match_parent</item>
|
||||
<item name="android:textSize">@dimen/display_text_size</item>
|
||||
<item name="android:textSize">@dimen/cpp_display_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="widget_editor_style" parent="editor_style">
|
||||
<item name="android:textSize">@dimen/widget_editor_text_size</item>
|
||||
<style name="cpp_widget_editor_style" parent="cpp_editor_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_editor_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="widget_display_style" parent="display_style">
|
||||
<item name="android:textSize">@dimen/widget_display_text_size</item>
|
||||
<style name="cpp_widget_display_style" parent="cpp_display_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_display_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="about_style" parent="default_text">
|
||||
<style name="cpp_about_style" parent="cpp_default_text">
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">fill_parent</item>
|
||||
<item name="android:textSize">@dimen/fragment_text_size</item>
|
||||
<item name="android:textSize">@dimen/cpp_fragment_text_size</item>
|
||||
<item name="android:padding">5dp</item>
|
||||
</style>
|
||||
|
||||
<style name="default_text">
|
||||
<style name="cpp_default_text">
|
||||
<item name="android:background">@android:color/transparent</item>
|
||||
<item name="android:textColor">@color/default_text_color</item>
|
||||
<item name="android:textColor">@color/cpp_default_text_color</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
@@ -10,12 +10,12 @@
|
||||
<style name="math_entity_text">
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
<item name="android:textSize">@dimen/math_entity_text_size</item>
|
||||
<item name="android:textSize">@dimen/cpp_math_entity_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="math_entity_description">
|
||||
<item name="android:textColor">#bebebe</item>
|
||||
<item name="android:textSize">@dimen/math_entity_description_text_size</item>
|
||||
<item name="android:textSize">@dimen/cpp_math_entity_description_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="add_var_button">
|
||||
|
@@ -264,5 +264,6 @@
|
||||
<string name="p_preferred_angle_units_title">Default angle units</string>
|
||||
<string name="p_preferred_angle_units_summary">Defines the default angle units</string>
|
||||
<string name="preferred_angle_units_message">Default angle units \'%1$s\' differs from current \'%2$s\'. Forgot to change back?</string>
|
||||
<string name="close">Close</string>
|
||||
|
||||
</resources>
|
@@ -6,7 +6,7 @@
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<style name="default_digit_button_style" parent="keyboard_button_style">
|
||||
<style name="default_digit_button_style" parent="cpp_keyboard_button_style">
|
||||
<item name="android:background">@drawable/metro_button_dark</item>
|
||||
</style>
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
<item name="android:padding">6dp</item>
|
||||
</style>
|
||||
|
||||
<style name="default_control_button_style" parent="keyboard_button_style"/>
|
||||
<style name="default_control_button_style" parent="cpp_keyboard_button_style"/>
|
||||
|
||||
<style name="default_operation_button_style" parent="default_digit_button_style">
|
||||
<item name="android:textColor">@color/button_operator_text_color</item>
|
||||
<item name="android:textColor">@color/cpp_button_operator_text_color</item>
|
||||
</style>
|
||||
|
||||
<style name="default_control_image_button_style" parent="default_control_button_style">
|
||||
@@ -36,15 +36,15 @@
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:fadingEdge">none</item>
|
||||
<item name="android:layout_marginBottom">@dimen/pane_padding</item>
|
||||
<item name="android:layout_marginBottom">@dimen/cpp_pane_padding</item>
|
||||
</style>
|
||||
|
||||
<style name="default_fragment_title_style">
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
<item name="android:textSize">@dimen/fragment_title_text_size</item>
|
||||
<item name="android:textSize">@dimen/cpp_fragment_title_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="default_button_style" parent="button_style">
|
||||
<style name="default_button_style" parent="cpp_button_style">
|
||||
<item name="android:paddingTop">5dp</item>
|
||||
<item name="android:paddingBottom">5dp</item>
|
||||
<item name="android:paddingLeft">10dp</item>
|
||||
@@ -57,15 +57,15 @@
|
||||
</style>
|
||||
|
||||
<style name="default_pane_style">
|
||||
<item name="android:layout_marginLeft">@dimen/pane_margin</item>
|
||||
<item name="android:layout_marginTop">@dimen/pane_margin</item>
|
||||
<item name="android:padding">@dimen/pane_padding</item>
|
||||
<item name="android:layout_marginLeft">@dimen/cpp_pane_margin</item>
|
||||
<item name="android:layout_marginTop">@dimen/cpp_pane_margin</item>
|
||||
<item name="android:padding">@dimen/cpp_pane_padding</item>
|
||||
<item name="android:background">@drawable/pane_background</item>
|
||||
</style>
|
||||
|
||||
<style name="default_main_multi_pane_layout_style" parent="default_main_layout_style">
|
||||
<item name="android:paddingRight">@dimen/pane_padding</item>
|
||||
<item name="android:paddingBottom">@dimen/pane_padding</item>
|
||||
<item name="android:paddingRight">@dimen/cpp_pane_padding</item>
|
||||
<item name="android:paddingBottom">@dimen/cpp_pane_padding</item>
|
||||
</style>
|
||||
|
||||
<style name="default_fragment_multi_pane_layout_style" parent="default_fragment_layout_style">
|
||||
@@ -78,7 +78,7 @@
|
||||
</style>
|
||||
|
||||
<style name="default_main_layout_style">
|
||||
<item name="android:background">@color/default_background</item>
|
||||
<item name="android:background">@color/cpp_default_background</item>
|
||||
<item name="android:baselineAligned">false</item>
|
||||
<item name="android:layout_height">match_parent</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
<style name="widget_main_layout_style" parent="default_main_layout_style">
|
||||
<item name="android:padding">1dp</item>
|
||||
<item name="android:layout_margin">@dimen/widget_margin</item>
|
||||
<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
|
||||
</style>
|
||||
|
||||
<style name="default_actionbar_style" parent="@style/Widget.Sherlock.ActionBar">
|
||||
|
@@ -7,16 +7,16 @@
|
||||
|
||||
<resources>
|
||||
|
||||
<style name="light_blue_digit_button_style" parent="keyboard_button_style">
|
||||
<style name="light_blue_digit_button_style" parent="cpp_keyboard_button_style">
|
||||
<item name="android:background">@drawable/blue_button</item>
|
||||
</style>
|
||||
|
||||
<style name="light_blue_control_button_style" parent="keyboard_button_style">
|
||||
<style name="light_blue_control_button_style" parent="cpp_keyboard_button_style">
|
||||
<item name="android:background">@drawable/blue_button_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="light_blue_operation_button_style" parent="light_blue_digit_button_style">
|
||||
<item name="android:textColor">@color/button_operator_text_color</item>
|
||||
<item name="android:textColor">@color/cpp_button_operator_text_color</item>
|
||||
</style>
|
||||
|
||||
<style name="light_blue_control_image_button_style" parent="light_blue_control_button_style">
|
||||
|
@@ -1,11 +1,11 @@
|
||||
<resources>
|
||||
|
||||
<style name="metro_digit_button_style" parent="keyboard_button_style">
|
||||
<style name="metro_digit_button_style" parent="cpp_keyboard_button_style">
|
||||
<item name="android:background">@drawable/metro_button_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="widget_metro_digit_button_style" parent="metro_digit_button_style">
|
||||
<item name="android:textSize">@dimen/widget_keyboard_button_text_size</item>
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="metro_control_button_style" parent="metro_digit_button_style">
|
||||
@@ -13,7 +13,7 @@
|
||||
</style>
|
||||
|
||||
<style name="widget_metro_control_button_style" parent="metro_control_button_style">
|
||||
<item name="android:textSize">@dimen/widget_keyboard_button_text_size</item>
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="metro_blue_operation_button_style" parent="metro_digit_button_style">
|
||||
@@ -21,7 +21,7 @@
|
||||
</style>
|
||||
|
||||
<style name="widget_metro_blue_operation_button_style" parent="metro_blue_operation_button_style">
|
||||
<item name="android:textSize">@dimen/widget_keyboard_button_text_size</item>
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="metro_control_image_button_style" parent="metro_control_button_style">
|
||||
|
@@ -6,15 +6,15 @@
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<style name="violet_digit_button_style" parent="keyboard_button_style">
|
||||
<style name="violet_digit_button_style" parent="cpp_keyboard_button_style">
|
||||
<item name="android:background">@drawable/violet_button</item>
|
||||
</style>
|
||||
|
||||
<style name="violet_operation_button_style" parent="violet_digit_button_style">
|
||||
<item name="android:textColor">@color/button_operator_text_color</item>
|
||||
<item name="android:textColor">@color/cpp_button_operator_text_color</item>
|
||||
</style>
|
||||
|
||||
<style name="violet_control_button_style" parent="keyboard_button_style">
|
||||
<style name="violet_control_button_style" parent="cpp_keyboard_button_style">
|
||||
<item name="android:background">@drawable/violet_button_dark</item>
|
||||
</style>
|
||||
|
||||
|
Reference in New Issue
Block a user