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

Changes

Browse Source
This commit is contained in:
Sergey Solovyev 2012-11-18 16:58:33 +04:00
parent 344018a44c
commit b3396d0ffe
63 changed files with 208 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calculatorpp/res/drawable/metro_blue_button_shape.xml
View File

@ -15,6 +15,6 @@
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/metro_blue_color"/> <solid android:color="@color/cpp_metro_blue_color"/>
<corners android:radius="1dp" /> <corners android:radius="1dp" />
</shape> </shape>

14
calculatorpp/res/drawable/metro_blue_list_item.xml
View File

@ -4,18 +4,18 @@
<selector xmlns:a="http://schemas.android.com/apk/res/android"> <selector xmlns:a="http://schemas.android.com/apk/res/android">
<!-- Non focused states --> <!-- 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="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="@color/metro_blue_color" /> <item a:state_focused="false" a:state_selected="true" a:state_pressed="false" a:drawable="@color/cpp_metro_blue_color" />
<!-- Focused states --> <!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@color/metro_blue_color" /> <item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@color/cpp_metro_blue_color" />
<item a:state_focused="true" a:state_selected="true" a:state_pressed="false" a:drawable="@color/metro_blue_color" /> <item a:state_focused="true" a:state_selected="true" a:state_pressed="false" a:drawable="@color/cpp_metro_blue_color" />
<!-- Pressed --> <!-- Pressed -->
<!-- Non focused states --> <!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_blue_color" /> <item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@color/cpp_metro_blue_color" />
<item a:state_focused="false" a:state_selected="true" a:state_pressed="true" a:drawable="@color/metro_blue_color" /> <item a:state_focused="false" a:state_selected="true" a:state_pressed="true" a:drawable="@color/cpp_metro_blue_color" />
<!-- Focused states --> <!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_blue_color" /> <item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@color/cpp_metro_blue_color" />
<item a:state_focused="true" a:state_selected="true" a:state_pressed="true" a:drawable="@color/metro_blue_color" /> <item a:state_focused="true" a:state_selected="true" a:state_pressed="true" a:drawable="@color/cpp_metro_blue_color" />
</selector> </selector>

2
calculatorpp/res/drawable/metro_button_dark_shape.xml
View File

@ -15,6 +15,6 @@
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/metro_button_background"/> <solid android:color="@color/cpp_metro_button_background"/>
<corners android:radius="1dp" /> <corners android:radius="1dp" />
</shape> </shape>

2
calculatorpp/res/drawable/metro_button_green_shape.xml
View File

@ -15,6 +15,6 @@
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/metro_green_color"/> <solid android:color="@color/cpp_metro_green_color"/>
<corners android:radius="1dp" /> <corners android:radius="1dp" />
</shape> </shape>

2
calculatorpp/res/drawable/metro_button_light_shape.xml
View File

@ -15,6 +15,6 @@
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/metro_light_button_background"/> <solid android:color="@color/cpp_metro_light_button_background"/>
<corners android:radius="1dp" /> <corners android:radius="1dp" />
</shape> </shape>

2
calculatorpp/res/drawable/metro_button_purple_shape.xml
View File

@ -15,6 +15,6 @@
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/metro_purple_color"/> <solid android:color="@color/cpp_metro_purple_color"/>
<corners android:radius="1dp" /> <corners android:radius="1dp" />
</shape> </shape>

14
calculatorpp/res/drawable/metro_green_list_item.xml
View File

@ -4,19 +4,19 @@
<selector xmlns:a="http://schemas.android.com/apk/res/android"> <selector xmlns:a="http://schemas.android.com/apk/res/android">
<!-- Non focused states --> <!-- 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="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="@color/metro_green_color" /> <item a:state_focused="false" a:state_selected="true" a:state_pressed="false" a:drawable="@color/cpp_metro_green_color" />
<!-- Focused states --> <!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@color/metro_green_color" /> <item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@color/cpp_metro_green_color" />
<item a:state_focused="true" a:state_selected="true" a:state_pressed="false" a:drawable="@color/metro_green_color" /> <item a:state_focused="true" a:state_selected="true" a:state_pressed="false" a:drawable="@color/cpp_metro_green_color" />
<!-- Pressed --> <!-- Pressed -->
<!-- Non focused states --> <!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_green_color" /> <item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@color/cpp_metro_green_color" />
<item a:state_focused="false" a:state_selected="true" a:state_pressed="true" a:drawable="@color/metro_green_color" /> <item a:state_focused="false" a:state_selected="true" a:state_pressed="true" a:drawable="@color/cpp_metro_green_color" />
<!-- Focused states --> <!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_green_color" /> <item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@color/cpp_metro_green_color" />
<item a:state_focused="true" a:state_selected="true" a:state_pressed="true" a:drawable="@color/metro_green_color" /> <item a:state_focused="true" a:state_selected="true" a:state_pressed="true" a:drawable="@color/cpp_metro_green_color" />
</selector> </selector>

14
calculatorpp/res/drawable/metro_purple_list_item.xml
View File

@ -4,18 +4,18 @@
<selector xmlns:a="http://schemas.android.com/apk/res/android"> <selector xmlns:a="http://schemas.android.com/apk/res/android">
<!-- Non focused states --> <!-- 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="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="@color/metro_purple_color" /> <item a:state_focused="false" a:state_selected="true" a:state_pressed="false" a:drawable="@color/cpp_metro_purple_color" />
<!-- Focused states --> <!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@color/metro_purple_color" /> <item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@color/cpp_metro_purple_color" />
<item a:state_focused="true" a:state_selected="true" a:state_pressed="false" a:drawable="@color/metro_purple_color" /> <item a:state_focused="true" a:state_selected="true" a:state_pressed="false" a:drawable="@color/cpp_metro_purple_color" />
<!-- Pressed --> <!-- Pressed -->
<!-- Non focused states --> <!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_purple_color" /> <item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@color/cpp_metro_purple_color" />
<item a:state_focused="false" a:state_selected="true" a:state_pressed="true" a:drawable="@color/metro_purple_color" /> <item a:state_focused="false" a:state_selected="true" a:state_pressed="true" a:drawable="@color/cpp_metro_purple_color" />
<!-- Focused states --> <!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_purple_color" /> <item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@color/cpp_metro_purple_color" />
<item a:state_focused="true" a:state_selected="true" a:state_pressed="true" a:drawable="@color/metro_purple_color" /> <item a:state_focused="true" a:state_selected="true" a:state_pressed="true" a:drawable="@color/cpp_metro_purple_color" />
</selector> </selector>

