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-12-01 20:15:23 +04:00
parent 8ce44cd900
commit 79017b94f9
102 changed files with 590 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
android-app/res/layout-land/calc_keyboard.xml
View File

@@ -1,53 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_vars_button"/>
<include layout="@layout/calc_copy_button"/>
<include layout="@layout/calc_seven_digit_button"/>
<include layout="@layout/calc_eight_digit_button"/>
<include layout="@layout/calc_nine_digit_button"/>
<include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_division_button"/>
<include layout="@layout/calc_equals_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_functions_button"/>
<include layout="@layout/calc_paste_button"/>
<include layout="@layout/calc_four_digit_button"/>
<include layout="@layout/calc_five_digit_button"/>
<include layout="@layout/calc_six_digit_button"/>
<include layout="@layout/calc_plus_button"/>
<include layout="@layout/calc_subtraction_button"/>
<include layout="@layout/calc_round_brackets_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_operators_button"/>
<include layout="@layout/calc_donate_button"/>
<include layout="@layout/calc_one_digit_button"/>
<include layout="@layout/calc_two_digit_button"/>
<include layout="@layout/calc_three_digit_button"/>
<include layout="@layout/calc_zero_digit_button"/>
<include layout="@layout/calc_dot_button"/>
<include layout="@layout/calc_history_button"/>
</LinearLayout>
</LinearLayout>

53
android-app/res/layout-land/calc_keyboard_mobile.xml
View File

@@ -1,53 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_vars_button"/>
<include layout="@layout/calc_copy_button"/>
<include layout="@layout/calc_seven_digit_button"/>
<include layout="@layout/calc_eight_digit_button"/>
<include layout="@layout/calc_nine_digit_button"/>
<include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_division_button"/>
<include layout="@layout/calc_equals_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_functions_button"/>
<include layout="@layout/calc_paste_button"/>
<include layout="@layout/calc_four_digit_button"/>
<include layout="@layout/calc_five_digit_button"/>
<include layout="@layout/calc_six_digit_button"/>
<include layout="@layout/calc_plus_button"/>
<include layout="@layout/calc_subtraction_button"/>
<include layout="@layout/calc_round_brackets_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_operators_button"/>
<include layout="@layout/calc_donate_button"/>
<include layout="@layout/calc_one_digit_button"/>
<include layout="@layout/calc_two_digit_button"/>
<include layout="@layout/calc_three_digit_button"/>
<include layout="@layout/calc_zero_digit_button"/>
<include layout="@layout/calc_dot_button"/>
<include layout="@layout/calc_history_button"/>
</LinearLayout>
</LinearLayout>

53
android-app/res/layout-land/cpp_app_keyboard.xml Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
</LinearLayout>
</LinearLayout>

53
android-app/res/layout-land/cpp_app_keyboard_mobile.xml Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
</LinearLayout>
</LinearLayout>

8
android-app/res/layout-land/main_first_pane.xml
View File

@@ -21,13 +21,13 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_left_button"
<include layout="@layout/cpp_drag_button_left"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include layout="@layout/calc_erase_button"
<include layout="@layout/cpp_app_button_erase"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
@@ -39,13 +39,13 @@
a:layout_weight="4"
a:layout_margin="@dimen/cpp_display_margin_land"/>
<include layout="@layout/calc_clear_button"
<include layout="@layout/cpp_drag_button_clear"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include layout="@layout/calc_right_button"
<include layout="@layout/cpp_drag_button_right"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"

8
android-app/res/layout-land/main_first_pane_mobile.xml
View File

@@ -21,13 +21,13 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_left_button"
<include layout="@layout/cpp_drag_button_left"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include layout="@layout/calc_erase_button"
<include layout="@layout/cpp_app_button_erase"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
@@ -39,13 +39,13 @@
a:layout_weight="4"
a:layout_margin="@dimen/cpp_display_margin_land"/>
<include layout="@layout/calc_clear_button"
<include layout="@layout/cpp_drag_button_clear"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include layout="@layout/calc_right_button"
<include layout="@layout/cpp_drag_button_right"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"

