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

Styles

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
calculatorpp/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 155 B

BIN
calculatorpp/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 244 B

BIN
calculatorpp/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 179 B

BIN
calculatorpp/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 179 B

BIN
calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 182 B

BIN
calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 183 B

BIN
calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 182 B

BIN
calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 178 B

34
calculatorpp/res/drawable/default_abs__tab_indicator_ab_holo.xml Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="false" a:drawable="@android:color/transparent" />
<item a:state_focused="false" a:state_selected="true" a:state_pressed="false" a:drawable="@drawable/abs__tab_selected_holo" />
<!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@drawable/abs__list_focused_holo" />
<item a:state_focused="true" a:state_selected="true" a:state_pressed="false" a:drawable="@drawable/abs__tab_selected_focused_holo" />
<!-- Pressed -->
<!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@drawable/abs__list_pressed_holo_dark" />
<item a:state_focused="false" a:state_selected="true" a:state_pressed="true" a:drawable="@drawable/abs__tab_selected_pressed_holo" />
<!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@drawable/abs__tab_unselected_pressed_holo" />
<item a:state_focused="true" a:state_selected="true" a:state_pressed="true" a:drawable="@drawable/abs__tab_selected_pressed_holo" />
</selector>

34
calculatorpp/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="false" a:drawable="@android:color/transparent" />
<item a:state_focused="false" a:state_selected="true" a:state_pressed="false" a:drawable="@drawable/metro_blue_abs__tab_selected_holo" />
<!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@drawable/metro_blue_abs__list_focused_holo" />
<item a:state_focused="true" a:state_selected="true" a:state_pressed="false" a:drawable="@drawable/metro_blue_abs__tab_selected_focused_holo" />
<!-- Pressed -->
<!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@drawable/metro_blue_abs__list_pressed_holo_dark" />
<item a:state_focused="false" a:state_selected="true" a:state_pressed="true" a:drawable="@drawable/metro_blue_abs__tab_selected_pressed_holo" />
<!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@drawable/metro_blue_abs__tab_unselected_pressed_holo" />
<item a:state_focused="true" a:state_selected="true" a:state_pressed="true" a:drawable="@drawable/metro_blue_abs__tab_selected_pressed_holo" />
</selector>

2
calculatorpp/res/drawable/metro_button_blue.xml → calculatorpp/res/drawable/metro_blue_button.xml
View File

@ -5,6 +5,6 @@
<item a:state_pressed="true" <item a:state_pressed="true"
a:drawable="@drawable/metro_button_pressed"/> a:drawable="@drawable/metro_button_pressed"/>
<item a:drawable="@drawable/metro_button_blue_shape"/> <item a:drawable="@drawable/metro_blue_button_shape"/>
</selector> </selector>

0
calculatorpp/res/drawable/metro_button_blue_shape.xml → calculatorpp/res/drawable/metro_blue_button_shape.xml
View File

15
calculatorpp/res/drawable/metro_blue_list_item.xml Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- pressed -->
<item android:state_pressed="true"
android:drawable="@color/metro_blue_color"/>
<!-- focused -->
<item android:state_focused="true"
android:drawable="@color/metro_blue_color"/>
<!-- default -->
<item android:drawable="@android:color/transparent"/>
</selector>

31
calculatorpp/res/layout/help_faq.xml
View File

@ -1,31 +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
-->
<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout
a:orientation="vertical"
a:id="@+id/ad_parent_view"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView
a:text="@string/c_faq_content"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:gravity="top|left"
a:layout_weight="1"
a:scrollbars="vertical"
style="@style/about_style"/>
</LinearLayout>
</ScrollView>

34
calculatorpp/res/layout/help_faq_fragment.xml Normal file
View File

@ -0,0 +1,34 @@
<?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
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?fragmentLayoutStyle"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragmentTitle"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?fragmentTitleStyle"/>
<ScrollView a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView
a:text="@string/c_faq_content"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/about_style"/>
</ScrollView>
</LinearLayout>

27
calculatorpp/res/layout/help_hints.xml
View File

