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

Theme changes

Browse Source
This commit is contained in:
Sergey Solovyev 2012-11-19 21:24:19 +04:00
parent 90276c171f
commit 1f0188be4b
23 changed files with 223 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calculatorpp/AndroidManifest.xml
View File

@ -9,7 +9,7 @@
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
<application android:debuggable="false" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/metro_blue_theme"> <application android:debuggable="false" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">
<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan"> <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
@ -21,7 +21,7 @@
</activity> </activity>
<!-- settings must use action bar icon--> <!-- settings must use action bar icon-->
<activity android:icon="@drawable/icon_action_bar" android:label="@string/c_app_settings" android:name=".CalculatorPreferencesActivity"/> <activity android:icon="@drawable/ab_icon" android:label="@string/c_app_settings" android:name=".CalculatorPreferencesActivity"/>
<activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/> <activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
@ -39,14 +39,14 @@
<activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/> <activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
<activity android:name=".widget.CalculatorWidgetConfigurationActivity" android:theme="@style/metro_blue_theme"> <activity android:name=".widget.CalculatorWidgetConfigurationActivity" android:theme="@style/cpp_metro_blue_theme">
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/> <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
</intent-filter> </intent-filter>
</activity> </activity>
<!-- settings must use action bar icon--> <!-- settings must use action bar icon-->
<activity android:icon="@drawable/icon_action_bar" android:label="@string/c_settings" android:name=".plot.CalculatorPlotPreferenceActivity"/> <activity android:icon="@drawable/ab_icon" android:label="@string/c_settings" android:name=".plot.CalculatorPlotPreferenceActivity"/>
<!-- WIDGET CONFIG --> <!-- WIDGET CONFIG -->

0
calculatorpp/res/drawable-hdpi/icon_action_bar.png → calculatorpp/res/drawable-hdpi/ab_icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
calculatorpp/res/drawable-hdpi/icon_action_bar_long.png → calculatorpp/res/drawable-hdpi/ab_icon_long.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
calculatorpp/res/drawable-hdpi/logo_square.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

0
calculatorpp/res/drawable-ldpi/icon_action_bar.png → calculatorpp/res/drawable-ldpi/ab_icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

0
calculatorpp/res/drawable-mdpi/icon_action_bar.png → calculatorpp/res/drawable-mdpi/ab_icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

0
calculatorpp/res/drawable-xhdpi/icon_action_bar.png → calculatorpp/res/drawable-xhdpi/ab_icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

10
calculatorpp/res/drawable/gray_button.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<item a:state_pressed="true"
a:drawable="@drawable/metro_button_pressed"/>
<item a:drawable="@drawable/gray_button_shape"/>
</selector>

10
calculatorpp/res/drawable/gray_button_dark.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<item a:state_pressed="true"
a:drawable="@drawable/metro_button_pressed"/>
<item a:drawable="@drawable/gray_button_dark_shape"/>
</selector>

8
calculatorpp/res/drawable/gray_button_dark_shape.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<gradient a:startColor="#000000"
a:endColor="#333333"
a:angle="90"/>
<corners a:radius="0dp" />
</shape>

8
calculatorpp/res/drawable/gray_button_shape.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<gradient a:startColor="#071622"
a:endColor="#253541"
a:angle="90"/>
<corners a:radius="0dp" />
</shape>

2
calculatorpp/res/layout/widget_editor.xml
View File

@ -8,7 +8,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout" a:id="@+id/main_fragment_layout"
style="@style/default_fragment_layout_style" style="@style/cpp_default_fragment_layout_style"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding"> a:padding="@dimen/cpp_editor_padding">

2
calculatorpp/res/layout/widget_layout.xml
View File

@ -4,7 +4,7 @@
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:orientation="vertical" a:orientation="vertical"
style="@style/widget_main_layout_style"> style="@style/cpp_widget_main_layout_style">
<include layout="@layout/widget_editor" <include layout="@layout/widget_editor"
a:layout_weight="2" a:layout_weight="2"

153
calculatorpp/res/values/theme_default.xml
View File