60
android-app/res/layout-large-land/calc_keyboard.xml
View File

@@ -1,60 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_left_button"/>
<include layout="@layout/calc_erase_button"/>
<include layout="@layout/calc_donate_button"/>
<include layout="@layout/calc_seven_digit_button"/>
<include layout="@layout/calc_eight_digit_button"/>
<include layout="@layout/calc_nine_digit_button"/>
<include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_division_button"/>
<include layout="@layout/calc_clear_button"/>
<include layout="@layout/calc_right_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_vars_button"/>
<include layout="@layout/calc_functions_button"/>
<include layout="@layout/calc_empty_button"/>
<include layout="@layout/calc_four_digit_button"/>
<include layout="@layout/calc_five_digit_button"/>
<include layout="@layout/calc_six_digit_button"/>
<include layout="@layout/calc_plus_button"/>
<include layout="@layout/calc_subtraction_button"/>
<include layout="@layout/calc_copy_button"/>
<include layout="@layout/calc_equals_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_empty_button"/>
<include layout="@layout/calc_operators_button"/>
<include layout="@layout/calc_dot_button"/>
<include layout="@layout/calc_one_digit_button"/>
<include layout="@layout/calc_two_digit_button"/>
<include layout="@layout/calc_three_digit_button"/>
<include layout="@layout/calc_zero_digit_button"/>
<include layout="@layout/calc_round_brackets_button"/>
<include layout="@layout/calc_paste_button"/>
<include layout="@layout/calc_history_button"/>
</LinearLayout>
</LinearLayout>

60
android-app/res/layout-large-land/cpp_app_keyboard.xml Normal file
View File

@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_drag_button_right"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_equals"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_history"/>
</LinearLayout>
</LinearLayout>

64
android-app/res/layout-large/calc_keyboard.xml
View File

@@ -1,64 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_left_button"/>
<include layout="@layout/calc_erase_button"/>
<include layout="@layout/calc_seven_digit_button"/>
<include layout="@layout/calc_eight_digit_button"/>
<include layout="@layout/calc_nine_digit_button"/>
<include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_right_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_vars_button"/>
<include layout="@layout/calc_clear_button"/>
<include layout="@layout/calc_four_digit_button"/>
<include layout="@layout/calc_five_digit_button"/>
<include layout="@layout/calc_six_digit_button"/>
<include layout="@layout/calc_division_button"/>
<include layout="@layout/calc_copy_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_functions_button"/>
<include layout="@layout/calc_equals_button"/>
<include layout="@layout/calc_one_digit_button"/>
<include layout="@layout/calc_two_digit_button"/>
<include layout="@layout/calc_three_digit_button"/>
<include layout="@layout/calc_plus_button"/>
<include layout="@layout/calc_paste_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_operators_button"/>
<include layout="@layout/calc_donate_button"/>
<include layout="@layout/calc_round_brackets_button"/>
<include layout="@layout/calc_zero_digit_button"/>
<include layout="@layout/calc_dot_button"/>
<include layout="@layout/calc_subtraction_button"/>
<include layout="@layout/calc_history_button"/>
</LinearLayout>
</LinearLayout>

0
android-app/res/layout-large/calc_display.xml → android-app/res/layout-large/cpp_app_display.xml
View File

0
android-app/res/layout-large/calc_editor.xml → android-app/res/layout-large/cpp_app_editor.xml
View File

64
android-app/res/layout-large/cpp_app_keyboard.xml Normal file
View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_right"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_copy"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_paste"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_drag_button_history"/>
</LinearLayout>
</LinearLayout>

51
android-app/res/layout-xlarge-land/calc_keyboard.xml
View File