2
calculatorpp/res/drawable/pane_background.xml
View File

@ -15,6 +15,6 @@
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/pane_background"/> <solid android:color="@color/cpp_pane_background"/>
<corners android:radius="1dp" /> <corners android:radius="1dp" />
</shape> </shape>

10
calculatorpp/res/layout-land/main_first_pane.xml
View File

@ -22,13 +22,13 @@
a:layout_height="0dp"> a:layout_height="0dp">
<include layout="@layout/calc_left_button" <include layout="@layout/calc_left_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1"/>
<include layout="@layout/calc_erase_button" <include layout="@layout/calc_erase_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1"/>
@ -37,16 +37,16 @@
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_weight="4" a:layout_weight="4"
a:layout_margin="@dimen/display_margin_land"/> a:layout_margin="@dimen/cpp_display_margin_land"/>
<include layout="@layout/calc_clear_button" <include layout="@layout/calc_clear_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1"/>
<include layout="@layout/calc_right_button" <include layout="@layout/calc_right_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1"/>

10
calculatorpp/res/layout-land/main_first_pane_mobile.xml
View File

@ -22,13 +22,13 @@
a:layout_height="0dp"> a:layout_height="0dp">
<include layout="@layout/calc_left_button" <include layout="@layout/calc_left_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1"/>
<include layout="@layout/calc_erase_button" <include layout="@layout/calc_erase_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1"/>
@ -37,16 +37,16 @@
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_weight="4" a:layout_weight="4"
a:layout_margin="@dimen/display_margin_land"/> a:layout_margin="@dimen/cpp_display_margin_land"/>
<include layout="@layout/calc_clear_button" <include layout="@layout/calc_clear_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1"/>
<include layout="@layout/calc_right_button" <include layout="@layout/calc_right_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1"/>

2
calculatorpp/res/layout-large/calc_display.xml
View File

@ -19,7 +19,7 @@
<org.solovyev.android.calculator.AndroidCalculatorDisplayView <org.solovyev.android.calculator.AndroidCalculatorDisplayView
a:id="@+id/calculatorDisplay" a:id="@+id/calculatorDisplay"
style="@style/display_style" style="@style/cpp_display_style"
a:inputType="textMultiLine" a:inputType="textMultiLine"
a:maxLines="3" a:maxLines="3"
a:scrollHorizontally="false" a:scrollHorizontally="false"

2
calculatorpp/res/layout-large/calc_editor.xml
View File

@ -19,7 +19,7 @@
<org.solovyev.android.calculator.AndroidCalculatorEditorView <org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculatorEditor" a:id="@+id/calculatorEditor"
style="@style/editor_style" style="@style/cpp_editor_style"
a:textIsSelectable="true" a:textIsSelectable="true"
a:singleLine="false" a:singleLine="false"
a:scrollbars="vertical" a:scrollbars="vertical"

2
calculatorpp/res/layout-xlarge/calc_display.xml
View File

@ -19,7 +19,7 @@
<org.solovyev.android.calculator.AndroidCalculatorDisplayView <org.solovyev.android.calculator.AndroidCalculatorDisplayView
a:id="@+id/calculatorDisplay" a:id="@+id/calculatorDisplay"
style="@style/display_style" style="@style/cpp_display_style"
a:inputType="textMultiLine" a:inputType="textMultiLine"
a:maxLines="3" a:maxLines="3"
a:scrollHorizontally="false" a:scrollHorizontally="false"

2
calculatorpp/res/layout-xlarge/calc_editor.xml
View File

@ -19,7 +19,7 @@
<org.solovyev.android.calculator.AndroidCalculatorEditorView <org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculatorEditor" a:id="@+id/calculatorEditor"
style="@style/editor_style" style="@style/cpp_editor_style"
a:textIsSelectable="true" a:textIsSelectable="true"
a:singleLine="false" a:singleLine="false"
a:scrollbars="vertical" a:scrollbars="vertical"

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

@ -27,7 +27,7 @@
a:layout_gravity="top|center_horizontal" a:layout_gravity="top|center_horizontal"
a:layout_weight="1" a:layout_weight="1"
a:scrollbars="vertical" a:scrollbars="vertical"
style="@style/about_style"/> style="@style/cpp_about_style"/>
<!-- <!--
a:scrollbarFadeDuration="0" is not support in android_1.6_compatibility a:scrollbarFadeDuration="0" is not support in android_1.6_compatibility

4
calculatorpp/res/layout/calc_display.xml
View File

@ -9,8 +9,8 @@
<org.solovyev.android.calculator.AndroidCalculatorDisplayView <org.solovyev.android.calculator.AndroidCalculatorDisplayView
xmlns:a="http://schemas.android.com/apk/res/android" xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculatorDisplay" a:id="@+id/calculatorDisplay"
style="@style/display_style" style="@style/cpp_display_style"
a:padding="@dimen/display_padding" a:padding="@dimen/cpp_display_padding"
a:inputType="textMultiLine" a:inputType="textMultiLine"
a:maxLines="3" a:maxLines="3"
a:scrollHorizontally="false" a:scrollHorizontally="false"

4
calculatorpp/res/layout/calc_display_mobile.xml
View File

@ -9,8 +9,8 @@
<org.solovyev.android.calculator.AndroidCalculatorDisplayView <org.solovyev.android.calculator.AndroidCalculatorDisplayView
xmlns:a="http://schemas.android.com/apk/res/android" xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculatorDisplay" a:id="@+id/calculatorDisplay"
style="@style/display_style" style="@style/cpp_display_style"
a:padding="@dimen/display_padding" a:padding="@dimen/cpp_display_padding"
a:inputType="textMultiLine" a:inputType="textMultiLine"
a:maxLines="3" a:maxLines="3"
a:scrollHorizontally="false" a:scrollHorizontally="false"