@ -1,153 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<resources>
<style name="default_digit_button_style" parent="cpp_keyboard_button_style">
<item name="android:background">@drawable/metro_button_dark</item>
</style>
<style name="default_dialog_style">
<item name="android:padding">6dp</item>
</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/cpp_button_operator_text_color</item>
</style>
<style name="default_control_image_button_style" parent="default_control_button_style">
<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>
<item name="android:dividerHeight">0dp</item>
<item name="android:cacheColorHint">@android:color/transparent</item>
<item name="android:layout_height">match_parent</item>
<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/cpp_pane_padding</item>
</style>
<style name="default_fragment_title_style">
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">@dimen/cpp_fragment_title_text_size</item>
</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>
<item name="android:paddingRight">10dp</item>
</style>
<style name="default_pane_style_transparent" parent="default_pane_style">
<item name="android:background">@android:color/transparent</item>
<item name="android:padding">0dp</item>
</style>
<style name="default_pane_style">
<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/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">
</style>
<style name="default_fragment_layout_style">
<item name="android:layout_margin">0dp</item>
<item name="android:padding">0dp</item>
<item name="android:orientation">vertical</item>
</style>
<style name="default_main_layout_style">
<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>
</style>
<style name="widget_main_layout_style" parent="default_main_layout_style">
<item name="android:padding">1dp</item>
<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
</style>
<style name="default_actionbar_style" parent="@style/Widget.Sherlock.ActionBar">
<item name="background">@drawable/default_abs__ab_transparent_dark_holo</item>
<item name="android:background">@drawable/default_abs__ab_transparent_dark_holo</item>
</style>
<style name="default_actionbar_tab_style" parent="@style/Widget.Sherlock.ActionBar.TabView">
<item name="background">@drawable/default_abs__tab_indicator_ab_holo</item>
<item name="android:background">@drawable/default_abs__tab_indicator_ab_holo</item>
</style>
<style name="default_actionbar_close_button_style" parent="@style/Widget.Sherlock.ActionButton.CloseMode">
<item name="android:background">@drawable/default_abs__btn_cab_done_holo_dark</item>
<item name="background">@drawable/default_abs__btn_cab_done_holo_dark</item>
</style>
<style name="default_actionbar_dropdown_style" parent="@style/Widget.Sherlock.Spinner.DropDown.ActionBar">
<item name="android:background">@drawable/default_abs__spinner_ab_holo_dark</item>
<item name="background">@drawable/default_abs__spinner_ab_holo_dark</item>
</style>
<style name="default_actionbar_dropdown_listview_style" parent="@style/Widget.Sherlock.ListView.DropDown">
<item name="android:listSelector">@drawable/default_abs__list_selector_holo_dark</item>
<!--<item name="listSelector">@drawable/default_abs__list_selector_holo_dark</item>-->
</style>
<style name="default_theme" parent="Theme.Sherlock">
<item name="cpp_digit_button_style">@style/default_digit_button_style</item>
<item name="cpp_control_button_style">@style/default_control_button_style</item>
<item name="cpp_control_image_button_style">@style/default_control_image_button_style</item>
<item name="cpp_operation_button_style">@style/default_operation_button_style</item>
<item name="cpp_fragment_title_style">@style/default_fragment_title_style</item>
<item name="cpp_fragment_list_view_style">@style/default_fragment_list_view_style</item>
<item name="cpp_fragment_list_view_item_style">@style/default_fragment_list_view_item_style</item>
<item name="cpp_button_style">@style/default_button_style</item>
<item name="cpp_main_layout_style">@style/default_main_layout_style</item>
<item name="cpp_main_multi_pane_layout_style">@style/default_main_multi_pane_layout_style</item>
<item name="cpp_fragment_layout_style">@style/default_fragment_layout_style</item>
<item name="cpp_dialog_style">@style/default_dialog_style</item>
<item name="cpp_pane_style">@style/default_pane_style</item>
<item name="cpp_pane_style_transparent">@style/default_pane_style_transparent</item>
<!-- action bar-->
<item name="actionBarTabStyle">@style/default_actionbar_tab_style</item>
<item name="android:actionBarTabStyle">@style/default_actionbar_tab_style</item>
<item name="actionBarStyle">@style/default_actionbar_style</item>
<item name="android:actionBarStyle">@style/default_actionbar_style</item>
<item name="actionModeCloseButtonStyle">@style/default_actionbar_close_button_style</item>
<item name="android:actionModeCloseButtonStyle">@style/default_actionbar_close_button_style</item>
<item name="actionBarItemBackground">@drawable/default_abs__item_background_holo_dark</item>
<item name="android:actionBarItemBackground">@drawable/default_abs__item_background_holo_dark</item>
<item name="actionDropDownStyle">@style/default_actionbar_dropdown_style</item>
<item name="android:actionDropDownStyle">@style/default_actionbar_dropdown_style</item>
<item name="dropDownListViewStyle">@style/default_actionbar_dropdown_listview_style</item>
<item name="android:dropDownListViewStyle">@style/default_actionbar_dropdown_listview_style</item>
</style>
</resources>