@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_left_button"/>
<include layout="@layout/calc_vars_button"/>
<include layout="@layout/calc_copy_button"/>
<include layout="@layout/calc_six_digit_button"/>
<include layout="@layout/calc_seven_digit_button"/>
<include layout="@layout/calc_eight_digit_button"/>
<include layout="@layout/calc_nine_digit_button"/>
<include layout="@layout/calc_zero_digit_button"/>
<include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_division_button"/>
<include layout="@layout/calc_equals_button"/>
<include layout="@layout/calc_operators_button"/>
<include layout="@layout/calc_donate_button"/>
<include layout="@layout/calc_right_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_erase_button"/>
<include layout="@layout/calc_functions_button"/>
<include layout="@layout/calc_paste_button"/>
<include layout="@layout/calc_one_digit_button"/>
<include layout="@layout/calc_two_digit_button"/>
<include layout="@layout/calc_three_digit_button"/>
<include layout="@layout/calc_four_digit_button"/>
<include layout="@layout/calc_five_digit_button"/>
<include layout="@layout/calc_plus_button"/>
<include layout="@layout/calc_subtraction_button"/>
<include layout="@layout/calc_round_brackets_button"/>
<include layout="@layout/calc_dot_button"/>
<include layout="@layout/calc_history_button"/>
<include layout="@layout/calc_clear_button"/>
</LinearLayout>
</LinearLayout>

51
android-app/res/layout-xlarge-land/cpp_app_keyboard.xml Normal file
View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_right"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_drag_button_clear"/>
</LinearLayout>
</LinearLayout>

68
android-app/res/layout-xlarge/calc_keyboard.xml
View File

@@ -1,68 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_left_button"/>
<include layout="@layout/calc_erase_button"/>
<include layout="@layout/calc_empty_button"/>
<include layout="@layout/calc_empty_button"/>
<include layout="@layout/calc_empty_button"/>
<include layout="@layout/calc_empty_button"/>
<include layout="@layout/calc_clear_button"/>
<include layout="@layout/calc_right_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_vars_button"/>
<include layout="@layout/calc_copy_button"/>
<include layout="@layout/calc_seven_digit_button"/>
<include layout="@layout/calc_eight_digit_button"/>
<include layout="@layout/calc_nine_digit_button"/>
<include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_division_button"/>
<include layout="@layout/calc_equals_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_functions_button"/>
<include layout="@layout/calc_paste_button"/>
<include layout="@layout/calc_four_digit_button"/>
<include layout="@layout/calc_five_digit_button"/>
<include layout="@layout/calc_six_digit_button"/>
<include layout="@layout/calc_plus_button"/>
<include layout="@layout/calc_subtraction_button"/>
<include layout="@layout/calc_round_brackets_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_operators_button"/>
<include layout="@layout/calc_donate_button"/>
<include layout="@layout/calc_one_digit_button"/>
<include layout="@layout/calc_two_digit_button"/>
<include layout="@layout/calc_three_digit_button"/>
<include layout="@layout/calc_zero_digit_button"/>
<include layout="@layout/calc_dot_button"/>
<include layout="@layout/calc_history_button"/>
</LinearLayout>
</LinearLayout>

0
android-app/res/layout-xlarge/calc_display.xml → android-app/res/layout-xlarge/cpp_app_display.xml
View File

0
android-app/res/layout-xlarge/calc_editor.xml → android-app/res/layout-xlarge/cpp_app_editor.xml
View File

68
android-app/res/layout-xlarge/cpp_app_keyboard.xml Normal file
View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_drag_button_right"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
</LinearLayout>
</LinearLayout>

69
android-app/res/layout/calc_keyboard.xml
View File

@@ -1,69 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_seven_digit_button"/>
<include layout="@layout/calc_eight_digit_button"/>
<include layout="@layout/calc_nine_digit_button"/>
<include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_clear_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_four_digit_button"/>
<include layout="@layout/calc_five_digit_button"/>
<include layout="@layout/calc_six_digit_button"/>
<include layout="@layout/calc_division_button"/>
<include layout="@layout/calc_erase_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_one_digit_button"/>
<include layout="@layout/calc_two_digit_button"/>
<include layout="@layout/calc_three_digit_button"/>
<include layout="@layout/calc_plus_button"/>
<include layout="@layout/calc_copy_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_round_brackets_button"/>
<include layout="@layout/calc_zero_digit_button"/>
<include layout="@layout/calc_dot_button"/>
<include layout="@layout/calc_subtraction_button"/>
<include layout="@layout/calc_paste_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_left_button"/>
<include layout="@layout/calc_right_button"/>
<include layout="@layout/calc_vars_button"/>
<include layout="@layout/calc_functions_button"/>
<include layout="@layout/calc_history_button"/>
</LinearLayout>
</LinearLayout>

