This commit is contained in:
Sergey Solovyev
2012-10-03 22:51:32 +04:00
parent b3f8c4c356
commit 8ed6a2111b
31 changed files with 441 additions and 321 deletions

View File

@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="digitButtonStyle" format="reference" />
<attr name="controlButtonStyle" format="reference" />
<attr name="controlImageButtonStyle" format="reference" />
<attr name="operationButtonStyle" format="reference" />
<attr name="fragmentLayoutStyle" format="reference" />
<attr name="fragmentTitleStyle" format="reference" />
<attr name="fragmentListViewStyle" format="reference" />
<attr name="buttonStyle" format="reference" />
<attr name="paneStyle" format="reference" />
<attr name="paneStyleTransparent" format="reference" />
<attr name="mainLayoutStyle" format="reference" />
<attr name="mainMultiPaneLayoutStyle" format="reference" />
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="digitButtonStyle" format="reference" />
<attr name="controlButtonStyle" format="reference" />
<attr name="controlImageButtonStyle" format="reference" />
<attr name="operationButtonStyle" format="reference" />
<attr name="fragmentLayoutStyle" format="reference" />
<attr name="fragmentTitleStyle" format="reference" />
<attr name="fragmentListViewStyle" format="reference" />
<attr name="fragmentListViewItemStyle" format="reference" />
<attr name="buttonStyle" format="reference" />
<attr name="paneStyle" format="reference" />
<attr name="paneStyleTransparent" format="reference" />
<attr name="mainLayoutStyle" format="reference" />
<attr name="mainMultiPaneLayoutStyle" format="reference" />
</resources>

View File

@@ -1,16 +1,17 @@
<resources>
<dimen name="button_margin">0.5dp</dimen>
<dimen name="text_size">20sp</dimen>
<dimen name="keyboard_button_text_size">30dp</dimen>
<dimen name="button_text_size">20dp</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>
<!--only for not multipane-->
<dimen name="editor_padding">5dp</dimen>
<dimen name="display_padding">3dp</dimen>
<resources>
<dimen name="button_margin">0.5dp</dimen>
<dimen name="text_size">20sp</dimen>
<dimen name="fragment_text_size">15sp</dimen>
<dimen name="keyboard_button_text_size">30dp</dimen>
<dimen name="button_text_size">20dp</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>
<!--only for not multipane-->
<dimen name="editor_padding">5dp</dimen>
<dimen name="display_padding">3dp</dimen>
</resources>

View File

@@ -28,7 +28,7 @@
<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_button_blue</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>
</style>
@@ -62,7 +62,7 @@
<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">15dp</item>
<item name="android:textSize">@dimen/fragment_text_size</item>
<item name="android:padding">5dp</item>
</style>

View File

@@ -212,7 +212,7 @@
<string name="other">Other</string>
<string name="derivatives">Derivatives/Integrals</string>
<string name="crashed">Calculator++ has been crashed…</string>
<string name="crash_dialog_title">Calculator++ crash report confirmation</string>
<string name="crash_dialog_title">Calculator++ crash report</string>
<string name="crash_dialog_text">
Unfortunately, Calculator++ has been crashed.\n\n
In order to fix the problem we need some information about it. It\'s highly recommended to send crash report via email (after pressing \'Ok\' button you will see all sent data in the new window).\n\n

View File

@@ -20,6 +20,9 @@
<item name="android:padding">6dp</item>
</style>
<style name="default_fragment_list_view_item_style">
</style>
<style name="default_fragment_list_view_style">
<item name="android:id">@android:id/list</item>
<item name="android:divider">@null</item>
@@ -77,10 +80,12 @@
<item name="android:layout_width">match_parent</item>
</style>
<style name="default_actionbar_tab_style" parent="@style/Widget.Sherlock.ActionBar.TabView">
<style name="default_actionbar_style" parent="@style/Widget.Sherlock.ActionBar">
<item name="background">@drawable/default_abs__ab_transparent_dark_holo</item>
</style>
<style name="default_actionbar_tab_bar_style" parent="@style/Widget.Sherlock.ActionBar.TabBar">
<style name="default_actionbar_tab_style" parent="@style/Widget.Sherlock.ActionBar.TabView">
<item name="android:background">@drawable/default_abs__tab_indicator_ab_holo</item>
</style>
<style name="default_theme" parent="Theme.Sherlock">
@@ -90,6 +95,7 @@
<item name="operationButtonStyle">@style/default_operation_button_style</item>
<item name="fragmentTitleStyle">@style/default_fragment_title_style</item>
<item name="fragmentListViewStyle">@style/default_fragment_list_view_style</item>
<item name="fragmentListViewItemStyle">@style/default_fragment_list_view_item_style</item>
<item name="buttonStyle">@style/default_button_style</item>
<item name="mainLayoutStyle">@style/default_main_layout_style</item>
@@ -102,6 +108,6 @@
<!-- action bar-->
<item name="actionBarTabStyle">@style/default_actionbar_tab_style</item>
<item name="actionBarTabBarStyle">@style/default_actionbar_tab_bar_style</item>
<item name="actionBarStyle">@style/default_actionbar_style</item>
</style>
</resources>

View File

@@ -9,18 +9,36 @@
</style>
<style name="metro_blue_operation_button_style" parent="metro_digit_button_style">
<item name="android:background">@drawable/metro_button_blue</item>
<item name="android:background">@drawable/metro_blue_button</item>
</style>
<style name="metro_control_image_button_style" parent="metro_control_button_style">
<item name="android:padding">6dp</item>
</style>
<style name="metro_blue_fragment_list_view_item_style" parent="default_fragment_list_view_item_style">
<item name="android:background">@drawable/metro_blue_list_item</item>
</style>
<style name="metro_blue_actionbar_style" parent="@style/Widget.Sherlock.ActionBar">
<item name="background">@drawable/metro_blue_abs__ab_transparent_dark_holo</item>
</style>
<style name="metro_blue_actionbar_tab_style" parent="default_actionbar_tab_style">
<item name="android:background">@drawable/metro_blue_abs__tab_indicator_ab_holo</item>
</style>
<style name="metro_blue_theme" parent="default_theme">
<item name="digitButtonStyle">@style/metro_digit_button_style</item>
<item name="controlButtonStyle">@style/metro_control_button_style</item>
<item name="controlImageButtonStyle">@style/metro_control_image_button_style</item>
<item name="operationButtonStyle">@style/metro_blue_operation_button_style</item>
</style>
<item name="fragmentListViewItemStyle">@style/metro_blue_fragment_list_view_item_style</item>
<!--action bar-->
<item name="actionBarTabStyle">@style/metro_blue_actionbar_tab_style</item>
<item name="actionBarStyle">@style/metro_blue_actionbar_style</item>
</style>
</resources>