163
calculatorpp/res/values/theme_gray.xml Normal file
View File

@ -0,0 +1,163 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<resources>
<style name="cpp_default_digit_button_style" parent="cpp_keyboard_button_style">
<item name="android:background">@drawable/gray_button</item>
</style>
<style name="cpp_default_dialog_style">
<item name="android:padding">6dp</item>
</style>
<style name="cpp_default_control_button_style" parent="cpp_keyboard_button_style">
<item name="android:background">@drawable/gray_button_dark</item>
</style>
<style name="cpp_default_operation_button_style" parent="cpp_default_digit_button_style">
<item name="android:textColor">@color/cpp_button_operator_text_color</item>
</style>
<style name="cpp_default_control_image_button_style" parent="cpp_default_control_button_style">
<item name="android:padding">6dp</item>
</style>
<style name="cpp_default_fragment_list_view_item_style">
</style>
<style name="cpp_default_fragment_list_view_style">
<item name="android:id">@android:id/list</item>
<item name="android:divider">@null</item>
<item name="android:dividerHeight">0dp</item>
<item name="android:cacheColorHint">@android:color/transparent</item>
<item name="android:layout_height">match_parent</item>
<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/cpp_pane_padding</item>
</style>
<style name="cpp_default_fragment_title_style">
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">@dimen/cpp_fragment_title_text_size</item>
</style>
<style name="cpp_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>
<item name="android:paddingRight">10dp</item>
</style>
<style name="cpp_default_pane_style_transparent" parent="cpp_default_pane_style">
<item name="android:background">@android:color/transparent</item>
<item name="android:padding">0dp</item>
</style>
<style name="cpp_default_pane_style">
<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="cpp_default_main_multi_pane_layout_style" parent="cpp_default_main_layout_style">
<item name="android:paddingRight">@dimen/cpp_pane_padding</item>
<item name="android:paddingBottom">@dimen/cpp_pane_padding</item>
</style>
<style name="cpp_default_fragment_multi_pane_layout_style" parent="cpp_default_fragment_layout_style">
</style>
<style name="cpp_default_fragment_layout_style">
<item name="android:layout_margin">0dp</item>
<item name="android:padding">0dp</item>
<item name="android:orientation">vertical</item>
</style>
<style name="cpp_default_main_layout_style">
<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>
</style>
<style name="cpp_widget_main_layout_style" parent="cpp_default_main_layout_style">
<item name="android:padding">1dp</item>
<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
</style>
<style name="cpp_default_actionbar_style" parent="@style/Widget.Sherlock.ActionBar">
<item name="background">@drawable/default_abs__ab_transparent_dark_holo</item>
<item name="android:background">@drawable/default_abs__ab_transparent_dark_holo</item>
</style>
<style name="cpp_default_actionbar_tab_style" parent="@style/Widget.Sherlock.ActionBar.TabView">
<item name="background">@drawable/default_abs__tab_indicator_ab_holo</item>
<item name="android:background">@drawable/default_abs__tab_indicator_ab_holo</item>
</style>
<style name="cpp_default_actionbar_close_button_style" parent="@style/Widget.Sherlock.ActionButton.CloseMode">
<item name="android:background">@drawable/default_abs__btn_cab_done_holo_dark</item>
<item name="background">@drawable/default_abs__btn_cab_done_holo_dark</item>
</style>
<style name="cpp_default_actionbar_dropdown_style" parent="@style/Widget.Sherlock.Spinner.DropDown.ActionBar">
<item name="android:background">@drawable/default_abs__spinner_ab_holo_dark</item>
<item name="background">@drawable/default_abs__spinner_ab_holo_dark</item>
</style>
<style name="cpp_default_actionbar_dropdown_listview_style" parent="@style/Widget.Sherlock.ListView.DropDown">
<item name="android:listSelector">@drawable/default_abs__list_selector_holo_dark</item>
<!--<item name="listSelector">@drawable/default_abs__list_selector_holo_dark</item>-->
</style>
<style name="cpp_gray_theme" parent="Theme.Sherlock">
<!-- buttons -->
<item name="cpp_digit_button_style">@style/cpp_default_digit_button_style</item>
<item name="cpp_control_button_style">@style/cpp_default_control_button_style</item>
<item name="cpp_control_image_button_style">@style/cpp_default_control_image_button_style</item>
<item name="cpp_operation_button_style">@style/cpp_default_operation_button_style</item>
<!-- other -->
<item name="cpp_fragment_title_style">@style/cpp_default_fragment_title_style</item>
<item name="cpp_fragment_list_view_style">@style/cpp_default_fragment_list_view_style</item>
<item name="cpp_fragment_list_view_item_style">@style/cpp_default_fragment_list_view_item_style</item>
<item name="cpp_button_style">@style/cpp_default_button_style</item>
<item name="cpp_main_layout_style">@style/cpp_default_main_layout_style</item>
<item name="cpp_main_multi_pane_layout_style">@style/cpp_default_main_multi_pane_layout_style</item>
<item name="cpp_fragment_layout_style">@style/cpp_default_fragment_layout_style</item>
<item name="cpp_dialog_style">@style/cpp_default_dialog_style</item>
<item name="cpp_pane_style">@style/cpp_default_pane_style</item>
<item name="cpp_pane_style_transparent">@style/cpp_default_pane_style_transparent</item>
<!-- action bar-->
<item name="actionBarTabStyle">@style/cpp_default_actionbar_tab_style</item>
<item name="android:actionBarTabStyle">@style/cpp_default_actionbar_tab_style</item>
<item name="actionBarStyle">@style/cpp_default_actionbar_style</item>
<item name="android:actionBarStyle">@style/cpp_default_actionbar_style</item>
<item name="actionModeCloseButtonStyle">@style/cpp_default_actionbar_close_button_style</item>
<item name="android:actionModeCloseButtonStyle">@style/cpp_default_actionbar_close_button_style</item>
<item name="actionBarItemBackground">@drawable/default_abs__item_background_holo_dark</item>
<item name="android:actionBarItemBackground">@drawable/default_abs__item_background_holo_dark</item>
<item name="actionDropDownStyle">@style/cpp_default_actionbar_dropdown_style</item>
<item name="android:actionDropDownStyle">@style/cpp_default_actionbar_dropdown_style</item>
<item name="dropDownListViewStyle">@style/cpp_default_actionbar_dropdown_listview_style</item>
<item name="android:dropDownListViewStyle">@style/cpp_default_actionbar_dropdown_listview_style</item>
</style>
</resources>