4
calculatorpp/res/layout/calc_editor.xml
View File

@ -11,11 +11,11 @@
style="?fragmentLayoutStyle" style="?fragmentLayoutStyle"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:padding="@dimen/editor_padding"> a:padding="@dimen/cpp_editor_padding">
<org.solovyev.android.calculator.AndroidCalculatorEditorView <org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculatorEditor" a:id="@+id/calculatorEditor"
style="@style/editor_style" style="@style/cpp_editor_style"
a:textIsSelectable="true" a:textIsSelectable="true"
a:singleLine="false" a:singleLine="false"
a:scrollbars="vertical" a:scrollbars="vertical"

4
calculatorpp/res/layout/calc_editor_mobile.xml
View File

@ -11,11 +11,11 @@
style="?fragmentLayoutStyle" style="?fragmentLayoutStyle"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:padding="@dimen/editor_padding"> a:padding="@dimen/cpp_editor_padding">
<org.solovyev.android.calculator.AndroidCalculatorEditorView <org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculatorEditor" a:id="@+id/calculatorEditor"
style="@style/editor_style" style="@style/cpp_editor_style"
a:textIsSelectable="true" a:textIsSelectable="true"
a:singleLine="false" a:singleLine="false"
a:scrollbars="vertical" a:scrollbars="vertical"

4
calculatorpp/res/layout/calc_title.xml
View File

@ -16,14 +16,14 @@
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_gravity="left" a:layout_gravity="left"
style="@style/WindowTitle" style="@style/cpp_window_title"
a:text="@string/c_app_name"/> a:text="@string/c_app_name"/>
<org.solovyev.android.calculator.view.CalculatorAdditionalTitle <org.solovyev.android.calculator.view.CalculatorAdditionalTitle
a:id="@+id/additional_title_text" a:id="@+id/additional_title_text"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
style="@style/WindowTitle" style="@style/cpp_window_title"
a:gravity="center_vertical|right" a:gravity="center_vertical|right"
a:layout_gravity="right"/> a:layout_gravity="right"/>

4
calculatorpp/res/layout/calculator_messages_dialog.xml
View File

@ -24,10 +24,10 @@
a:orientation="horizontal" a:orientation="horizontal"
a:gravity="center"> a:gravity="center">
<Button a:id="@+id/ok_button" <Button a:id="@+id/close_button"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:text="@string/ok"/> a:text="@string/close"/>
</LinearLayout> </LinearLayout>

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

@ -17,7 +17,7 @@
a:id="@+id/fix_button" a:id="@+id/fix_button"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1" a:layout_weight="2"
a:text="@string/fix"/> a:text="@string/fix"/>
</LinearLayout> </LinearLayout>

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

@ -23,7 +23,7 @@
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:padding="6dp" a:padding="6dp"
style="@style/default_text_size"/> style="@style/cpp_default_text_size"/>
</LinearLayout> </LinearLayout>

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

@ -11,7 +11,7 @@
a:layout_height="fill_parent"> a:layout_height="fill_parent">
<TextView a:id="@+id/feedbackText" <TextView a:id="@+id/feedbackText"
style="@style/about_style" style="@style/cpp_about_style"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:text="@string/c_feedback_text" a:text="@string/c_feedback_text"
a:layout_height="fill_parent"/> a:layout_height="fill_parent"/>

14
calculatorpp/res/layout/function_edit.xml
View File

@ -18,19 +18,19 @@
<TextView a:layout_height="wrap_content" <TextView a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
a:padding="6dp" a:padding="6dp"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:text="@string/c_function_name"/> a:text="@string/c_function_name"/>
<EditText a:id="@+id/function_edit_name" <EditText a:id="@+id/function_edit_name"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:inputType="text"/> a:inputType="text"/>
<TextView a:layout_height="wrap_content" <TextView a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
a:padding="6dp" a:padding="6dp"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:text="@string/c_function_parameters"/> a:text="@string/c_function_parameters"/>
<org.solovyev.android.calculator.function.FunctionParamsView <org.solovyev.android.calculator.function.FunctionParamsView
@ -40,26 +40,26 @@
<TextView a:layout_height="wrap_content" <TextView a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:padding="6dp" a:padding="6dp"
a:text="@string/c_function_value"/> a:text="@string/c_function_value"/>
<EditText a:id="@+id/function_edit_value" <EditText a:id="@+id/function_edit_value"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:inputType="text"/> a:inputType="text"/>
<TextView a:layout_height="wrap_content" <TextView a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
a:padding="6dp" a:padding="6dp"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:text="@string/c_function_description"/> a:text="@string/c_function_description"/>
<EditText a:id="@+id/function_edit_description" <EditText a:id="@+id/function_edit_description"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:inputType="text"/> a:inputType="text"/>
<LinearLayout <LinearLayout

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

@ -27,7 +27,7 @@
a:id="@+id/function_param_edit_text" a:id="@+id/function_param_edit_text"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:inputType="text" /> a:inputType="text" />
</LinearLayout> </LinearLayout>

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

@ -28,7 +28,7 @@
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="top|left" a:gravity="top|left"
a:scrollbars="vertical" a:scrollbars="vertical"
style="@style/about_style"/> style="@style/cpp_about_style"/>
</ScrollView> </ScrollView>

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

@ -27,7 +27,7 @@
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="top|left" a:gravity="top|left"
a:scrollbars="vertical" a:scrollbars="vertical"
style="@style/about_style"/> style="@style/cpp_about_style"/>
</ScrollView> </ScrollView>

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

@ -27,7 +27,7 @@
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="top|left" a:gravity="top|left"
a:scrollbars="vertical" a:scrollbars="vertical"
style="@style/about_style"/> style="@style/cpp_about_style"/>
</ScrollView> </ScrollView>