@ -1,27 +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
-->
<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout
a:orientation="vertical"
a:id="@+id/ad_parent_view"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="@string/c_hints_content"
a:gravity="top|left"
a:layout_weight="1"
a:scrollbars="vertical"
style="@style/about_style"/>
</LinearLayout>
</ScrollView>

32
calculatorpp/res/layout/help_hints_fragment.xml Normal file
View File

@ -0,0 +1,32 @@
<?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
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?fragmentLayoutStyle"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragmentTitle"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?fragmentTitleStyle"/>
<ScrollView a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView
a:text="@string/c_hints_content"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/about_style"/>
</ScrollView>
</LinearLayout>

28
calculatorpp/res/layout/help_screens.xml
View File

@ -1,28 +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
-->
<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout
a:orientation="vertical"
a:id="@+id/ad_parent_view"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="@string/c_screens_content"
a:gravity="top|left"
a:layout_weight="1"
a:scrollbars="vertical"
style="@style/about_style"/>
</LinearLayout>
</ScrollView>

32
calculatorpp/res/layout/help_screens_fragment.xml Normal file
View File

@ -0,0 +1,32 @@
<?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
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?fragmentLayoutStyle"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragmentTitle"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?fragmentTitleStyle"/>
<ScrollView a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView
a:text="@string/c_screens_content"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/about_style"/>
</ScrollView>
</LinearLayout>

79
calculatorpp/res/layout/history_item.xml
View File

@ -1,40 +1,41 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev. ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical" a:orientation="vertical"
a:layout_width="fill_parent" style="?fragmentListViewItemStyle"
a:layout_height="fill_parent"> a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:id="@+id/history_time"
a:layout_width="fill_parent" <TextView a:id="@+id/history_time"
a:layout_height="fill_parent" a:layout_width="fill_parent"
style="@style/history_time"/> a:layout_height="fill_parent"
style="@style/history_time"/>
<TextView a:id="@+id/history_item"
a:layout_width="fill_parent" <TextView a:id="@+id/history_item"
a:layout_height="fill_parent" a:layout_width="fill_parent"
a:textColor="@color/button_operator_text_color" a:layout_height="fill_parent"
style="@style/history_item"/> a:textColor="@color/button_operator_text_color"
style="@style/history_item"/>
<LinearLayout a:orientation="horizontal"
a:layout_width="fill_parent" <LinearLayout a:orientation="horizontal"
a:layout_height="fill_parent"> a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:layout_width="wrap_content"
a:layout_height="fill_parent" <TextView a:layout_width="wrap_content"
a:text="@string/c_history_item_status" a:layout_height="fill_parent"
style="@style/history_item_label"/> a:text="@string/c_history_item_status"
style="@style/history_item_label"/>
<TextView a:id="@+id/history_item_status"
a:layout_width="fill_parent" <TextView a:id="@+id/history_item_status"
a:layout_height="fill_parent" a:layout_width="fill_parent"
style="@style/history_item"/> a:layout_height="fill_parent"
</LinearLayout> style="@style/history_item"/>
</LinearLayout>
</LinearLayout> </LinearLayout>

53
calculatorpp/res/layout/math_entity.xml
View File

@ -1,27 +1,28 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev. ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
a:paddingBottom="@dimen/pane_padding" style="?fragmentListViewItemStyle"
a:orientation="vertical"> a:paddingBottom="@dimen/pane_padding"
a:orientation="vertical">
<TextView a:id="@+id/math_entity_text"
a:layout_height="wrap_content" <TextView a:id="@+id/math_entity_text"
a:layout_width="match_parent" a:layout_height="wrap_content"
style="@style/math_entity_text"> a:layout_width="match_parent"
</TextView> style="@style/math_entity_text">
</TextView>
<TextView a:id="@+id/math_entity_description"
a:layout_height="wrap_content" <TextView a:id="@+id/math_entity_description"
a:layout_width="match_parent" a:layout_height="wrap_content"
style="@style/math_entity_description"> a:layout_width="match_parent"
</TextView> style="@style/math_entity_description">
</TextView>
</LinearLayout> </LinearLayout>

81
calculatorpp/res/layout/saved_history_item.xml
View File