2
calculatorpp/res/values/theme_light_blue.xml
View File

@ -23,7 +23,7 @@
<item name="android:padding">6dp</item> <item name="android:padding">6dp</item>
</style> </style>
<style name="light_blue_theme" parent="default_theme"> <style name="cpp_light_blue_theme" parent="cpp_gray_theme">
<item name="cpp_digit_button_style">@style/light_blue_digit_button_style</item> <item name="cpp_digit_button_style">@style/light_blue_digit_button_style</item>
<item name="cpp_control_button_style">@style/light_blue_control_button_style</item> <item name="cpp_control_button_style">@style/light_blue_control_button_style</item>
<item name="cpp_control_image_button_style">@style/light_blue_control_image_button_style</item> <item name="cpp_control_image_button_style">@style/light_blue_control_image_button_style</item>

6
calculatorpp/res/values/theme_metro_blue.xml
View File

@ -32,7 +32,7 @@
<item name="android:scaleType">center</item> <item name="android:scaleType">center</item>
</style> </style>
<style name="metro_blue_fragment_list_view_item_style" parent="default_fragment_list_view_item_style"> <style name="metro_blue_fragment_list_view_item_style" parent="cpp_default_fragment_list_view_item_style">
<item name="background">@drawable/metro_blue_list_item</item> <item name="background">@drawable/metro_blue_list_item</item>
<item name="android:background">@drawable/metro_blue_list_item</item> <item name="android:background">@drawable/metro_blue_list_item</item>
</style> </style>
@ -42,12 +42,12 @@
<item name="android:background">@drawable/metro_blue_abs__ab_transparent_dark_holo</item> <item name="android:background">@drawable/metro_blue_abs__ab_transparent_dark_holo</item>
</style> </style>
<style name="metro_blue_actionbar_tab_style" parent="default_actionbar_tab_style"> <style name="metro_blue_actionbar_tab_style" parent="cpp_default_actionbar_tab_style">
<item name="background">@drawable/metro_blue_abs__tab_indicator_ab_holo</item> <item name="background">@drawable/metro_blue_abs__tab_indicator_ab_holo</item>
<item name="android:background">@drawable/metro_blue_abs__tab_indicator_ab_holo</item> <item name="android:background">@drawable/metro_blue_abs__tab_indicator_ab_holo</item>
</style> </style>
<style name="metro_blue_theme" parent="default_theme"> <style name="cpp_metro_blue_theme" parent="cpp_gray_theme">
<item name="cpp_digit_button_style">@style/metro_digit_button_style</item> <item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
<item name="cpp_control_button_style">@style/metro_control_button_style</item> <item name="cpp_control_button_style">@style/metro_control_button_style</item>
<item name="cpp_control_image_button_style">@style/metro_control_image_button_style</item> <item name="cpp_control_image_button_style">@style/metro_control_image_button_style</item>