8
calculatorpp/res/layout/history_edit.xml
View File

@ -21,7 +21,7 @@
<TextView a:layout_height="fill_parent" <TextView a:layout_height="fill_parent"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:padding="6dp" a:padding="6dp"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:text="@string/c_history_expression"/> a:text="@string/c_history_expression"/>
<TextView a:id="@+id/history_edit_expression" <TextView a:id="@+id/history_edit_expression"
@ -29,12 +29,12 @@
a:padding="6dp" a:padding="6dp"
a:textStyle="bold" a:textStyle="bold"
a:layout_height="wrap_content" a:layout_height="wrap_content"
style="@style/default_text_size"> style="@style/cpp_default_text_size">
</TextView> </TextView>
<TextView a:layout_height="fill_parent" <TextView a:layout_height="fill_parent"
a:layout_width="fill_parent" a:layout_width="fill_parent"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:padding="6dp" a:padding="6dp"
a:text="@string/c_history_comment"/> a:text="@string/c_history_comment"/>
@ -44,7 +44,7 @@
a:minLines="4" a:minLines="4"
a:maxLines="4" a:maxLines="4"
a:gravity="top|left" a:gravity="top|left"
style="@style/default_text_size"> style="@style/cpp_default_text_size">
</EditText> </EditText>
</LinearLayout> </LinearLayout>

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

@ -20,7 +20,7 @@
<TextView a:id="@+id/history_item" <TextView a:id="@+id/history_item"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:textColor="@color/button_operator_text_color" a:textColor="@color/cpp_button_operator_text_color"
style="@style/history_item"/> style="@style/history_item"/>
<LinearLayout a:orientation="horizontal" <LinearLayout a:orientation="horizontal"

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

@ -24,7 +24,7 @@
a:layout_height="0dp"> a:layout_height="0dp">
<include layout="@layout/calc_equals_button" <include layout="@layout/calc_equals_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_weight="1" a:layout_weight="1"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent"/> a:layout_height="match_parent"/>

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

@ -24,7 +24,7 @@
a:layout_height="0dp"> a:layout_height="0dp">
<include layout="@layout/calc_equals_button" <include layout="@layout/calc_equals_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_weight="1" a:layout_weight="1"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent"/> a:layout_height="match_parent"/>

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

@ -10,7 +10,7 @@
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="?fragmentListViewItemStyle" style="?fragmentListViewItemStyle"
a:paddingBottom="@dimen/pane_padding" a:paddingBottom="@dimen/cpp_pane_padding"
a:orientation="vertical"> a:orientation="vertical">
<TextView a:id="@+id/math_entity_text" <TextView a:id="@+id/math_entity_text"

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

@ -11,7 +11,7 @@
a:layout_height="fill_parent"> a:layout_height="fill_parent">
<TextView a:id="@+id/notespp_announce" <TextView a:id="@+id/notespp_announce"
style="@style/about_style" style="@style/cpp_about_style"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:text="@string/c_notespp_announce_text" a:text="@string/c_notespp_announce_text"
a:layout_height="fill_parent"/> a:layout_height="fill_parent"/>

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

@ -19,7 +19,7 @@
a:layout_weight="1" a:layout_weight="1"
a:gravity="top|left" a:gravity="top|left"
a:scrollbars="vertical" a:scrollbars="vertical"
style="@style/about_style"/> style="@style/cpp_about_style"/>
<!-- <!--
a:scrollbarFadeDuration="0" is not support in android_1.6_compatibility a:scrollbarFadeDuration="0" is not support in android_1.6_compatibility

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

@ -20,7 +20,7 @@
<TextView a:id="@+id/history_item" <TextView a:id="@+id/history_item"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:textColor="@color/button_operator_text_color" a:textColor="@color/cpp_button_operator_text_color"
style="@style/history_item"/> style="@style/history_item"/>
<LinearLayout a:orientation="horizontal" <LinearLayout a:orientation="horizontal"

12
calculatorpp/res/layout/var_edit.xml
View File

@ -18,37 +18,37 @@
<TextView a:layout_height="wrap_content" <TextView a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
a:padding="6dp" a:padding="6dp"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:text="@string/c_var_name"/> a:text="@string/c_var_name"/>
<EditText a:id="@+id/var_edit_name" <EditText a:id="@+id/var_edit_name"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:inputType="text"/> a:inputType="text"/>
<TextView a:layout_height="wrap_content" <TextView a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:padding="6dp" a:padding="6dp"
a:text="@string/c_var_value"/> a:text="@string/c_var_value"/>
<EditText a:id="@+id/var_edit_value" <EditText a:id="@+id/var_edit_value"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:inputType="numberDecimal"/> a:inputType="numberDecimal"/>
<TextView a:layout_height="wrap_content" <TextView a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
a:padding="6dp" a:padding="6dp"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:text="@string/c_var_description"/> a:text="@string/c_var_description"/>
<EditText a:id="@+id/var_edit_description" <EditText a:id="@+id/var_edit_description"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/default_text_size" style="@style/cpp_default_text_size"
a:inputType="text"/> a:inputType="text"/>
<LinearLayout <LinearLayout

4
calculatorpp/res/layout/widget_display.xml
View File

@ -9,8 +9,8 @@
<TextView <TextView
xmlns:a="http://schemas.android.com/apk/res/android" xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculatorDisplay" a:id="@+id/calculatorDisplay"
style="@style/widget_display_style" style="@style/cpp_widget_display_style"
a:textIsSelectable="true" a:textIsSelectable="true"
a:padding="@dimen/display_padding" a:padding="@dimen/cpp_display_padding"
a:singleLine="false" a:singleLine="false"
a:scrollbars="vertical"/> a:scrollbars="vertical"/>

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

@ -11,11 +11,11 @@
style="@style/default_fragment_layout_style" style="@style/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/editor_padding"> a:padding="@dimen/cpp_editor_padding">
<TextView <TextView
a:id="@+id/calculatorEditor" a:id="@+id/calculatorEditor"
style="@style/widget_editor_style" style="@style/cpp_widget_editor_style"
a:textIsSelectable="true" a:textIsSelectable="true"
a:singleLine="false" a:singleLine="false"
a:scrollbars="vertical" a:scrollbars="vertical"

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