69
android-app/res/layout/calc_keyboard_mobile.xml
View File

@@ -1,69 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_seven_digit_button"/>
<include layout="@layout/calc_eight_digit_button"/>
<include layout="@layout/calc_nine_digit_button"/>
<include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_clear_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_four_digit_button"/>
<include layout="@layout/calc_five_digit_button"/>
<include layout="@layout/calc_six_digit_button"/>
<include layout="@layout/calc_division_button"/>
<include layout="@layout/calc_erase_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_one_digit_button"/>
<include layout="@layout/calc_two_digit_button"/>
<include layout="@layout/calc_three_digit_button"/>
<include layout="@layout/calc_plus_button"/>
<include layout="@layout/calc_copy_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_round_brackets_button"/>
<include layout="@layout/calc_zero_digit_button"/>
<include layout="@layout/calc_dot_button"/>
<include layout="@layout/calc_subtraction_button"/>
<include layout="@layout/calc_paste_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/calc_left_button"/>
<include layout="@layout/calc_right_button"/>
<include layout="@layout/calc_vars_button"/>
<include layout="@layout/calc_functions_button"/>
<include layout="@layout/calc_history_button"/>
</LinearLayout>
</LinearLayout>

30
android-app/res/layout/calc_title.xml
View File

@@ -1,30 +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
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="horizontal"
a:gravity="center_vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_gravity="left"
style="@style/cpp_window_title"
a:text="@string/c_app_name"/>
<org.solovyev.android.calculator.view.CalculatorAdditionalTitle
a:id="@+id/additional_title_text"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
style="@style/cpp_window_title"
a:gravity="center_vertical|right"
a:layout_gravity="right"/>
</LinearLayout>

0
android-app/res/layout/calc_copy_button.xml → android-app/res/layout/cpp_app_button_copy.xml
View File

0
android-app/res/layout/calc_donate_button.xml → android-app/res/layout/cpp_app_button_donate.xml
View File

0
android-app/res/layout/calc_erase_button.xml → android-app/res/layout/cpp_app_button_erase.xml
View File

0
android-app/res/layout/calc_paste_button.xml → android-app/res/layout/cpp_app_button_paste.xml
View File

0
android-app/res/layout/calc_display.xml → android-app/res/layout/cpp_app_display.xml
View File

0
android-app/res/layout/calc_display_mobile.xml → android-app/res/layout/cpp_app_display_mobile.xml
View File

0
android-app/res/layout/calc_editor.xml → android-app/res/layout/cpp_app_editor.xml
View File

0
android-app/res/layout/calc_editor_mobile.xml → android-app/res/layout/cpp_app_editor_mobile.xml
View File

69
android-app/res/layout/cpp_app_keyboard.xml Normal file
View File

@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_clear"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_erase"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_copy"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_paste"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_drag_button_history"/>
</LinearLayout>
</LinearLayout>

69
android-app/res/layout/cpp_app_keyboard_mobile.xml Normal file
View File

@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_clear"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_erase"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_copy"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_paste"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_drag_button_history"/>
</LinearLayout>
</LinearLayout>

0
android-app/res/layout/calc_zero_digit_button.xml → android-app/res/layout/cpp_drag_button_0.xml
View File

0
android-app/res/layout/calc_one_digit_button.xml → android-app/res/layout/cpp_drag_button_1.xml
View File

0
android-app/res/layout/calc_two_digit_button.xml → android-app/res/layout/cpp_drag_button_2.xml
View File

0
android-app/res/layout/calc_three_digit_button.xml → android-app/res/layout/cpp_drag_button_3.xml
View File

0
android-app/res/layout/calc_four_digit_button.xml → android-app/res/layout/cpp_drag_button_4.xml
View File