@ -1,41 +1,42 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev. ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical" a:orientation="vertical"
a:layout_width="fill_parent" style="?fragmentListViewItemStyle"
a:layout_height="fill_parent"> a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:id="@+id/history_time"
a:layout_width="fill_parent" <TextView a:id="@+id/history_time"
a:layout_height="fill_parent" a:layout_width="fill_parent"
style="@style/history_time"/> a:layout_height="fill_parent"
style="@style/history_time"/>
<TextView a:id="@+id/history_item"
a:layout_width="fill_parent" <TextView a:id="@+id/history_item"
a:layout_height="fill_parent" a:layout_width="fill_parent"
a:textColor="@color/button_operator_text_color" a:layout_height="fill_parent"
style="@style/history_item"/> a:textColor="@color/button_operator_text_color"
style="@style/history_item"/>
<LinearLayout a:orientation="horizontal"
a:layout_width="fill_parent" <LinearLayout a:orientation="horizontal"
a:layout_height="fill_parent"> a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:id="@+id/history_item_comment_label"
a:layout_width="wrap_content" <TextView a:id="@+id/history_item_comment_label"
a:layout_height="fill_parent" a:layout_width="wrap_content"
a:text="@string/c_history_item_comment" a:layout_height="fill_parent"
style="@style/history_item_label"/> a:text="@string/c_history_item_comment"
style="@style/history_item_label"/>
<TextView a:id="@+id/history_item_comment"
a:layout_width="fill_parent" <TextView a:id="@+id/history_item_comment"
a:layout_height="fill_parent" a:layout_width="fill_parent"
style="@style/history_item"/> a:layout_height="fill_parent"
</LinearLayout> style="@style/history_item"/>
</LinearLayout>
</LinearLayout> </LinearLayout>

5
calculatorpp/res/values-large-land/dimens.xml
View File

@ -1,5 +0,0 @@
<resources>
<dimen name="editor_text_size">15sp</dimen>
<dimen name="display_text_size">15sp</dimen>
<dimen name="keyboard_button_text_size">20dp</dimen>
</resources>

13
calculatorpp/res/values-large/dimens.xml
View File

@ -1,7 +1,8 @@
<resources> <resources>
<dimen name="editor_text_size">15sp</dimen> <dimen name="fragment_text_size">10sp</dimen>
<dimen name="display_text_size">15sp</dimen> <dimen name="editor_text_size">15sp</dimen>
<dimen name="keyboard_button_text_size">20dp</dimen> <dimen name="display_text_size">15sp</dimen>
<dimen name="math_entity_text_size">15sp</dimen> <dimen name="keyboard_button_text_size">20dp</dimen>
<dimen name="math_entity_description_text_size">10sp</dimen> <dimen name="math_entity_text_size">15sp</dimen>
<dimen name="math_entity_description_text_size">10sp</dimen>
</resources> </resources>

35
calculatorpp/res/values/attributes.xml
View File

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

31
calculatorpp/res/values/dimens.xml
View File

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

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

@ -28,7 +28,7 @@
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:focusable">true</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:textSize">@dimen/button_text_size</item>
<item name="android:textColor">@color/button_text_color</item> <item name="android:textColor">@color/button_text_color</item>
</style> </style>
@ -62,7 +62,7 @@
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">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> <item name="android:padding">5dp</item>
</style> </style>

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

@ -212,7 +212,7 @@
<string name="other">Other</string> <string name="other">Other</string>
<string name="derivatives">Derivatives/Integrals</string> <string name="derivatives">Derivatives/Integrals</string>
<string name="crashed">Calculator++ has been crashed…</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"> <string name="crash_dialog_text">
Unfortunately, Calculator++ has been crashed.\n\n 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 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

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