@ -16,7 +16,7 @@
a:layout_height="0dp"> a:layout_height="0dp">
<include layout="@layout/widget_equals_button" <include layout="@layout/widget_equals_button"
a:layout_margin="@dimen/button_margin" a:layout_margin="@dimen/cpp_button_margin"
a:layout_weight="1" a:layout_weight="1"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent"/> a:layout_height="match_parent"/>

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

@ -1,11 +1,11 @@
<resources> <resources>
<dimen name="fragment_text_size">20sp</dimen> <dimen name="cpp_fragment_text_size">20sp</dimen>
<dimen name="fragment_title_text_size">30sp</dimen> <dimen name="cpp_fragment_title_text_size">30sp</dimen>
<dimen name="editor_text_size">25sp</dimen> <dimen name="cpp_editor_text_size">25sp</dimen>
<dimen name="display_text_size">25sp</dimen> <dimen name="cpp_display_text_size">25sp</dimen>
<dimen name="button_text_size_mobile">35dp</dimen> <dimen name="cpp_button_text_size_mobile">35dp</dimen>
<dimen name="keyboard_button_text_size">40dp</dimen> <dimen name="cpp_keyboard_button_text_size">40dp</dimen>
<dimen name="math_entity_text_size">25sp</dimen> <dimen name="cpp_math_entity_text_size">25sp</dimen>
<dimen name="math_entity_description_text_size">20sp</dimen> <dimen name="cpp_math_entity_description_text_size">20sp</dimen>
</resources> </resources>

5
calculatorpp/res/values-ru/text_strings.xml
View File

@ -253,8 +253,7 @@
<string name="arithmetic_error_while_plot">При построении графика возникла арифметическая ошибка: %s</string> <string name="arithmetic_error_while_plot">При построении графика возникла арифметическая ошибка: %s</string>
<string name="ok">Да</string> <string name="ok">Да</string>
<string name="p_show_calculation_messages_dialog_title">Показывать сообщения об ошибках в диалоге</string> <string name="p_show_calculation_messages_dialog_title">Показывать сообщения об ошибках в диалоге</string>
<string name="p_show_calculation_messages_dialog_summary">Если включено, то сообщения об ошибках возникающие при вычислениях будут показаны в отедльном диалоге <string name="p_show_calculation_messages_dialog_summary">Если включено, то сообщения об ошибках возникающих при вычислениях будут показаны в отдельном диалоге</string>
</string>
<string name="fix">Исправить</string> <string name="fix">Исправить</string>
<string name="p_preferred_numeral_base_title">Система счисления по умолчанию</string> <string name="p_preferred_numeral_base_title">Система счисления по умолчанию</string>
@ -265,4 +264,6 @@
<string name="p_preferred_angle_units_summary">Устанавливает единицы измерения углов по умолчанию</string> <string name="p_preferred_angle_units_summary">Устанавливает единицы измерения углов по умолчанию</string>
<string name="preferred_angle_units_message">Единицы измерения углов по умолчанию \'%1$s\' отличаются от текущих \'%2$s\'. Забыли их вернуть?</string> <string name="preferred_angle_units_message">Единицы измерения углов по умолчанию \'%1$s\' отличаются от текущих \'%2$s\'. Забыли их вернуть?</string>
<string name="close">Закрыть</string>
</resources> </resources>

2
calculatorpp/res/values-v14/dimens.xml
View File

@ -1,3 +1,3 @@
<resources> <resources>
<dimen name="widget_margin">0dp</dimen> <dimen name="cpp_widget_margin">0dp</dimen>
</resources> </resources>

16
calculatorpp/res/values-xlarge/dimens.xml
View File

@ -1,11 +1,11 @@
<resources> <resources>
<dimen name="fragment_text_size">20sp</dimen> <dimen name="cpp_fragment_text_size">20sp</dimen>
<dimen name="fragment_title_text_size">30sp</dimen> <dimen name="cpp_fragment_title_text_size">30sp</dimen>
<dimen name="editor_text_size">30sp</dimen> <dimen name="cpp_editor_text_size">30sp</dimen>
<dimen name="display_text_size">30sp</dimen> <dimen name="cpp_display_text_size">30sp</dimen>
<dimen name="button_text_size_mobile">65dp</dimen> <dimen name="cpp_button_text_size_mobile">65dp</dimen>
<dimen name="keyboard_button_text_size">40dp</dimen> <dimen name="cpp_keyboard_button_text_size">40dp</dimen>
<dimen name="math_entity_text_size">30sp</dimen> <dimen name="cpp_math_entity_text_size">30sp</dimen>
<dimen name="math_entity_description_text_size">20sp</dimen> <dimen name="cpp_math_entity_description_text_size">20sp</dimen>
</resources> </resources>

29
calculatorpp/res/values/colors.xml
View File

@ -5,19 +5,18 @@
--> -->
<resources> <resources>
<color name="magic_flame">#00ffffff</color> <color name="cpp_button_text_color">#ffffffff</color>
<color name="button_text_color">#ffffffff</color> <color name="cpp_button_operator_text_color">#ffffff99</color>
<color name="button_operator_text_color">#ffffff99</color> <color name="cpp_button_ce_text_color">#ffffffff</color>
<color name="button_ce_text_color">#ffffffff</color> <color name="cpp_default_text_color">#ffffffff</color>
<color name="default_text_color">#ffffffff</color> <color name="cpp_display_error_text_color">#ff393939</color>
<color name="display_error_text_color">#ff393939</color> <color name="cpp_widget_cursor_color">#ff707070</color>
<color name="widget_cursor_color">#ff707070</color> <color name="cpp_selected_angle_unit_text_color">#ffffff99</color>
<color name="selected_angle_unit_text_color">#ffffff99</color> <color name="cpp_default_background">#ff000000</color>
<color name="default_background">#ff000000</color> <color name="cpp_pane_background">#ff1f1f1f</color>
<color name="pane_background">#ff1f1f1f</color> <color name="cpp_metro_button_background">#ff1f1f1f</color>
<color name="metro_button_background">#ff1f1f1f</color> <color name="cpp_metro_blue_color">#10648c</color>
<color name="metro_blue_color">#10648c</color> <color name="cpp_metro_green_color">#088e3a</color>
<color name="metro_green_color">#088e3a</color> <color name="cpp_metro_purple_color">#651456</color>
<color name="metro_purple_color">#651456</color> <color name="cpp_metro_light_button_background">#393939</color>
<color name="metro_light_button_background">#393939</color>
</resources> </resources>

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