4
calculatorpp/res/values/theme_metro_green.xml
View File

@ -4,12 +4,12 @@
<item name="android:background">@drawable/metro_button_green</item> <item name="android:background">@drawable/metro_button_green</item>
</style> </style>
<style name="metro_green_fragment_list_view_item_style" parent="default_fragment_list_view_item_style"> <style name="metro_green_fragment_list_view_item_style" parent="cpp_default_fragment_list_view_item_style">
<item name="background">@drawable/metro_green_list_item</item> <item name="background">@drawable/metro_green_list_item</item>
<item name="android:background">@drawable/metro_green_list_item</item> <item name="android:background">@drawable/metro_green_list_item</item>
</style> </style>
<style name="metro_green_theme" parent="metro_blue_theme"> <style name="cpp_metro_green_theme" parent="cpp_metro_blue_theme">
<item name="cpp_operation_button_style">@style/metro_green_operation_button_style</item> <item name="cpp_operation_button_style">@style/metro_green_operation_button_style</item>
<item name="cpp_fragment_list_view_item_style">@style/metro_green_fragment_list_view_item_style</item> <item name="cpp_fragment_list_view_item_style">@style/metro_green_fragment_list_view_item_style</item>
</style> </style>

4
calculatorpp/res/values/theme_metro_purple.xml
View File

@ -5,12 +5,12 @@
</style> </style>
<style name="metro_purple_fragment_list_view_item_style" parent="default_fragment_list_view_item_style"> <style name="metro_purple_fragment_list_view_item_style" parent="cpp_default_fragment_list_view_item_style">
<item name="background">@drawable/metro_purple_list_item</item> <item name="background">@drawable/metro_purple_list_item</item>
<item name="android:background">@drawable/metro_purple_list_item</item> <item name="android:background">@drawable/metro_purple_list_item</item>
</style> </style>
<style name="metro_purple_theme" parent="metro_blue_theme"> <style name="cpp_metro_purple_theme" parent="cpp_metro_blue_theme">
<item name="cpp_operation_button_style">@style/metro_purple_operation_button_style</item> <item name="cpp_operation_button_style">@style/metro_purple_operation_button_style</item>
<item name="cpp_fragment_list_view_item_style">@style/metro_purple_fragment_list_view_item_style</item> <item name="cpp_fragment_list_view_item_style">@style/metro_purple_fragment_list_view_item_style</item>
</style> </style>