@ -20,6 +20,9 @@
<item name="android:padding">6dp</item> <item name="android:padding">6dp</item>
</style> </style>
<style name="default_fragment_list_view_item_style">
</style>
<style name="default_fragment_list_view_style"> <style name="default_fragment_list_view_style">
<item name="android:id">@android:id/list</item> <item name="android:id">@android:id/list</item>
<item name="android:divider">@null</item> <item name="android:divider">@null</item>
@ -77,10 +80,12 @@
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
</style> </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>
<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>
<style name="default_theme" parent="Theme.Sherlock"> <style name="default_theme" parent="Theme.Sherlock">
@ -90,6 +95,7 @@
<item name="operationButtonStyle">@style/default_operation_button_style</item> <item name="operationButtonStyle">@style/default_operation_button_style</item>
<item name="fragmentTitleStyle">@style/default_fragment_title_style</item> <item name="fragmentTitleStyle">@style/default_fragment_title_style</item>
<item name="fragmentListViewStyle">@style/default_fragment_list_view_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="buttonStyle">@style/default_button_style</item>
<item name="mainLayoutStyle">@style/default_main_layout_style</item> <item name="mainLayoutStyle">@style/default_main_layout_style</item>
@ -102,6 +108,6 @@
<!-- action bar--> <!-- action bar-->
<item name="actionBarTabStyle">@style/default_actionbar_tab_style</item> <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> </style>
</resources> </resources>

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

@ -9,18 +9,36 @@
</style> </style>
<style name="metro_blue_operation_button_style" parent="metro_digit_button_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>
<style name="metro_control_image_button_style" parent="metro_control_button_style"> <style name="metro_control_image_button_style" parent="metro_control_button_style">
<item name="android:padding">6dp</item> <item name="android:padding">6dp</item>
</style> </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"> <style name="metro_blue_theme" parent="default_theme">
<item name="digitButtonStyle">@style/metro_digit_button_style</item> <item name="digitButtonStyle">@style/metro_digit_button_style</item>
<item name="controlButtonStyle">@style/metro_control_button_style</item> <item name="controlButtonStyle">@style/metro_control_button_style</item>
<item name="controlImageButtonStyle">@style/metro_control_image_button_style</item> <item name="controlImageButtonStyle">@style/metro_control_image_button_style</item>
<item name="operationButtonStyle">@style/metro_blue_operation_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> </resources>

156
calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
View File