@ -1,27 +1,27 @@
<resources> <resources>
<dimen name="text_size">20sp</dimen> <dimen name="cpp_text_size">20sp</dimen>
<dimen name="button_margin">0.5dp</dimen> <dimen name="cpp_button_margin">0.5dp</dimen>
<dimen name="display_margin_land">2.5dp</dimen> <dimen name="cpp_display_margin_land">2.5dp</dimen>
<dimen name="fragment_text_size">15sp</dimen> <dimen name="cpp_fragment_text_size">15sp</dimen>
<dimen name="fragment_title_text_size">20sp</dimen> <dimen name="cpp_fragment_title_text_size">20sp</dimen>
<dimen name="keyboard_button_text_size">30dp</dimen> <dimen name="cpp_keyboard_button_text_size">30dp</dimen>
<dimen name="button_text_size">20dp</dimen> <dimen name="cpp_button_text_size">20dp</dimen>
<dimen name="button_text_size_mobile">25dp</dimen> <dimen name="cpp_button_text_size_mobile">25dp</dimen>
<dimen name="display_text_size">25sp</dimen> <dimen name="cpp_display_text_size">25sp</dimen>
<dimen name="editor_text_size">25sp</dimen> <dimen name="cpp_editor_text_size">25sp</dimen>
<dimen name="pane_margin">5dp</dimen> <dimen name="cpp_pane_margin">5dp</dimen>
<dimen name="pane_padding">5dp</dimen> <dimen name="cpp_pane_padding">5dp</dimen>
<dimen name="math_entity_text_size">20sp</dimen> <dimen name="cpp_math_entity_text_size">20sp</dimen>
<dimen name="math_entity_description_text_size">15sp</dimen> <dimen name="cpp_math_entity_description_text_size">15sp</dimen>
<dimen name="widget_editor_text_size">25sp</dimen> <dimen name="cpp_widget_editor_text_size">25sp</dimen>
<dimen name="widget_keyboard_button_text_size">20dp</dimen> <dimen name="cpp_widget_keyboard_button_text_size">20dp</dimen>
<dimen name="widget_display_text_size">25sp</dimen> <dimen name="cpp_widget_display_text_size">25sp</dimen>
<dimen name="widget_margin">6dp</dimen> <dimen name="cpp_widget_margin">6dp</dimen>
<!--only for not multipane--> <!--only for not multipane-->
<dimen name="editor_padding">5dp</dimen> <dimen name="cpp_editor_padding">5dp</dimen>
<dimen name="display_padding">3dp</dimen> <dimen name="cpp_display_padding">3dp</dimen>
</resources> </resources>

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

@ -6,77 +6,77 @@
<resources> <resources>
<style name="WindowTitle"> <style name="cpp_window_title">
<item name="android:singleLine">true</item> <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:shadowColor">#BB000000</item>
<item name="android:shadowRadius">2.75</item> <item name="android:shadowRadius">2.75</item>
</style> </style>
<style name="TextAppearance_WindowTitle"> <style name="cpp_text_appearance_window_title">
<item name="android:textColor">#fff</item> <item name="android:textColor">#fff</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="default_text_size"> <style name="cpp_default_text_size">
<item name="android:textSize">@dimen/text_size</item> <item name="android:textSize">@dimen/cpp_text_size</item>
</style> </style>
<style name="button_style"> <style name="cpp_button_style">
<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_blue_button</item> <item name="android:background">@drawable/metro_blue_button</item>
<item name="android:textSize">@dimen/button_text_size</item> <item name="android:textSize">@dimen/cpp_button_text_size</item>
<item name="android:textColor">@color/button_text_color</item> <item name="android:textColor">@color/cpp_button_text_color</item>
</style> </style>
<style name="keyboard_button_style"> <style name="cpp_keyboard_button_style">
<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:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:focusable">true</item> <item name="android:focusable">true</item>
<item name="android:background">@drawable/metro_button_dark</item> <item name="android:background">@drawable/metro_button_dark</item>
<item name="android:layout_margin">@dimen/button_margin</item> <item name="android:layout_margin">@dimen/cpp_button_margin</item>
<item name="android:textSize">@dimen/keyboard_button_text_size</item> <item name="android:textSize">@dimen/cpp_keyboard_button_text_size</item>
<item name="android:textColor">@color/button_text_color</item> <item name="android:textColor">@color/cpp_button_text_color</item>
</style> </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:gravity">left|top</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">@dimen/editor_text_size</item> <item name="android:textSize">@dimen/cpp_editor_text_size</item>
</style> </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:gravity">top|right</item>
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">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>
<style name="widget_editor_style" parent="editor_style"> <style name="cpp_widget_editor_style" parent="cpp_editor_style">
<item name="android:textSize">@dimen/widget_editor_text_size</item> <item name="android:textSize">@dimen/cpp_widget_editor_text_size</item>
</style> </style>
<style name="widget_display_style" parent="display_style"> <style name="cpp_widget_display_style" parent="cpp_display_style">
<item name="android:textSize">@dimen/widget_display_text_size</item> <item name="android:textSize">@dimen/cpp_widget_display_text_size</item>
</style> </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: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">@dimen/fragment_text_size</item> <item name="android:textSize">@dimen/cpp_fragment_text_size</item>
<item name="android:padding">5dp</item> <item name="android:padding">5dp</item>
</style> </style>
<style name="default_text"> <style name="cpp_default_text">
<item name="android:background">@android:color/transparent</item> <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> </style>
</resources> </resources>

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