0
android-app/res/layout/calc_five_digit_button.xml → android-app/res/layout/cpp_drag_button_5.xml
View File

0
android-app/res/layout/calc_six_digit_button.xml → android-app/res/layout/cpp_drag_button_6.xml
View File

0
android-app/res/layout/calc_seven_digit_button.xml → android-app/res/layout/cpp_drag_button_7.xml
View File

0
android-app/res/layout/calc_eight_digit_button.xml → android-app/res/layout/cpp_drag_button_8.xml
View File

0
android-app/res/layout/calc_nine_digit_button.xml → android-app/res/layout/cpp_drag_button_9.xml
View File

0
android-app/res/layout/calc_clear_button.xml → android-app/res/layout/cpp_drag_button_clear.xml
View File

0
android-app/res/layout/calc_division_button.xml → android-app/res/layout/cpp_drag_button_division.xml
View File

0
android-app/res/layout/calc_dot_button.xml → android-app/res/layout/cpp_drag_button_dot.xml
View File

0
android-app/res/layout/calc_empty_button.xml → android-app/res/layout/cpp_drag_button_empty.xml
View File

0
android-app/res/layout/calc_equals_button.xml → android-app/res/layout/cpp_drag_button_equals.xml
View File

0
android-app/res/layout/calc_functions_button.xml → android-app/res/layout/cpp_drag_button_functions.xml
View File

0
android-app/res/layout/calc_history_button.xml → android-app/res/layout/cpp_drag_button_history.xml
View File

0
android-app/res/layout/calc_left_button.xml → android-app/res/layout/cpp_drag_button_left.xml
View File

0
android-app/res/layout/calc_multiplication_button.xml → android-app/res/layout/cpp_drag_button_multiplication.xml
View File

0
android-app/res/layout/calc_operators_button.xml → android-app/res/layout/cpp_drag_button_operators.xml
View File

0
android-app/res/layout/calc_plus_button.xml → android-app/res/layout/cpp_drag_button_plus.xml
View File

0
android-app/res/layout/calc_right_button.xml → android-app/res/layout/cpp_drag_button_right.xml
View File

0
android-app/res/layout/calc_round_brackets_button.xml → android-app/res/layout/cpp_drag_button_round_brackets.xml
View File

0
android-app/res/layout/calc_subtraction_button.xml → android-app/res/layout/cpp_drag_button_subtraction.xml
View File

0
android-app/res/layout/calc_vars_button.xml → android-app/res/layout/cpp_drag_button_vars.xml
View File

2
android-app/res/layout/main_calculator.xml
View File

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

2
android-app/res/layout/main_calculator_mobile.xml
View File

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

4
android-app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
View File

@@ -26,9 +26,9 @@ public class CalculatorDisplayFragment extends SherlockFragment {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(prefs);
if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_display_mobile, R.string.result);
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_display_mobile, R.string.result);
} else {
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_display, R.string.result);
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_display, R.string.result);
}
fragmentHelper.onCreate(this);

4
android-app/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
View File

@@ -53,9 +53,9 @@ public class CalculatorEditorFragment extends SherlockFragment {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(prefs);
if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor_mobile, R.string.editor);
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_editor_mobile, R.string.editor);
} else {
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor, R.string.editor);
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_editor, R.string.editor);
}
fragmentHelper.onCreate(this);

4
android-app/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
View File

@@ -32,9 +32,9 @@ public class CalculatorKeyboardFragment extends SherlockFragment implements Shar
final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(preferences);
if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_keyboard_mobile);
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_keyboard_mobile);
} else {
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_keyboard);
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_keyboard);
}
fragmentHelper.onCreate(this);

2
android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
View File

@@ -21,7 +21,7 @@ import org.solovyev.android.calculator.plot.CalculatorPlotFragment;
*/
public enum CalculatorFragmentType {
editor(CalculatorEditorFragment.class, R.layout.calc_editor, R.string.editor),
editor(CalculatorEditorFragment.class, R.layout.cpp_app_editor, R.string.editor),
//display(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),