@ -1,78 +1,78 @@
package org.solovyev.android.calculator.about; package org.solovyev.android.calculator.about;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.CalculatorEditorFragment; import org.solovyev.android.calculator.CalculatorEditorFragment;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.help.CalculatorHelpFaqFragment; import org.solovyev.android.calculator.help.CalculatorHelpFaqFragment;
import org.solovyev.android.calculator.help.CalculatorHelpHintsFragment; import org.solovyev.android.calculator.help.CalculatorHelpHintsFragment;
import org.solovyev.android.calculator.help.CalculatorHelpScreensFragment; import org.solovyev.android.calculator.help.CalculatorHelpScreensFragment;
import org.solovyev.android.calculator.history.CalculatorHistoryFragment; import org.solovyev.android.calculator.history.CalculatorHistoryFragment;
import org.solovyev.android.calculator.history.CalculatorSavedHistoryFragment; import org.solovyev.android.calculator.history.CalculatorSavedHistoryFragment;
import org.solovyev.android.calculator.math.edit.CalculatorFunctionsFragment; import org.solovyev.android.calculator.math.edit.CalculatorFunctionsFragment;
import org.solovyev.android.calculator.math.edit.CalculatorOperatorsFragment; import org.solovyev.android.calculator.math.edit.CalculatorOperatorsFragment;
import org.solovyev.android.calculator.math.edit.CalculatorVarsFragment; import org.solovyev.android.calculator.math.edit.CalculatorVarsFragment;
import org.solovyev.android.calculator.plot.CalculatorPlotFragment; import org.solovyev.android.calculator.plot.CalculatorPlotFragment;
/** /**
* User: Solovyev_S * User: Solovyev_S
* Date: 03.10.12 * Date: 03.10.12
* Time: 11:30 * Time: 11:30
*/ */
public enum CalculatorFragmentType { public enum CalculatorFragmentType {
editor(CalculatorEditorFragment.class, R.layout.calc_editor, R.string.editor), editor(CalculatorEditorFragment.class, R.layout.calc_editor, R.string.editor),
//display(CalculatorHistoryFragment.class, "history", R.layout.history_fragment, R.string.c_history), //display(CalculatorHistoryFragment.class, "history", R.layout.history_fragment, R.string.c_history),
//keyboard(CalculatorHistoryFragment.class, "history", R.layout.history_fragment, R.string.c_history), //keyboard(CalculatorHistoryFragment.class, "history", R.layout.history_fragment, R.string.c_history),
history(CalculatorHistoryFragment.class, R.layout.history_fragment, R.string.c_history), history(CalculatorHistoryFragment.class, R.layout.history_fragment, R.string.c_history),
saved_history(CalculatorSavedHistoryFragment.class, R.layout.history_fragment, R.string.c_saved_history), saved_history(CalculatorSavedHistoryFragment.class, R.layout.history_fragment, R.string.c_saved_history),
variables(CalculatorVarsFragment.class, R.layout.vars_fragment, R.string.c_vars), variables(CalculatorVarsFragment.class, R.layout.vars_fragment, R.string.c_vars),
functions(CalculatorFunctionsFragment.class, R.layout.math_entities_fragment, R.string.c_functions), functions(CalculatorFunctionsFragment.class, R.layout.math_entities_fragment, R.string.c_functions),
operators(CalculatorOperatorsFragment.class, R.layout.math_entities_fragment, R.string.c_operators), operators(CalculatorOperatorsFragment.class, R.layout.math_entities_fragment, R.string.c_operators),
plotter(CalculatorPlotFragment.class, R.layout.plot_fragment, R.string.c_plot), plotter(CalculatorPlotFragment.class, R.layout.plot_fragment, R.string.c_plot),
about(CalculatorAboutFragment.class, R.layout.about_fragment, R.string.c_about), about(CalculatorAboutFragment.class, R.layout.about_fragment, R.string.c_about),
// todo serso: rename and inflate ad // todo serso: rename and inflate ad
faq(CalculatorHelpFaqFragment.class, R.layout.help_faq, R.string.c_faq), faq(CalculatorHelpFaqFragment.class, R.layout.help_faq_fragment, R.string.c_faq),
hints(CalculatorHelpHintsFragment.class, R.layout.help_hints, R.string.c_hints), hints(CalculatorHelpHintsFragment.class, R.layout.help_hints_fragment, R.string.c_hints),
screens(CalculatorHelpScreensFragment.class, R.layout.help_screens, R.string.c_screens), screens(CalculatorHelpScreensFragment.class, R.layout.help_screens_fragment, R.string.c_screens),
release_notes(CalculatorReleaseNotesFragment.class, R.layout.release_notes_fragment, R.string.c_release_notes); release_notes(CalculatorReleaseNotesFragment.class, R.layout.release_notes_fragment, R.string.c_release_notes);
@NotNull @NotNull
private Class<? extends Fragment> fragmentClass; private Class<? extends Fragment> fragmentClass;
private final int defaultLayoutId; private final int defaultLayoutId;
private int defaultTitleResId; private int defaultTitleResId;
private CalculatorFragmentType(@NotNull Class<? extends Fragment> fragmentClass, private CalculatorFragmentType(@NotNull Class<? extends Fragment> fragmentClass,
int defaultLayoutId, int defaultLayoutId,
int defaultTitleResId) { int defaultTitleResId) {
this.fragmentClass = fragmentClass; this.fragmentClass = fragmentClass;
this.defaultLayoutId = defaultLayoutId; this.defaultLayoutId = defaultLayoutId;
this.defaultTitleResId = defaultTitleResId; this.defaultTitleResId = defaultTitleResId;
} }
@NotNull @NotNull
public String getFragmentTag() { public String getFragmentTag() {
return this.name(); return this.name();
} }
public int getDefaultTitleResId() { public int getDefaultTitleResId() {
return defaultTitleResId; return defaultTitleResId;
} }
@NotNull @NotNull
public Class<? extends Fragment> getFragmentClass() { public Class<? extends Fragment> getFragmentClass() {
return fragmentClass; return fragmentClass;
} }
public int getDefaultLayoutId() { public int getDefaultLayoutId() {
return defaultLayoutId; return defaultLayoutId;
} }
@NotNull @NotNull
public String createSubFragmentTag(@NotNull String subFragmentTag) { public String createSubFragmentTag(@NotNull String subFragmentTag) {
return this.getFragmentTag() + "_" + subFragmentTag; return this.getFragmentTag() + "_" + subFragmentTag;
} }
} }