@ -10,12 +10,12 @@
<style name="math_entity_text"> <style name="math_entity_text">
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
<item name="android:textColor">@android:color/white</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>
<style name="math_entity_description"> <style name="math_entity_description">
<item name="android:textColor">#bebebe</item> <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>
<style name="add_var_button"> <style name="add_var_button">

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

@ -264,5 +264,6 @@
<string name="p_preferred_angle_units_title">Default angle units</string> <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="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="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> </resources>

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

@ -6,7 +6,7 @@
--> -->
<resources> <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> <item name="android:background">@drawable/metro_button_dark</item>
</style> </style>
@ -14,10 +14,10 @@
<item name="android:padding">6dp</item> <item name="android:padding">6dp</item>
</style> </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"> <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>
<style name="default_control_image_button_style" parent="default_control_button_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_width">match_parent</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:fadingEdge">none</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>
<style name="default_fragment_title_style"> <style name="default_fragment_title_style">
<item name="android:textColor">@android:color/white</item> <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>
<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:paddingTop">5dp</item>
<item name="android:paddingBottom">5dp</item> <item name="android:paddingBottom">5dp</item>
<item name="android:paddingLeft">10dp</item> <item name="android:paddingLeft">10dp</item>
@ -57,15 +57,15 @@
</style> </style>
<style name="default_pane_style"> <style name="default_pane_style">
<item name="android:layout_marginLeft">@dimen/pane_margin</item> <item name="android:layout_marginLeft">@dimen/cpp_pane_margin</item>
<item name="android:layout_marginTop">@dimen/pane_margin</item> <item name="android:layout_marginTop">@dimen/cpp_pane_margin</item>
<item name="android:padding">@dimen/pane_padding</item> <item name="android:padding">@dimen/cpp_pane_padding</item>
<item name="android:background">@drawable/pane_background</item> <item name="android:background">@drawable/pane_background</item>
</style> </style>
<style name="default_main_multi_pane_layout_style" parent="default_main_layout_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:paddingRight">@dimen/cpp_pane_padding</item>
<item name="android:paddingBottom">@dimen/pane_padding</item> <item name="android:paddingBottom">@dimen/cpp_pane_padding</item>
</style> </style>
<style name="default_fragment_multi_pane_layout_style" parent="default_fragment_layout_style"> <style name="default_fragment_multi_pane_layout_style" parent="default_fragment_layout_style">
@ -78,7 +78,7 @@
</style> </style>
<style name="default_main_layout_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:baselineAligned">false</item>
<item name="android:layout_height">match_parent</item> <item name="android:layout_height">match_parent</item>
<item name="android:layout_width">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"> <style name="widget_main_layout_style" parent="default_main_layout_style">
<item name="android:padding">1dp</item> <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>
<style name="default_actionbar_style" parent="@style/Widget.Sherlock.ActionBar"> <style name="default_actionbar_style" parent="@style/Widget.Sherlock.ActionBar">

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

@ -7,16 +7,16 @@
<resources> <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> <item name="android:background">@drawable/blue_button</item>
</style> </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> <item name="android:background">@drawable/blue_button_dark</item>
</style> </style>
<style name="light_blue_operation_button_style" parent="light_blue_digit_button_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>
<style name="light_blue_control_image_button_style" parent="light_blue_control_button_style"> <style name="light_blue_control_image_button_style" parent="light_blue_control_button_style">

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

@ -1,11 +1,11 @@
<resources> <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> <item name="android:background">@drawable/metro_button_dark</item>
</style> </style>
<style name="widget_metro_digit_button_style" parent="metro_digit_button_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>
<style name="metro_control_button_style" parent="metro_digit_button_style"> <style name="metro_control_button_style" parent="metro_digit_button_style">
@ -13,7 +13,7 @@
</style> </style>
<style name="widget_metro_control_button_style" parent="metro_control_button_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>
<style name="metro_blue_operation_button_style" parent="metro_digit_button_style"> <style name="metro_blue_operation_button_style" parent="metro_digit_button_style">
@ -21,7 +21,7 @@
</style> </style>
<style name="widget_metro_blue_operation_button_style" parent="metro_blue_operation_button_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>
<style name="metro_control_image_button_style" parent="metro_control_button_style"> <style name="metro_control_image_button_style" parent="metro_control_button_style">

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

@ -6,15 +6,15 @@
--> -->
<resources> <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> <item name="android:background">@drawable/violet_button</item>
</style> </style>
<style name="violet_operation_button_style" parent="violet_digit_button_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>
<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> <item name="android:background">@drawable/violet_button_dark</item>
</style> </style>

4
calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
View File