2
calculatorpp/res/values/theme_violet.xml
View File

@ -22,7 +22,7 @@
<item name="android:padding">6dp</item> <item name="android:padding">6dp</item>
</style> </style>
<style name="violet_theme" parent="default_theme"> <style name="cpp_violet_theme" parent="cpp_gray_theme">
<item name="cpp_digit_button_style">@style/violet_digit_button_style</item> <item name="cpp_digit_button_style">@style/violet_digit_button_style</item>
<item name="cpp_control_button_style">@style/violet_control_button_style</item> <item name="cpp_control_button_style">@style/violet_control_button_style</item>
<item name="cpp_control_image_button_style">@style/violet_control_image_button_style</item> <item name="cpp_control_image_button_style">@style/violet_control_image_button_style</item>

2
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java
View File

@ -100,7 +100,7 @@ public class CalculatorActivityHelperImpl extends AbstractCalculatorHelper imple
toggleTitle(activity, true); toggleTitle(activity, true);
actionBar.setIcon(R.drawable.icon_action_bar); actionBar.setIcon(R.drawable.ab_icon);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
} }

2
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
View File

@ -22,7 +22,7 @@ import org.solovyev.android.calculator.widget.CalculatorWidgetHelper;
/*@ReportsCrashes(formKey = "dEhDaW1nZU1qcFdsVUpiSnhON0c0ZHc6MQ", /*@ReportsCrashes(formKey = "dEhDaW1nZU1qcFdsVUpiSnhON0c0ZHc6MQ",
mode = ReportingInteractionMode.TOAST)*/ mode = ReportingInteractionMode.TOAST)*/
@ReportsCrashes(formKey = "", @ReportsCrashes(formKey = "",
mailTo = "se.solovyev+programming+calculatorpp+crashes+1.5.0b@gmail.com", mailTo = "se.solovyev+programming+calculatorpp+crashes+1.5@gmail.com",
mode = ReportingInteractionMode.DIALOG, mode = ReportingInteractionMode.DIALOG,
resToastText = R.string.crashed, resToastText = R.string.crashed,
resDialogTitle = R.string.crash_dialog_title, resDialogTitle = R.string.crash_dialog_title,

14
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
View File

@ -63,12 +63,12 @@ public final class CalculatorPreferences {
public static enum Theme { public static enum Theme {
default_theme(ThemeType.other, R.style.default_theme), default_theme(ThemeType.other, R.style.cpp_gray_theme),
violet_theme(ThemeType.other, R.style.violet_theme), violet_theme(ThemeType.other, R.style.cpp_violet_theme),
light_blue_theme(ThemeType.other, R.style.light_blue_theme), light_blue_theme(ThemeType.other, R.style.cpp_light_blue_theme),
metro_blue_theme(ThemeType.metro, R.style.metro_blue_theme), metro_blue_theme(ThemeType.metro, R.style.cpp_metro_blue_theme),
metro_purple_theme(ThemeType.metro, R.style.metro_purple_theme), metro_purple_theme(ThemeType.metro, R.style.cpp_metro_purple_theme),
metro_green_theme(ThemeType.metro, R.style.metro_green_theme); metro_green_theme(ThemeType.metro, R.style.cpp_metro_green_theme);
@NotNull @NotNull
private final ThemeType themeType; private final ThemeType themeType;
@ -76,7 +76,7 @@ public final class CalculatorPreferences {
@NotNull @NotNull
private final Integer themeId; private final Integer themeId;
Theme(@NotNull ThemeType themeType, Integer themeId) { Theme(@NotNull ThemeType themeType, @NotNull Integer themeId) {
this.themeType = themeType; this.themeType = themeType;
this.themeId = themeId; this.themeId = themeId;
} }