From 79017b94f9b61b0c809d25891b4492e4d60d9ee4 Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Sat, 1 Dec 2012 20:15:23 +0400 Subject: [PATCH] changes --- android-app-core/pom.xml | 11 +++ ...git_button.xml => cpp_simple_button_0.xml} | 0 ...git_button.xml => cpp_simple_button_1.xml} | 0 ...git_button.xml => cpp_simple_button_2.xml} | 0 ...git_button.xml => cpp_simple_button_3.xml} | 0 ...git_button.xml => cpp_simple_button_4.xml} | 0 ...git_button.xml => cpp_simple_button_5.xml} | 0 ...git_button.xml => cpp_simple_button_6.xml} | 0 ...git_button.xml => cpp_simple_button_7.xml} | 0 ...git_button.xml => cpp_simple_button_8.xml} | 0 ...git_button.xml => cpp_simple_button_9.xml} | 0 ...p_button.xml => cpp_simple_button_app.xml} | 0 ...button.xml => cpp_simple_button_clear.xml} | 0 ..._button.xml => cpp_simple_button_copy.xml} | 0 ...ton.xml => cpp_simple_button_division.xml} | 0 ...t_button.xml => cpp_simple_button_dot.xml} | 0 ...utton.xml => cpp_simple_button_equals.xml} | 0 ...button.xml => cpp_simple_button_erase.xml} | 0 ...on.xml => cpp_simple_button_functions.xml} | 0 ...tton.xml => cpp_simple_button_history.xml} | 0 ..._button.xml => cpp_simple_button_left.xml} | 0 ..._button.xml => cpp_simple_button_like.xml} | 0 ...l => cpp_simple_button_multiplication.xml} | 0 ...button.xml => cpp_simple_button_paste.xml} | 0 ...tton.xml => cpp_simple_button_percent.xml} | 0 ..._button.xml => cpp_simple_button_plus.xml} | 0 ...button.xml => cpp_simple_button_power.xml} | 0 ...button.xml => cpp_simple_button_right.xml} | 0 ...l => cpp_simple_button_round_brackets.xml} | 0 ...ton.xml => cpp_simple_button_settings.xml} | 0 ....xml => cpp_simple_button_subtraction.xml} | 0 ..._button.xml => cpp_simple_button_vars.xml} | 0 .../res/layout/cpp_simple_keyboard.xml | 60 ++++++++-------- ...t_converter.xml => cpp_unit_converter.xml} | 0 .../view/UnitConverterViewBuilder.java | 2 +- android-app-onscreen/pom.xml | 11 +++ .../res/layout/onscreen_keyboard.xml | 40 +++++------ .../res/layout/onscreen_layout.xml | 2 +- android-app-widget/pom.xml | 11 +++ .../res/layout/widget_layout.xml | 2 +- android-app/res/layout-land/calc_keyboard.xml | 53 -------------- .../res/layout-land/calc_keyboard_mobile.xml | 53 -------------- .../res/layout-land/cpp_app_keyboard.xml | 53 ++++++++++++++ .../layout-land/cpp_app_keyboard_mobile.xml | 53 ++++++++++++++ .../res/layout-land/main_first_pane.xml | 8 +-- .../layout-land/main_first_pane_mobile.xml | 8 +-- .../res/layout-large-land/calc_keyboard.xml | 60 ---------------- .../layout-large-land/cpp_app_keyboard.xml | 60 ++++++++++++++++ .../res/layout-large/calc_keyboard.xml | 64 ----------------- .../{calc_display.xml => cpp_app_display.xml} | 0 .../{calc_editor.xml => cpp_app_editor.xml} | 0 .../res/layout-large/cpp_app_keyboard.xml | 64 +++++++++++++++++ .../res/layout-xlarge-land/calc_keyboard.xml | 51 -------------- .../layout-xlarge-land/cpp_app_keyboard.xml | 51 ++++++++++++++ .../res/layout-xlarge/calc_keyboard.xml | 68 ------------------ .../{calc_display.xml => cpp_app_display.xml} | 0 .../{calc_editor.xml => cpp_app_editor.xml} | 0 .../res/layout-xlarge/cpp_app_keyboard.xml | 68 ++++++++++++++++++ android-app/res/layout/calc_keyboard.xml | 69 ------------------- .../res/layout/calc_keyboard_mobile.xml | 69 ------------------- android-app/res/layout/calc_title.xml | 30 -------- ...opy_button.xml => cpp_app_button_copy.xml} | 0 ...e_button.xml => cpp_app_button_donate.xml} | 0 ...se_button.xml => cpp_app_button_erase.xml} | 0 ...te_button.xml => cpp_app_button_paste.xml} | 0 .../{calc_display.xml => cpp_app_display.xml} | 0 ..._mobile.xml => cpp_app_display_mobile.xml} | 0 .../{calc_editor.xml => cpp_app_editor.xml} | 0 ...r_mobile.xml => cpp_app_editor_mobile.xml} | 0 android-app/res/layout/cpp_app_keyboard.xml | 69 +++++++++++++++++++ .../res/layout/cpp_app_keyboard_mobile.xml | 69 +++++++++++++++++++ ...digit_button.xml => cpp_drag_button_0.xml} | 0 ...digit_button.xml => cpp_drag_button_1.xml} | 0 ...digit_button.xml => cpp_drag_button_2.xml} | 0 ...digit_button.xml => cpp_drag_button_3.xml} | 0 ...digit_button.xml => cpp_drag_button_4.xml} | 0 ...digit_button.xml => cpp_drag_button_5.xml} | 0 ...digit_button.xml => cpp_drag_button_6.xml} | 0 ...digit_button.xml => cpp_drag_button_7.xml} | 0 ...digit_button.xml => cpp_drag_button_8.xml} | 0 ...digit_button.xml => cpp_drag_button_9.xml} | 0 ...r_button.xml => cpp_drag_button_clear.xml} | 0 ...utton.xml => cpp_drag_button_division.xml} | 0 ...dot_button.xml => cpp_drag_button_dot.xml} | 0 ...y_button.xml => cpp_drag_button_empty.xml} | 0 ..._button.xml => cpp_drag_button_equals.xml} | 0 ...tton.xml => cpp_drag_button_functions.xml} | 0 ...button.xml => cpp_drag_button_history.xml} | 0 ...ft_button.xml => cpp_drag_button_left.xml} | 0 ...xml => cpp_drag_button_multiplication.xml} | 0 ...tton.xml => cpp_drag_button_operators.xml} | 0 ...us_button.xml => cpp_drag_button_plus.xml} | 0 ...t_button.xml => cpp_drag_button_right.xml} | 0 ...xml => cpp_drag_button_round_brackets.xml} | 0 ...on.xml => cpp_drag_button_subtraction.xml} | 0 ...rs_button.xml => cpp_drag_button_vars.xml} | 0 android-app/res/layout/main_calculator.xml | 2 +- .../res/layout/main_calculator_mobile.xml | 2 +- .../calculator/CalculatorDisplayFragment.java | 4 +- .../calculator/CalculatorEditorFragment.java | 4 +- .../CalculatorKeyboardFragment.java | 4 +- .../about/CalculatorFragmentType.java | 2 +- 102 files changed, 590 insertions(+), 587 deletions(-) rename android-app-core/res/layout/{cpp_simple_zero_digit_button.xml => cpp_simple_button_0.xml} (100%) rename android-app-core/res/layout/{cpp_simple_one_digit_button.xml => cpp_simple_button_1.xml} (100%) rename android-app-core/res/layout/{cpp_simple_two_digit_button.xml => cpp_simple_button_2.xml} (100%) rename android-app-core/res/layout/{cpp_simple_three_digit_button.xml => cpp_simple_button_3.xml} (100%) rename android-app-core/res/layout/{cpp_simple_four_digit_button.xml => cpp_simple_button_4.xml} (100%) rename android-app-core/res/layout/{cpp_simple_five_digit_button.xml => cpp_simple_button_5.xml} (100%) rename android-app-core/res/layout/{cpp_simple_six_digit_button.xml => cpp_simple_button_6.xml} (100%) rename android-app-core/res/layout/{cpp_simple_seven_digit_button.xml => cpp_simple_button_7.xml} (100%) rename android-app-core/res/layout/{cpp_simple_eight_digit_button.xml => cpp_simple_button_8.xml} (100%) rename android-app-core/res/layout/{cpp_simple_nine_digit_button.xml => cpp_simple_button_9.xml} (100%) rename android-app-core/res/layout/{cpp_simple_app_button.xml => cpp_simple_button_app.xml} (100%) rename android-app-core/res/layout/{cpp_simple_clear_button.xml => cpp_simple_button_clear.xml} (100%) rename android-app-core/res/layout/{cpp_simple_copy_button.xml => cpp_simple_button_copy.xml} (100%) rename android-app-core/res/layout/{cpp_simple_division_button.xml => cpp_simple_button_division.xml} (100%) rename android-app-core/res/layout/{cpp_simple_dot_button.xml => cpp_simple_button_dot.xml} (100%) rename android-app-core/res/layout/{cpp_simple_equals_button.xml => cpp_simple_button_equals.xml} (100%) rename android-app-core/res/layout/{cpp_simple_erase_button.xml => cpp_simple_button_erase.xml} (100%) rename android-app-core/res/layout/{cpp_simple_functions_button.xml => cpp_simple_button_functions.xml} (100%) rename android-app-core/res/layout/{cpp_simple_history_button.xml => cpp_simple_button_history.xml} (100%) rename android-app-core/res/layout/{cpp_simple_left_button.xml => cpp_simple_button_left.xml} (100%) rename android-app-core/res/layout/{cpp_simple_like_button.xml => cpp_simple_button_like.xml} (100%) rename android-app-core/res/layout/{cpp_simple_multiplication_button.xml => cpp_simple_button_multiplication.xml} (100%) rename android-app-core/res/layout/{cpp_simple_paste_button.xml => cpp_simple_button_paste.xml} (100%) rename android-app-core/res/layout/{cpp_simple_percent_button.xml => cpp_simple_button_percent.xml} (100%) rename android-app-core/res/layout/{cpp_simple_plus_button.xml => cpp_simple_button_plus.xml} (100%) rename android-app-core/res/layout/{cpp_simple_power_button.xml => cpp_simple_button_power.xml} (100%) rename android-app-core/res/layout/{cpp_simple_right_button.xml => cpp_simple_button_right.xml} (100%) rename android-app-core/res/layout/{cpp_simple_round_brackets_button.xml => cpp_simple_button_round_brackets.xml} (100%) rename android-app-core/res/layout/{cpp_simple_settings_button.xml => cpp_simple_button_settings.xml} (100%) rename android-app-core/res/layout/{cpp_simple_subtraction_button.xml => cpp_simple_button_subtraction.xml} (100%) rename android-app-core/res/layout/{cpp_simple_vars_button.xml => cpp_simple_button_vars.xml} (100%) rename android-app-core/res/layout/{unit_converter.xml => cpp_unit_converter.xml} (100%) delete mode 100644 android-app/res/layout-land/calc_keyboard.xml delete mode 100644 android-app/res/layout-land/calc_keyboard_mobile.xml create mode 100644 android-app/res/layout-land/cpp_app_keyboard.xml create mode 100644 android-app/res/layout-land/cpp_app_keyboard_mobile.xml delete mode 100644 android-app/res/layout-large-land/calc_keyboard.xml create mode 100644 android-app/res/layout-large-land/cpp_app_keyboard.xml delete mode 100644 android-app/res/layout-large/calc_keyboard.xml rename android-app/res/layout-large/{calc_display.xml => cpp_app_display.xml} (100%) rename android-app/res/layout-large/{calc_editor.xml => cpp_app_editor.xml} (100%) create mode 100644 android-app/res/layout-large/cpp_app_keyboard.xml delete mode 100644 android-app/res/layout-xlarge-land/calc_keyboard.xml create mode 100644 android-app/res/layout-xlarge-land/cpp_app_keyboard.xml delete mode 100644 android-app/res/layout-xlarge/calc_keyboard.xml rename android-app/res/layout-xlarge/{calc_display.xml => cpp_app_display.xml} (100%) rename android-app/res/layout-xlarge/{calc_editor.xml => cpp_app_editor.xml} (100%) create mode 100644 android-app/res/layout-xlarge/cpp_app_keyboard.xml delete mode 100644 android-app/res/layout/calc_keyboard.xml delete mode 100644 android-app/res/layout/calc_keyboard_mobile.xml delete mode 100644 android-app/res/layout/calc_title.xml rename android-app/res/layout/{calc_copy_button.xml => cpp_app_button_copy.xml} (100%) rename android-app/res/layout/{calc_donate_button.xml => cpp_app_button_donate.xml} (100%) rename android-app/res/layout/{calc_erase_button.xml => cpp_app_button_erase.xml} (100%) rename android-app/res/layout/{calc_paste_button.xml => cpp_app_button_paste.xml} (100%) rename android-app/res/layout/{calc_display.xml => cpp_app_display.xml} (100%) rename android-app/res/layout/{calc_display_mobile.xml => cpp_app_display_mobile.xml} (100%) rename android-app/res/layout/{calc_editor.xml => cpp_app_editor.xml} (100%) rename android-app/res/layout/{calc_editor_mobile.xml => cpp_app_editor_mobile.xml} (100%) create mode 100644 android-app/res/layout/cpp_app_keyboard.xml create mode 100644 android-app/res/layout/cpp_app_keyboard_mobile.xml rename android-app/res/layout/{calc_zero_digit_button.xml => cpp_drag_button_0.xml} (100%) rename android-app/res/layout/{calc_one_digit_button.xml => cpp_drag_button_1.xml} (100%) rename android-app/res/layout/{calc_two_digit_button.xml => cpp_drag_button_2.xml} (100%) rename android-app/res/layout/{calc_three_digit_button.xml => cpp_drag_button_3.xml} (100%) rename android-app/res/layout/{calc_four_digit_button.xml => cpp_drag_button_4.xml} (100%) rename android-app/res/layout/{calc_five_digit_button.xml => cpp_drag_button_5.xml} (100%) rename android-app/res/layout/{calc_six_digit_button.xml => cpp_drag_button_6.xml} (100%) rename android-app/res/layout/{calc_seven_digit_button.xml => cpp_drag_button_7.xml} (100%) rename android-app/res/layout/{calc_eight_digit_button.xml => cpp_drag_button_8.xml} (100%) rename android-app/res/layout/{calc_nine_digit_button.xml => cpp_drag_button_9.xml} (100%) rename android-app/res/layout/{calc_clear_button.xml => cpp_drag_button_clear.xml} (100%) rename android-app/res/layout/{calc_division_button.xml => cpp_drag_button_division.xml} (100%) rename android-app/res/layout/{calc_dot_button.xml => cpp_drag_button_dot.xml} (100%) rename android-app/res/layout/{calc_empty_button.xml => cpp_drag_button_empty.xml} (100%) rename android-app/res/layout/{calc_equals_button.xml => cpp_drag_button_equals.xml} (100%) rename android-app/res/layout/{calc_functions_button.xml => cpp_drag_button_functions.xml} (100%) rename android-app/res/layout/{calc_history_button.xml => cpp_drag_button_history.xml} (100%) rename android-app/res/layout/{calc_left_button.xml => cpp_drag_button_left.xml} (100%) rename android-app/res/layout/{calc_multiplication_button.xml => cpp_drag_button_multiplication.xml} (100%) rename android-app/res/layout/{calc_operators_button.xml => cpp_drag_button_operators.xml} (100%) rename android-app/res/layout/{calc_plus_button.xml => cpp_drag_button_plus.xml} (100%) rename android-app/res/layout/{calc_right_button.xml => cpp_drag_button_right.xml} (100%) rename android-app/res/layout/{calc_round_brackets_button.xml => cpp_drag_button_round_brackets.xml} (100%) rename android-app/res/layout/{calc_subtraction_button.xml => cpp_drag_button_subtraction.xml} (100%) rename android-app/res/layout/{calc_vars_button.xml => cpp_drag_button_vars.xml} (100%) diff --git a/android-app-core/pom.xml b/android-app-core/pom.xml index 20d03dc7..90c64f50 100644 --- a/android-app-core/pom.xml +++ b/android-app-core/pom.xml @@ -50,6 +50,17 @@ apklib + + com.google.android + android + provided + + + + com.google.android + support-v4 + + diff --git a/android-app-core/res/layout/cpp_simple_zero_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_0.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_zero_digit_button.xml rename to android-app-core/res/layout/cpp_simple_button_0.xml diff --git a/android-app-core/res/layout/cpp_simple_one_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_1.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_one_digit_button.xml rename to android-app-core/res/layout/cpp_simple_button_1.xml diff --git a/android-app-core/res/layout/cpp_simple_two_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_2.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_two_digit_button.xml rename to android-app-core/res/layout/cpp_simple_button_2.xml diff --git a/android-app-core/res/layout/cpp_simple_three_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_3.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_three_digit_button.xml rename to android-app-core/res/layout/cpp_simple_button_3.xml diff --git a/android-app-core/res/layout/cpp_simple_four_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_4.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_four_digit_button.xml rename to android-app-core/res/layout/cpp_simple_button_4.xml diff --git a/android-app-core/res/layout/cpp_simple_five_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_5.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_five_digit_button.xml rename to android-app-core/res/layout/cpp_simple_button_5.xml diff --git a/android-app-core/res/layout/cpp_simple_six_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_6.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_six_digit_button.xml rename to android-app-core/res/layout/cpp_simple_button_6.xml diff --git a/android-app-core/res/layout/cpp_simple_seven_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_7.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_seven_digit_button.xml rename to android-app-core/res/layout/cpp_simple_button_7.xml diff --git a/android-app-core/res/layout/cpp_simple_eight_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_8.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_eight_digit_button.xml rename to android-app-core/res/layout/cpp_simple_button_8.xml diff --git a/android-app-core/res/layout/cpp_simple_nine_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_9.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_nine_digit_button.xml rename to android-app-core/res/layout/cpp_simple_button_9.xml diff --git a/android-app-core/res/layout/cpp_simple_app_button.xml b/android-app-core/res/layout/cpp_simple_button_app.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_app_button.xml rename to android-app-core/res/layout/cpp_simple_button_app.xml diff --git a/android-app-core/res/layout/cpp_simple_clear_button.xml b/android-app-core/res/layout/cpp_simple_button_clear.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_clear_button.xml rename to android-app-core/res/layout/cpp_simple_button_clear.xml diff --git a/android-app-core/res/layout/cpp_simple_copy_button.xml b/android-app-core/res/layout/cpp_simple_button_copy.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_copy_button.xml rename to android-app-core/res/layout/cpp_simple_button_copy.xml diff --git a/android-app-core/res/layout/cpp_simple_division_button.xml b/android-app-core/res/layout/cpp_simple_button_division.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_division_button.xml rename to android-app-core/res/layout/cpp_simple_button_division.xml diff --git a/android-app-core/res/layout/cpp_simple_dot_button.xml b/android-app-core/res/layout/cpp_simple_button_dot.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_dot_button.xml rename to android-app-core/res/layout/cpp_simple_button_dot.xml diff --git a/android-app-core/res/layout/cpp_simple_equals_button.xml b/android-app-core/res/layout/cpp_simple_button_equals.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_equals_button.xml rename to android-app-core/res/layout/cpp_simple_button_equals.xml diff --git a/android-app-core/res/layout/cpp_simple_erase_button.xml b/android-app-core/res/layout/cpp_simple_button_erase.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_erase_button.xml rename to android-app-core/res/layout/cpp_simple_button_erase.xml diff --git a/android-app-core/res/layout/cpp_simple_functions_button.xml b/android-app-core/res/layout/cpp_simple_button_functions.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_functions_button.xml rename to android-app-core/res/layout/cpp_simple_button_functions.xml diff --git a/android-app-core/res/layout/cpp_simple_history_button.xml b/android-app-core/res/layout/cpp_simple_button_history.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_history_button.xml rename to android-app-core/res/layout/cpp_simple_button_history.xml diff --git a/android-app-core/res/layout/cpp_simple_left_button.xml b/android-app-core/res/layout/cpp_simple_button_left.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_left_button.xml rename to android-app-core/res/layout/cpp_simple_button_left.xml diff --git a/android-app-core/res/layout/cpp_simple_like_button.xml b/android-app-core/res/layout/cpp_simple_button_like.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_like_button.xml rename to android-app-core/res/layout/cpp_simple_button_like.xml diff --git a/android-app-core/res/layout/cpp_simple_multiplication_button.xml b/android-app-core/res/layout/cpp_simple_button_multiplication.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_multiplication_button.xml rename to android-app-core/res/layout/cpp_simple_button_multiplication.xml diff --git a/android-app-core/res/layout/cpp_simple_paste_button.xml b/android-app-core/res/layout/cpp_simple_button_paste.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_paste_button.xml rename to android-app-core/res/layout/cpp_simple_button_paste.xml diff --git a/android-app-core/res/layout/cpp_simple_percent_button.xml b/android-app-core/res/layout/cpp_simple_button_percent.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_percent_button.xml rename to android-app-core/res/layout/cpp_simple_button_percent.xml diff --git a/android-app-core/res/layout/cpp_simple_plus_button.xml b/android-app-core/res/layout/cpp_simple_button_plus.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_plus_button.xml rename to android-app-core/res/layout/cpp_simple_button_plus.xml diff --git a/android-app-core/res/layout/cpp_simple_power_button.xml b/android-app-core/res/layout/cpp_simple_button_power.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_power_button.xml rename to android-app-core/res/layout/cpp_simple_button_power.xml diff --git a/android-app-core/res/layout/cpp_simple_right_button.xml b/android-app-core/res/layout/cpp_simple_button_right.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_right_button.xml rename to android-app-core/res/layout/cpp_simple_button_right.xml diff --git a/android-app-core/res/layout/cpp_simple_round_brackets_button.xml b/android-app-core/res/layout/cpp_simple_button_round_brackets.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_round_brackets_button.xml rename to android-app-core/res/layout/cpp_simple_button_round_brackets.xml diff --git a/android-app-core/res/layout/cpp_simple_settings_button.xml b/android-app-core/res/layout/cpp_simple_button_settings.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_settings_button.xml rename to android-app-core/res/layout/cpp_simple_button_settings.xml diff --git a/android-app-core/res/layout/cpp_simple_subtraction_button.xml b/android-app-core/res/layout/cpp_simple_button_subtraction.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_subtraction_button.xml rename to android-app-core/res/layout/cpp_simple_button_subtraction.xml diff --git a/android-app-core/res/layout/cpp_simple_vars_button.xml b/android-app-core/res/layout/cpp_simple_button_vars.xml similarity index 100% rename from android-app-core/res/layout/cpp_simple_vars_button.xml rename to android-app-core/res/layout/cpp_simple_button_vars.xml diff --git a/android-app-core/res/layout/cpp_simple_keyboard.xml b/android-app-core/res/layout/cpp_simple_keyboard.xml index ff327116..d5b0ee28 100644 --- a/android-app-core/res/layout/cpp_simple_keyboard.xml +++ b/android-app-core/res/layout/cpp_simple_keyboard.xml @@ -9,12 +9,12 @@ a:layout_width="match_parent" a:layout_height="0dp"> - - - - - - + + + + + + @@ -22,12 +22,12 @@ a:layout_width="match_parent" a:layout_height="0dp"> - - - - - - + + + + + + @@ -35,12 +35,12 @@ a:layout_width="match_parent" a:layout_height="0dp"> - - - - - - + + + + + + @@ -48,12 +48,12 @@ a:layout_width="match_parent" a:layout_height="0dp"> - - - - - - + + + + + + @@ -62,12 +62,12 @@ a:layout_width="match_parent" a:layout_height="0dp"> - - - - - - + + + + + + diff --git a/android-app-core/res/layout/unit_converter.xml b/android-app-core/res/layout/cpp_unit_converter.xml similarity index 100% rename from android-app-core/res/layout/unit_converter.xml rename to android-app-core/res/layout/cpp_unit_converter.xml diff --git a/android-app-core/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java b/android-app-core/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java index 751a518e..1e8b83ff 100644 --- a/android-app-core/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java +++ b/android-app-core/src/main/java/org/solovyev/android/calculator/view/UnitConverterViewBuilder.java @@ -70,7 +70,7 @@ public class UnitConverterViewBuilder implements ViewBuilder { @NotNull @Override public View build(@NotNull final Context context) { - final View main = ViewFromLayoutBuilder.newInstance(R.layout.unit_converter).build(context); + final View main = ViewFromLayoutBuilder.newInstance(R.layout.cpp_unit_converter).build(context); final Spinner fromSpinner = (Spinner) main.findViewById(R.id.unit_types_from); final EditText fromEditText = (EditText) main.findViewById(R.id.units_from); diff --git a/android-app-onscreen/pom.xml b/android-app-onscreen/pom.xml index 27b7e988..cec673c2 100644 --- a/android-app-onscreen/pom.xml +++ b/android-app-onscreen/pom.xml @@ -29,6 +29,17 @@ apklib + + com.google.android + android + provided + + + + com.google.android + support-v4 + + diff --git a/android-app-onscreen/res/layout/onscreen_keyboard.xml b/android-app-onscreen/res/layout/onscreen_keyboard.xml index 8f882cc4..53ee50cb 100644 --- a/android-app-onscreen/res/layout/onscreen_keyboard.xml +++ b/android-app-onscreen/res/layout/onscreen_keyboard.xml @@ -9,11 +9,11 @@ a:layout_width="match_parent" a:layout_height="0dp"> - - - - - + + + + + @@ -21,11 +21,11 @@ a:layout_width="match_parent" a:layout_height="0dp"> - - - - - + + + + + @@ -33,22 +33,22 @@ a:layout_width="match_parent" a:layout_height="0dp"> - - - - - + + + + + - - - - - + + + + + diff --git a/android-app-onscreen/res/layout/onscreen_layout.xml b/android-app-onscreen/res/layout/onscreen_layout.xml index aa1893cb..965a16cd 100644 --- a/android-app-onscreen/res/layout/onscreen_layout.xml +++ b/android-app-onscreen/res/layout/onscreen_layout.xml @@ -19,7 +19,7 @@ a:layout_width="match_parent" a:layout_height="0dp"> - apklib + + com.google.android + android + provided + + + + com.google.android + support-v4 + + diff --git a/android-app-widget/res/layout/widget_layout.xml b/android-app-widget/res/layout/widget_layout.xml index 3ffa9846..e3c782c3 100644 --- a/android-app-widget/res/layout/widget_layout.xml +++ b/android-app-widget/res/layout/widget_layout.xml @@ -15,7 +15,7 @@ a:layout_width="match_parent" a:layout_height="0dp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android-app/res/layout-land/calc_keyboard_mobile.xml b/android-app/res/layout-land/calc_keyboard_mobile.xml deleted file mode 100644 index 5bab90d8..00000000 --- a/android-app/res/layout-land/calc_keyboard_mobile.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android-app/res/layout-land/cpp_app_keyboard.xml b/android-app/res/layout-land/cpp_app_keyboard.xml new file mode 100644 index 00000000..123ad649 --- /dev/null +++ b/android-app/res/layout-land/cpp_app_keyboard.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-app/res/layout-land/cpp_app_keyboard_mobile.xml b/android-app/res/layout-land/cpp_app_keyboard_mobile.xml new file mode 100644 index 00000000..7d837f30 --- /dev/null +++ b/android-app/res/layout-land/cpp_app_keyboard_mobile.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-app/res/layout-land/main_first_pane.xml b/android-app/res/layout-land/main_first_pane.xml index 347683a7..c64ec051 100644 --- a/android-app/res/layout-land/main_first_pane.xml +++ b/android-app/res/layout-land/main_first_pane.xml @@ -21,13 +21,13 @@ a:layout_width="match_parent" a:layout_height="0dp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android-app/res/layout-large-land/cpp_app_keyboard.xml b/android-app/res/layout-large-land/cpp_app_keyboard.xml new file mode 100644 index 00000000..bd9d69db --- /dev/null +++ b/android-app/res/layout-large-land/cpp_app_keyboard.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-app/res/layout-large/calc_keyboard.xml b/android-app/res/layout-large/calc_keyboard.xml deleted file mode 100644 index 7d9b9100..00000000 --- a/android-app/res/layout-large/calc_keyboard.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android-app/res/layout-large/calc_display.xml b/android-app/res/layout-large/cpp_app_display.xml similarity index 100% rename from android-app/res/layout-large/calc_display.xml rename to android-app/res/layout-large/cpp_app_display.xml diff --git a/android-app/res/layout-large/calc_editor.xml b/android-app/res/layout-large/cpp_app_editor.xml similarity index 100% rename from android-app/res/layout-large/calc_editor.xml rename to android-app/res/layout-large/cpp_app_editor.xml diff --git a/android-app/res/layout-large/cpp_app_keyboard.xml b/android-app/res/layout-large/cpp_app_keyboard.xml new file mode 100644 index 00000000..a8a4af52 --- /dev/null +++ b/android-app/res/layout-large/cpp_app_keyboard.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-app/res/layout-xlarge-land/calc_keyboard.xml b/android-app/res/layout-xlarge-land/calc_keyboard.xml deleted file mode 100644 index b7adc360..00000000 --- a/android-app/res/layout-xlarge-land/calc_keyboard.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android-app/res/layout-xlarge-land/cpp_app_keyboard.xml b/android-app/res/layout-xlarge-land/cpp_app_keyboard.xml new file mode 100644 index 00000000..205f6901 --- /dev/null +++ b/android-app/res/layout-xlarge-land/cpp_app_keyboard.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-app/res/layout-xlarge/calc_keyboard.xml b/android-app/res/layout-xlarge/calc_keyboard.xml deleted file mode 100644 index a40759e7..00000000 --- a/android-app/res/layout-xlarge/calc_keyboard.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android-app/res/layout-xlarge/calc_display.xml b/android-app/res/layout-xlarge/cpp_app_display.xml similarity index 100% rename from android-app/res/layout-xlarge/calc_display.xml rename to android-app/res/layout-xlarge/cpp_app_display.xml diff --git a/android-app/res/layout-xlarge/calc_editor.xml b/android-app/res/layout-xlarge/cpp_app_editor.xml similarity index 100% rename from android-app/res/layout-xlarge/calc_editor.xml rename to android-app/res/layout-xlarge/cpp_app_editor.xml diff --git a/android-app/res/layout-xlarge/cpp_app_keyboard.xml b/android-app/res/layout-xlarge/cpp_app_keyboard.xml new file mode 100644 index 00000000..31262c45 --- /dev/null +++ b/android-app/res/layout-xlarge/cpp_app_keyboard.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-app/res/layout/calc_keyboard.xml b/android-app/res/layout/calc_keyboard.xml deleted file mode 100644 index 9653cb2a..00000000 --- a/android-app/res/layout/calc_keyboard.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android-app/res/layout/calc_keyboard_mobile.xml b/android-app/res/layout/calc_keyboard_mobile.xml deleted file mode 100644 index 8dbe70cc..00000000 --- a/android-app/res/layout/calc_keyboard_mobile.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android-app/res/layout/calc_title.xml b/android-app/res/layout/calc_title.xml deleted file mode 100644 index 8e3143d2..00000000 --- a/android-app/res/layout/calc_title.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/android-app/res/layout/calc_copy_button.xml b/android-app/res/layout/cpp_app_button_copy.xml similarity index 100% rename from android-app/res/layout/calc_copy_button.xml rename to android-app/res/layout/cpp_app_button_copy.xml diff --git a/android-app/res/layout/calc_donate_button.xml b/android-app/res/layout/cpp_app_button_donate.xml similarity index 100% rename from android-app/res/layout/calc_donate_button.xml rename to android-app/res/layout/cpp_app_button_donate.xml diff --git a/android-app/res/layout/calc_erase_button.xml b/android-app/res/layout/cpp_app_button_erase.xml similarity index 100% rename from android-app/res/layout/calc_erase_button.xml rename to android-app/res/layout/cpp_app_button_erase.xml diff --git a/android-app/res/layout/calc_paste_button.xml b/android-app/res/layout/cpp_app_button_paste.xml similarity index 100% rename from android-app/res/layout/calc_paste_button.xml rename to android-app/res/layout/cpp_app_button_paste.xml diff --git a/android-app/res/layout/calc_display.xml b/android-app/res/layout/cpp_app_display.xml similarity index 100% rename from android-app/res/layout/calc_display.xml rename to android-app/res/layout/cpp_app_display.xml diff --git a/android-app/res/layout/calc_display_mobile.xml b/android-app/res/layout/cpp_app_display_mobile.xml similarity index 100% rename from android-app/res/layout/calc_display_mobile.xml rename to android-app/res/layout/cpp_app_display_mobile.xml diff --git a/android-app/res/layout/calc_editor.xml b/android-app/res/layout/cpp_app_editor.xml similarity index 100% rename from android-app/res/layout/calc_editor.xml rename to android-app/res/layout/cpp_app_editor.xml diff --git a/android-app/res/layout/calc_editor_mobile.xml b/android-app/res/layout/cpp_app_editor_mobile.xml similarity index 100% rename from android-app/res/layout/calc_editor_mobile.xml rename to android-app/res/layout/cpp_app_editor_mobile.xml diff --git a/android-app/res/layout/cpp_app_keyboard.xml b/android-app/res/layout/cpp_app_keyboard.xml new file mode 100644 index 00000000..a69c25f5 --- /dev/null +++ b/android-app/res/layout/cpp_app_keyboard.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-app/res/layout/cpp_app_keyboard_mobile.xml b/android-app/res/layout/cpp_app_keyboard_mobile.xml new file mode 100644 index 00000000..f5f41e98 --- /dev/null +++ b/android-app/res/layout/cpp_app_keyboard_mobile.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-app/res/layout/calc_zero_digit_button.xml b/android-app/res/layout/cpp_drag_button_0.xml similarity index 100% rename from android-app/res/layout/calc_zero_digit_button.xml rename to android-app/res/layout/cpp_drag_button_0.xml diff --git a/android-app/res/layout/calc_one_digit_button.xml b/android-app/res/layout/cpp_drag_button_1.xml similarity index 100% rename from android-app/res/layout/calc_one_digit_button.xml rename to android-app/res/layout/cpp_drag_button_1.xml diff --git a/android-app/res/layout/calc_two_digit_button.xml b/android-app/res/layout/cpp_drag_button_2.xml similarity index 100% rename from android-app/res/layout/calc_two_digit_button.xml rename to android-app/res/layout/cpp_drag_button_2.xml diff --git a/android-app/res/layout/calc_three_digit_button.xml b/android-app/res/layout/cpp_drag_button_3.xml similarity index 100% rename from android-app/res/layout/calc_three_digit_button.xml rename to android-app/res/layout/cpp_drag_button_3.xml diff --git a/android-app/res/layout/calc_four_digit_button.xml b/android-app/res/layout/cpp_drag_button_4.xml similarity index 100% rename from android-app/res/layout/calc_four_digit_button.xml rename to android-app/res/layout/cpp_drag_button_4.xml diff --git a/android-app/res/layout/calc_five_digit_button.xml b/android-app/res/layout/cpp_drag_button_5.xml similarity index 100% rename from android-app/res/layout/calc_five_digit_button.xml rename to android-app/res/layout/cpp_drag_button_5.xml diff --git a/android-app/res/layout/calc_six_digit_button.xml b/android-app/res/layout/cpp_drag_button_6.xml similarity index 100% rename from android-app/res/layout/calc_six_digit_button.xml rename to android-app/res/layout/cpp_drag_button_6.xml diff --git a/android-app/res/layout/calc_seven_digit_button.xml b/android-app/res/layout/cpp_drag_button_7.xml similarity index 100% rename from android-app/res/layout/calc_seven_digit_button.xml rename to android-app/res/layout/cpp_drag_button_7.xml diff --git a/android-app/res/layout/calc_eight_digit_button.xml b/android-app/res/layout/cpp_drag_button_8.xml similarity index 100% rename from android-app/res/layout/calc_eight_digit_button.xml rename to android-app/res/layout/cpp_drag_button_8.xml diff --git a/android-app/res/layout/calc_nine_digit_button.xml b/android-app/res/layout/cpp_drag_button_9.xml similarity index 100% rename from android-app/res/layout/calc_nine_digit_button.xml rename to android-app/res/layout/cpp_drag_button_9.xml diff --git a/android-app/res/layout/calc_clear_button.xml b/android-app/res/layout/cpp_drag_button_clear.xml similarity index 100% rename from android-app/res/layout/calc_clear_button.xml rename to android-app/res/layout/cpp_drag_button_clear.xml diff --git a/android-app/res/layout/calc_division_button.xml b/android-app/res/layout/cpp_drag_button_division.xml similarity index 100% rename from android-app/res/layout/calc_division_button.xml rename to android-app/res/layout/cpp_drag_button_division.xml diff --git a/android-app/res/layout/calc_dot_button.xml b/android-app/res/layout/cpp_drag_button_dot.xml similarity index 100% rename from android-app/res/layout/calc_dot_button.xml rename to android-app/res/layout/cpp_drag_button_dot.xml diff --git a/android-app/res/layout/calc_empty_button.xml b/android-app/res/layout/cpp_drag_button_empty.xml similarity index 100% rename from android-app/res/layout/calc_empty_button.xml rename to android-app/res/layout/cpp_drag_button_empty.xml diff --git a/android-app/res/layout/calc_equals_button.xml b/android-app/res/layout/cpp_drag_button_equals.xml similarity index 100% rename from android-app/res/layout/calc_equals_button.xml rename to android-app/res/layout/cpp_drag_button_equals.xml diff --git a/android-app/res/layout/calc_functions_button.xml b/android-app/res/layout/cpp_drag_button_functions.xml similarity index 100% rename from android-app/res/layout/calc_functions_button.xml rename to android-app/res/layout/cpp_drag_button_functions.xml diff --git a/android-app/res/layout/calc_history_button.xml b/android-app/res/layout/cpp_drag_button_history.xml similarity index 100% rename from android-app/res/layout/calc_history_button.xml rename to android-app/res/layout/cpp_drag_button_history.xml diff --git a/android-app/res/layout/calc_left_button.xml b/android-app/res/layout/cpp_drag_button_left.xml similarity index 100% rename from android-app/res/layout/calc_left_button.xml rename to android-app/res/layout/cpp_drag_button_left.xml diff --git a/android-app/res/layout/calc_multiplication_button.xml b/android-app/res/layout/cpp_drag_button_multiplication.xml similarity index 100% rename from android-app/res/layout/calc_multiplication_button.xml rename to android-app/res/layout/cpp_drag_button_multiplication.xml diff --git a/android-app/res/layout/calc_operators_button.xml b/android-app/res/layout/cpp_drag_button_operators.xml similarity index 100% rename from android-app/res/layout/calc_operators_button.xml rename to android-app/res/layout/cpp_drag_button_operators.xml diff --git a/android-app/res/layout/calc_plus_button.xml b/android-app/res/layout/cpp_drag_button_plus.xml similarity index 100% rename from android-app/res/layout/calc_plus_button.xml rename to android-app/res/layout/cpp_drag_button_plus.xml diff --git a/android-app/res/layout/calc_right_button.xml b/android-app/res/layout/cpp_drag_button_right.xml similarity index 100% rename from android-app/res/layout/calc_right_button.xml rename to android-app/res/layout/cpp_drag_button_right.xml diff --git a/android-app/res/layout/calc_round_brackets_button.xml b/android-app/res/layout/cpp_drag_button_round_brackets.xml similarity index 100% rename from android-app/res/layout/calc_round_brackets_button.xml rename to android-app/res/layout/cpp_drag_button_round_brackets.xml diff --git a/android-app/res/layout/calc_subtraction_button.xml b/android-app/res/layout/cpp_drag_button_subtraction.xml similarity index 100% rename from android-app/res/layout/calc_subtraction_button.xml rename to android-app/res/layout/cpp_drag_button_subtraction.xml diff --git a/android-app/res/layout/calc_vars_button.xml b/android-app/res/layout/cpp_drag_button_vars.xml similarity index 100% rename from android-app/res/layout/calc_vars_button.xml rename to android-app/res/layout/cpp_drag_button_vars.xml diff --git a/android-app/res/layout/main_calculator.xml b/android-app/res/layout/main_calculator.xml index 3dda0891..176115b6 100644 --- a/android-app/res/layout/main_calculator.xml +++ b/android-app/res/layout/main_calculator.xml @@ -23,7 +23,7 @@ a:layout_width="match_parent" a:layout_height="0dp"> - -