@ -106,7 +106,7 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
AndroidCalculatorDisplayView.this.state = state; AndroidCalculatorDisplayView.this.state = state;
if (state.isValid()) { if (state.isValid()) {
setTextColor(getResources().getColor(R.color.default_text_color)); setTextColor(getResources().getColor(R.color.cpp_default_text_color));
setText(text); setText(text);
adjustTextSize(); adjustTextSize();
@ -114,7 +114,7 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
} else { } else {
// update text in order to get rid of HTML tags // update text in order to get rid of HTML tags
setText(getText().toString()); setText(getText().toString());
setTextColor(getResources().getColor(R.color.display_error_text_color)); setTextColor(getResources().getColor(R.color.cpp_display_error_text_color));
// error messages are never shown -> just greyed out text (error message will be shown on click) // error messages are never shown -> just greyed out text (error message will be shown on click)
//setText(state.getErrorMessage()); //setText(state.getErrorMessage());

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

@ -39,7 +39,7 @@ public final class CalculatorButtons {
@NotNull View root) { @NotNull View root) {
if ( layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile ) { if ( layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile ) {
final float textSize = root.getResources().getDimension(R.dimen.button_text_size_mobile); final float textSize = root.getResources().getDimension(R.dimen.cpp_button_text_size_mobile);
AndroidUtils.processViewsOfType(root, DragButton.class, new AndroidUtils.ViewProcessor<DragButton>() { AndroidUtils.processViewsOfType(root, DragButton.class, new AndroidUtils.ViewProcessor<DragButton>() {
@Override @Override

4
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
View File

@ -49,8 +49,8 @@ public class CalculatorMessagesDialog extends SherlockActivity {
final CheckBox doNotShowCalculationMessagesCheckbox = (CheckBox) findViewById(R.id.do_not_show_calculation_messages_checkbox); final CheckBox doNotShowCalculationMessagesCheckbox = (CheckBox) findViewById(R.id.do_not_show_calculation_messages_checkbox);
final Button okButton = (Button) findViewById(R.id.ok_button); final Button closeButton = (Button) findViewById(R.id.close_button);
okButton.setOnClickListener(new View.OnClickListener() { closeButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (doNotShowCalculationMessagesCheckbox.isChecked()) { if (doNotShowCalculationMessagesCheckbox.isChecked()) {

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

@ -183,11 +183,11 @@ public final class CalculatorPreferences {
applyDefaultPreference(preferences, Calculations.calculateOnFly); applyDefaultPreference(preferences, Calculations.calculateOnFly);
applyDefaultPreference(preferences, Calculations.preferredAngleUnits); applyDefaultPreference(preferences, Calculations.preferredAngleUnits);
applyDefaultPreference(preferences, Calculations.preferredNumeralBase); applyDefaultPreference(preferences, Calculations.preferredNumeralBase);
applyDefaultPreference(preferences, Calculations.lastPreferredPreferencesCheck);
// renew value after each application start // renew value after each application start
Calculations.showCalculationMessagesDialog.putDefault(preferences); Calculations.showCalculationMessagesDialog.putDefault(preferences);
Calculations.lastPreferredPreferencesCheck.putDefault(preferences);
if (!VibratorContainer.Preferences.hapticFeedbackEnabled.isSet(preferences)) { if (!VibratorContainer.Preferences.hapticFeedbackEnabled.isSet(preferences)) {
VibratorContainer.Preferences.hapticFeedbackEnabled.putPreference(preferences, true); VibratorContainer.Preferences.hapticFeedbackEnabled.putPreference(preferences, true);

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

@ -108,7 +108,7 @@ public class CalculatorPlotFragment extends CalculatorFragment implements Calcul
} }
if (input == null) { if (input == null) {
this.bgColor = getResources().getColor(R.color.pane_background); this.bgColor = getResources().getColor(R.color.cpp_pane_background);
} else { } else {
this.bgColor = getResources().getColor(android.R.color.transparent); this.bgColor = getResources().getColor(android.R.color.transparent);
} }

4
calculatorpp/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
View File

@ -35,9 +35,9 @@ public class AngleUnitsButton extends DirectionDragButton {
final TextPaint directionTextPaint = directionTextData.getPaint(); final TextPaint directionTextPaint = directionTextData.getPaint();
if (CalculatorLocatorImpl.getInstance().getEngine().getAngleUnits().name().equals(directionTextData.getText())) { if (CalculatorLocatorImpl.getInstance().getEngine().getAngleUnits().name().equals(directionTextData.getText())) {
directionTextPaint.setColor(resources.getColor(R.color.selected_angle_unit_text_color)); directionTextPaint.setColor(resources.getColor(R.color.cpp_selected_angle_unit_text_color));
} else { } else {
directionTextPaint.setColor(resources.getColor(R.color.default_text_color)); directionTextPaint.setColor(resources.getColor(R.color.cpp_default_text_color));
directionTextPaint.setAlpha(getDirectionTextAlpha()); directionTextPaint.setAlpha(getDirectionTextAlpha());
} }
} }

4
calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
View File

@ -35,9 +35,9 @@ public class NumeralBasesButton extends DirectionDragButton {
final TextPaint directionTextPaint = directionTextData.getPaint(); final TextPaint directionTextPaint = directionTextData.getPaint();
if (CalculatorLocatorImpl.getInstance().getEngine().getNumeralBase().name().equals(directionTextData.getText())) { if (CalculatorLocatorImpl.getInstance().getEngine().getNumeralBase().name().equals(directionTextData.getText())) {
directionTextPaint.setColor(resources.getColor(R.color.selected_angle_unit_text_color)); directionTextPaint.setColor(resources.getColor(R.color.cpp_selected_angle_unit_text_color));
} else { } else {
directionTextPaint.setColor(resources.getColor(R.color.default_text_color)); directionTextPaint.setColor(resources.getColor(R.color.cpp_default_text_color));
directionTextPaint.setAlpha(getDirectionTextAlpha()); directionTextPaint.setAlpha(getDirectionTextAlpha());
} }
} }

6
calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
View File

@ -94,7 +94,7 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
@NotNull @NotNull
private String getCursorColor(@NotNull Context context) { private String getCursorColor(@NotNull Context context) {
if (cursorColor == null) { if (cursorColor == null) {
cursorColor = Integer.toHexString(context.getResources().getColor(R.color.widget_cursor_color)).substring(2); cursorColor = Integer.toHexString(context.getResources().getColor(R.color.cpp_widget_cursor_color)).substring(2);
} }
return cursorColor; return cursorColor;
} }
@ -205,9 +205,9 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
private void updateDisplayState(@NotNull Context context, @NotNull RemoteViews views, @NotNull CalculatorDisplayViewState displayState) { private void updateDisplayState(@NotNull Context context, @NotNull RemoteViews views, @NotNull CalculatorDisplayViewState displayState) {
if (displayState.isValid()) { if (displayState.isValid()) {
views.setTextViewText(R.id.calculatorDisplay, displayState.getText()); views.setTextViewText(R.id.calculatorDisplay, displayState.getText());
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.default_text_color)); views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_default_text_color));
} else { } else {
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.display_error_text_color)); views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_display_error_text_color));
} }
} }