From 99e7471ebd1e1d0567532fa60401bc9a41e0ad7e Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Wed, 26 Jun 2013 12:22:07 +0400 Subject: [PATCH] copyright + code reformat --- android-app-core/AndroidManifest.xml | 10 +- android-app-core/pom.xml | 3 +- android-app-core/res/drawable/blue_button.xml | 26 +- .../res/drawable/blue_button_dark.xml | 26 +- .../res/drawable/blue_button_dark_shape.xml | 30 +- .../res/drawable/blue_button_shape.xml | 30 +- .../default_abs__btn_cab_done_holo_dark.xml | 42 +-- ...default_abs__item_background_holo_dark.xml | 51 ++-- ...lector_background_transition_holo_dark.xml | 39 +-- .../default_abs__list_selector_holo_dark.xml | 51 ++-- .../default_abs__spinner_ab_holo_dark.xml | 44 +-- .../default_abs__tab_indicator_ab_holo.xml | 59 ++-- android-app-core/res/drawable/gray_button.xml | 26 +- .../res/drawable/gray_button_dark.xml | 26 +- .../res/drawable/gray_button_dark_shape.xml | 30 +- .../res/drawable/gray_button_shape.xml | 30 +- .../metro_blue_abs__tab_indicator_ab_holo.xml | 59 ++-- .../res/drawable/metro_blue_button.xml | 26 +- .../res/drawable/metro_blue_button_shape.xml | 39 +-- .../res/drawable/metro_blue_list_item.xml | 46 ++- .../res/drawable/metro_button_dark.xml | 26 +- .../res/drawable/metro_button_dark_shape.xml | 39 +-- .../res/drawable/metro_button_green.xml | 26 +- .../res/drawable/metro_button_green_shape.xml | 39 +-- .../res/drawable/metro_button_light.xml | 26 +- .../res/drawable/metro_button_light_shape.xml | 39 +-- .../res/drawable/metro_button_pressed.xml | 39 +-- .../res/drawable/metro_button_purple.xml | 26 +- .../drawable/metro_button_purple_shape.xml | 39 +-- .../res/drawable/metro_green_list_item.xml | 46 ++- .../res/drawable/metro_purple_list_item.xml | 46 ++- .../res/drawable/pane_background.xml | 39 +-- .../res/drawable/violet_button.xml | 26 +- .../res/drawable/violet_button_dark.xml | 26 +- .../res/drawable/violet_button_dark_shape.xml | 30 +- .../res/drawable/violet_button_shape.xml | 30 +- .../layout/cpp_fixable_messages_dialog.xml | 56 ++-- .../cpp_fixable_messages_dialog_message.xml | 52 +++- .../res/layout/cpp_simple_button_0.xml | 28 +- .../res/layout/cpp_simple_button_1.xml | 28 +- .../res/layout/cpp_simple_button_2.xml | 28 +- .../res/layout/cpp_simple_button_3.xml | 28 +- .../res/layout/cpp_simple_button_4.xml | 28 +- .../res/layout/cpp_simple_button_5.xml | 28 +- .../res/layout/cpp_simple_button_6.xml | 28 +- .../res/layout/cpp_simple_button_7.xml | 28 +- .../res/layout/cpp_simple_button_8.xml | 28 +- .../res/layout/cpp_simple_button_9.xml | 28 +- .../res/layout/cpp_simple_button_app.xml | 30 +- .../res/layout/cpp_simple_button_clear.xml | 30 +- .../res/layout/cpp_simple_button_copy.xml | 30 +- .../res/layout/cpp_simple_button_division.xml | 28 +- .../res/layout/cpp_simple_button_dot.xml | 28 +- .../res/layout/cpp_simple_button_equals.xml | 28 +- .../res/layout/cpp_simple_button_erase.xml | 30 +- .../layout/cpp_simple_button_functions.xml | 30 +- .../res/layout/cpp_simple_button_history.xml | 30 +- .../res/layout/cpp_simple_button_left.xml | 28 +- .../res/layout/cpp_simple_button_like.xml | 30 +- .../cpp_simple_button_multiplication.xml | 28 +- .../res/layout/cpp_simple_button_paste.xml | 30 +- .../res/layout/cpp_simple_button_percent.xml | 28 +- .../res/layout/cpp_simple_button_plus.xml | 28 +- .../res/layout/cpp_simple_button_power.xml | 28 +- .../res/layout/cpp_simple_button_right.xml | 28 +- .../cpp_simple_button_round_brackets.xml | 28 +- .../res/layout/cpp_simple_button_settings.xml | 30 +- .../layout/cpp_simple_button_subtraction.xml | 28 +- .../res/layout/cpp_simple_button_vars.xml | 30 +- .../res/layout/cpp_simple_keyboard.xml | 118 ++++---- .../res/layout/cpp_unit_converter.xml | 134 +++++---- .../res/layout/main_calculator.xml | 28 +- .../res/layout/main_calculator_mobile.xml | 28 +- android-app-core/res/values-es/text_about.xml | 25 +- .../res/values-es/text_functions.xml | 22 +- android-app-core/res/values-es/text_help.xml | 22 +- .../res/values-es/text_operators.xml | 22 +- .../res/values-es/text_strings.xml | 22 +- android-app-core/res/values-es/text_vars.xml | 22 +- android-app-core/res/values-it/text_about.xml | 22 +- .../res/values-it/text_functions.xml | 22 +- android-app-core/res/values-it/text_help.xml | 22 +- .../res/values-it/text_operators.xml | 22 +- .../res/values-it/text_strings.xml | 22 +- android-app-core/res/values-it/text_vars.xml | 22 +- android-app-core/res/values-ru/text_about.xml | 22 +- .../res/values-ru/text_functions.xml | 22 +- android-app-core/res/values-ru/text_help.xml | 22 +- .../res/values-ru/text_operators.xml | 22 +- .../res/values-ru/text_preferences.xml | 22 ++ .../res/values-ru/text_strings.xml | 22 +- android-app-core/res/values-ru/text_vars.xml | 22 +- android-app-core/res/values-uk/text_about.xml | 22 +- .../res/values-uk/text_functions.xml | 22 +- android-app-core/res/values-uk/text_help.xml | 22 +- .../res/values-uk/text_operators.xml | 22 +- .../res/values-uk/text_preferences.xml | 22 ++ .../res/values-uk/text_strings.xml | 22 +- android-app-core/res/values-uk/text_vars.xml | 22 +- .../res/values-zh-rtw/text_about.xml | 22 +- .../res/values-zh-rtw/text_functions.xml | 22 +- .../res/values-zh-rtw/text_help.xml | 22 +- .../res/values-zh-rtw/text_operators.xml | 22 +- .../res/values-zh-rtw/text_preferences.xml | 22 ++ .../res/values-zh-rtw/text_strings.xml | 22 +- .../res/values-zh-rtw/text_vars.xml | 22 +- android-app-core/res/values/arrays.xml | 22 ++ android-app-core/res/values/attributes.xml | 50 +++- android-app-core/res/values/colors.xml | 22 ++ android-app-core/res/values/dimens.xml | 22 ++ android-app-core/res/values/ids.xml | 88 +++--- android-app-core/res/values/preferences.xml | 22 ++ android-app-core/res/values/styles.xml | 22 +- android-app-core/res/values/text_about.xml | 22 +- .../res/values/text_functions.xml | 22 +- android-app-core/res/values/text_help.xml | 22 +- .../res/values/text_operators.xml | 22 +- .../res/values/text_preferences.xml | 25 +- android-app-core/res/values/text_strings.xml | 22 +- android-app-core/res/values/text_vars.xml | 22 +- android-app-core/res/values/text_wizard.xml | 34 ++- android-app-core/res/values/theme_gray.xml | 22 +- .../res/values/theme_light_blue.xml | 22 +- .../res/values/theme_metro_blue.xml | 22 ++ .../res/values/theme_metro_green.xml | 22 ++ .../res/values/theme_metro_purple.xml | 22 ++ android-app-core/res/values/theme_violet.xml | 22 +- .../org/solovyev/android/AndroidUtils2.java | 22 ++ .../AndroidCalculatorDisplayView.java | 23 +- .../AndroidCalculatorEditorView.java | 22 +- .../android/calculator/CalculatorButton.java | 24 ++ .../android/calculator/CalculatorButtons.java | 23 ++ .../calculator/CalculatorDisplayMenuItem.java | 24 ++ .../CalculatorDisplayOnClickListener.java | 24 ++ .../calculator/CalculatorPreferences.java | 27 +- .../calculator/ConversionMenuItem.java | 24 ++ .../calculator/DigitButtonDragProcessor.java | 23 +- .../android/calculator/FixableMessage.java | 24 ++ .../calculator/FixableMessagesDialog.java | 25 ++ .../ParcelableCalculatorDisplayViewState.java | 24 ++ .../ParcelableCalculatorEditorViewState.java | 23 ++ .../calculator/ParcelableDialogData.java | 24 ++ .../AndroidExternalListenersContainer.java | 24 ++ ...efaultExternalCalculatorIntentHandler.java | 24 ++ .../ExternalCalculatorIntentHandler.java | 23 ++ .../ExternalCalculatorStateUpdater.java | 24 ++ .../model/AndroidCalculatorEngine.java | 23 +- .../model/AndroidMathEntityDao.java | 24 ++ .../plot/AndroidCalculatorPlotter.java | 24 ++ .../calculator/plot/AndroidPlotLineStyle.java | 23 ++ .../calculator/view/AngleUnitsButton.java | 24 +- .../view/NumeralBaseConverterDialog.java | 24 ++ .../calculator/view/NumeralBasesButton.java | 24 +- .../calculator/view/TextHighlighter.java | 23 +- .../view/UnitConverterViewBuilder.java | 24 ++ android-app-onscreen/AndroidManifest.xml | 10 +- android-app-onscreen/pom.xml | 3 +- .../res/layout/onscreen_display.xml | 14 +- .../res/layout/onscreen_editor.xml | 18 +- .../res/layout/onscreen_footer.xml | 6 +- .../res/layout/onscreen_header.xml | 48 ++-- .../res/layout/onscreen_keyboard.xml | 70 ++--- .../res/layout/onscreen_layout.xml | 58 ++-- .../CalculatorOnscreenBroadcastReceiver.java | 24 ++ .../onscreen/CalculatorOnscreenService.java | 24 ++ .../CalculatorOnscreenStartActivity.java | 24 ++ .../onscreen/CalculatorOnscreenView.java | 26 +- .../onscreen/CalculatorOnscreenViewState.java | 24 ++ .../onscreen/OnscreenViewListener.java | 22 ++ android-app-test/pom.xml | 3 +- android-app-widget/AndroidManifest.xml | 10 +- android-app-widget/pom.xml | 3 +- .../res/layout/widget_display.xml | 12 +- .../res/layout/widget_editor.xml | 22 +- .../res/layout/widget_layout.xml | 50 ++-- .../AbstractCalculatorWidgetProvider.java | 23 ++ ...CalculatorWidgetConfigurationActivity.java | 22 ++ .../widget/CalculatorWidgetIntentHandler.java | 24 ++ .../widget/CalculatorWidgetProvider.java | 22 ++ .../widget/CalculatorWidgetProvider3x4.java | 22 ++ .../widget/CalculatorWidgetProvider4x4.java | 22 ++ .../widget/CalculatorWidgetProvider4x5.java | 22 ++ android-app/AndroidManifest.xml | 67 +++-- android-app/pom.xml | 3 +- .../res/layout-land/cpp_app_keyboard.xml | 94 +++--- .../layout-land/cpp_app_keyboard_mobile.xml | 94 +++--- .../res/layout-land/main_calculator.xml | 30 +- .../layout-land/main_calculator_mobile.xml | 30 +- .../res/layout-land/main_first_pane.xml | 102 ++++--- .../layout-land/main_first_pane_mobile.xml | 102 ++++--- .../layout-large-land/cpp_app_keyboard.xml | 106 ++++--- .../res/layout-large-land/main_calculator.xml | 90 +++--- .../res/layout-large/cpp_app_display.xml | 50 ++-- .../res/layout-large/cpp_app_editor.xml | 50 ++-- .../res/layout-large/cpp_app_keyboard.xml | 108 ++++--- .../res/layout-large/main_calculator.xml | 90 +++--- .../layout-xlarge-land/cpp_app_keyboard.xml | 96 ++++--- .../layout-xlarge-land/main_calculator.xml | 90 +++--- .../res/layout-xlarge/cpp_app_display.xml | 50 ++-- .../res/layout-xlarge/cpp_app_editor.xml | 50 ++-- .../res/layout-xlarge/cpp_app_keyboard.xml | 116 +++++--- .../res/layout-xlarge/main_calculator.xml | 90 +++--- android-app/res/layout/about_fragment.xml | 58 ++-- android-app/res/layout/ad.xml | 28 +- android-app/res/layout/calc_plot_view.xml | 30 +- .../res/layout/cpp_app_button_copy.xml | 30 +- .../res/layout/cpp_app_button_donate.xml | 30 +- .../res/layout/cpp_app_button_erase.xml | 30 +- .../res/layout/cpp_app_button_paste.xml | 30 +- android-app/res/layout/cpp_app_display.xml | 36 ++- .../res/layout/cpp_app_display_mobile.xml | 36 ++- android-app/res/layout/cpp_app_editor.xml | 44 ++- .../res/layout/cpp_app_editor_mobile.xml | 44 ++- android-app/res/layout/cpp_app_keyboard.xml | 108 ++++--- .../res/layout/cpp_app_keyboard_mobile.xml | 108 ++++--- android-app/res/layout/cpp_dialog.xml | 28 +- .../res/layout/cpp_dialog_fragment.xml | 72 +++-- android-app/res/layout/cpp_drag_button_0.xml | 38 ++- android-app/res/layout/cpp_drag_button_1.xml | 38 ++- android-app/res/layout/cpp_drag_button_2.xml | 38 ++- android-app/res/layout/cpp_drag_button_3.xml | 38 ++- android-app/res/layout/cpp_drag_button_4.xml | 38 ++- android-app/res/layout/cpp_drag_button_5.xml | 38 ++- android-app/res/layout/cpp_drag_button_6.xml | 40 ++- android-app/res/layout/cpp_drag_button_7.xml | 40 ++- android-app/res/layout/cpp_drag_button_8.xml | 40 ++- android-app/res/layout/cpp_drag_button_9.xml | 40 ++- .../res/layout/cpp_drag_button_clear.xml | 40 ++- .../res/layout/cpp_drag_button_division.xml | 38 ++- .../res/layout/cpp_drag_button_dot.xml | 36 ++- .../res/layout/cpp_drag_button_empty.xml | 24 +- .../res/layout/cpp_drag_button_equals.xml | 42 ++- .../res/layout/cpp_drag_button_functions.xml | 38 ++- .../res/layout/cpp_drag_button_history.xml | 40 ++- .../res/layout/cpp_drag_button_left.xml | 36 ++- .../layout/cpp_drag_button_multiplication.xml | 40 ++- .../res/layout/cpp_drag_button_operators.xml | 30 +- .../res/layout/cpp_drag_button_plus.xml | 38 ++- .../res/layout/cpp_drag_button_right.xml | 36 ++- .../layout/cpp_drag_button_round_brackets.xml | 40 ++- .../layout/cpp_drag_button_subtraction.xml | 36 ++- .../res/layout/cpp_drag_button_vars.xml | 38 ++- android-app/res/layout/cpp_plot_fragment.xml | 40 ++- .../layout/cpp_plot_function_list_item.xml | 68 +++-- .../cpp_plot_function_settings_dialog.xml | 26 +- .../cpp_plot_function_settings_fragment.xml | 98 ++++--- .../layout/cpp_plot_functions_fragment.xml | 72 +++-- .../res/layout/cpp_plot_range_fragment.xml | 150 +++++----- .../layout/cpp_purchase_dialog_fragment.xml | 54 ++-- android-app/res/layout/cpp_wiki_page.xml | 32 ++- android-app/res/layout/cpp_wizard.xml | 80 ++++-- .../layout/cpp_wizard_step_choose_layout.xml | 86 +++--- .../layout/cpp_wizard_step_choose_mode.xml | 22 ++ .../layout/cpp_wizard_step_drag_button.xml | 64 +++-- .../res/layout/cpp_wizard_step_onscreen.xml | 38 ++- .../res/layout/cpp_wizard_step_welcome.xml | 32 ++- .../res/layout/display_error_message.xml | 46 ++- .../res/layout/drag_button_calibration.xml | 104 ++++--- android-app/res/layout/feedback.xml | 36 ++- android-app/res/layout/function_add_param.xml | 44 ++- android-app/res/layout/function_edit.xml | 144 +++++----- .../res/layout/function_edit_param.xml | 70 +++-- android-app/res/layout/help_faq_fragment.xml | 56 ++-- .../res/layout/help_hints_fragment.xml | 56 ++-- .../res/layout/help_screens_fragment.xml | 56 ++-- android-app/res/layout/history_edit.xml | 84 +++--- android-app/res/layout/history_fragment.xml | 42 ++- android-app/res/layout/history_item.xml | 22 +- android-app/res/layout/main_calculator.xml | 72 +++-- .../res/layout/main_calculator_mobile.xml | 72 +++-- android-app/res/layout/main_empty.xml | 28 +- .../res/layout/main_empty_multi_pane.xml | 28 +- .../res/layout/math_entities_fragment.xml | 42 ++- android-app/res/layout/math_entity.xml | 66 +++-- .../res/layout/matrix_edit_fragment.xml | 94 +++--- .../res/layout/matrix_edit_fragment_item.xml | 34 ++- android-app/res/layout/notespp_announce.xml | 36 ++- .../res/layout/release_notes_fragment.xml | 44 ++- android-app/res/layout/saved_history_item.xml | 82 +++--- android-app/res/layout/tabs.xml | 46 ++- android-app/res/layout/var_edit.xml | 128 +++++---- android-app/res/layout/vars_fragment.xml | 42 ++- android-app/res/menu/functions_menu.xml | 22 +- android-app/res/menu/history_menu.xml | 22 +- android-app/res/menu/plot_menu.xml | 78 +++-- android-app/res/menu/vars_menu.xml | 22 +- android-app/res/values-large-hdpi/dimens.xml | 22 ++ android-app/res/values-large-mdpi/dimens.xml | 22 ++ android-app/res/values-large-tvdpi/dimens.xml | 22 ++ android-app/res/values-large/arrays.xml | 22 +- android-app/res/values-large/dimens.xml | 22 ++ android-app/res/values-normal-hdpi/dimens.xml | 22 ++ android-app/res/values-normal-mdpi/dimens.xml | 22 ++ .../res/values-normal-tvdpi/dimens.xml | 22 ++ .../res/values-normal-xhdpi/dimens.xml | 22 ++ android-app/res/values-normal/dimens.xml | 22 ++ android-app/res/values-small-hdpi/dimens.xml | 22 ++ android-app/res/values-small-xhdpi/dimens.xml | 22 ++ android-app/res/values-small/dimens.xml | 22 ++ android-app/res/values-v14/dimens.xml | 22 ++ android-app/res/values-xlarge-hdpi/dimens.xml | 22 ++ android-app/res/values-xlarge-mdpi/dimens.xml | 22 ++ android-app/res/values-xlarge/dimens.xml | 22 ++ android-app/res/values/arrays.xml | 22 +- android-app/res/values/preferences.xml | 22 +- android-app/res/values/styles_history.xml | 26 +- android-app/res/values/styles_var.xml | 22 +- .../res/xml/calculator_widget_info_3x3.xml | 32 ++- .../res/xml/calculator_widget_info_3x4.xml | 32 ++- .../res/xml/calculator_widget_info_4x4.xml | 32 ++- .../res/xml/calculator_widget_info_4x5.xml | 32 ++- android-app/res/xml/preferences.xml | 32 ++- .../res/xml/preferences_appearance.xml | 128 +++++---- .../res/xml/preferences_calculations.xml | 124 ++++---- android-app/res/xml/preferences_onscreen.xml | 36 ++- android-app/res/xml/preferences_other.xml | 48 +++- android-app/res/xml/preferences_plot.xml | 30 +- .../calculator/AbstractCalculatorHelper.java | 24 ++ .../android/calculator/AndroidCalculator.java | 24 ++ .../AndroidCalculatorClipboard.java | 23 ++ .../calculator/AndroidCalculatorKeyboard.java | 24 ++ .../calculator/AndroidCalculatorLogger.java | 23 ++ .../calculator/AndroidCalculatorNotifier.java | 24 ++ .../AndroidCalculatorPreferenceService.java | 24 ++ .../calculator/AndroidFunctionCategory.java | 22 ++ .../calculator/AndroidNumeralBase.java | 24 ++ .../calculator/AndroidOperatorCategory.java | 22 ++ .../calculator/AndroidVarCategory.java | 22 ++ .../calculator/CalculatorActivity.java | 25 +- .../calculator/CalculatorActivityHelper.java | 24 ++ .../CalculatorActivityHelperImpl.java | 25 ++ .../CalculatorActivityLauncher.java | 26 ++ .../calculator/CalculatorActivityMobile.java | 23 ++ .../calculator/CalculatorApplication.java | 25 ++ .../calculator/CalculatorDialogActivity.java | 25 ++ .../calculator/CalculatorDisplayFragment.java | 24 ++ .../calculator/CalculatorEditorFragment.java | 25 ++ .../calculator/CalculatorFragment.java | 24 ++ .../CalculatorFragmentActivity.java | 24 ++ .../calculator/CalculatorFragmentHelper.java | 23 ++ .../CalculatorFragmentHelperImpl.java | 25 ++ .../calculator/CalculatorFragmentType.java | 24 ++ .../CalculatorKeyboardFragment.java | 25 ++ .../calculator/CalculatorListFragment.java | 24 ++ .../android/calculator/CalculatorMenu.java | 25 ++ .../calculator/CalculatorSecurity.java | 22 +- .../calculator/CalculatorWikiActivity.java | 22 ++ .../calculator/CharacterAtPositionFinder.java | 23 +- .../calculator/CursorDragProcessor.java | 23 +- .../calculator/EqualsDragProcessor.java | 24 +- .../calculator/NumeralBaseButtons.java | 24 ++ .../about/CalculatorAboutActivity.java | 23 +- .../about/CalculatorAboutFragment.java | 23 +- .../about/CalculatorReleaseNotesFragment.java | 24 +- .../android/calculator/about/TextHelper.java | 23 ++ .../function/FunctionEditDialogFragment.java | 26 ++ .../function/FunctionEditorSaver.java | 24 ++ .../function/FunctionParamEditText.java | 22 ++ .../function/FunctionParamsView.java | 24 ++ .../help/CalculatorHelpActivity.java | 24 +- .../help/CalculatorHelpFaqFragment.java | 22 +- .../help/CalculatorHelpHintsFragment.java | 22 +- .../help/CalculatorHelpScreensFragment.java | 22 +- .../AbstractCalculatorHistoryFragment.java | 25 +- .../history/AndroidCalculatorHistory.java | 24 +- .../history/CalculatorHistoryActivity.java | 25 +- .../history/CalculatorHistoryFragment.java | 24 +- .../CalculatorSavedHistoryFragment.java | 23 +- .../history/HistoryArrayAdapter.java | 26 +- .../history/HistoryItemMenuData.java | 23 +- .../history/HistoryItemMenuItem.java | 24 +- .../history/TextViewEditorAdapter.java | 24 +- .../edit/AbstractMathEntityListFragment.java | 22 +- .../edit/CalculatorFunctionsActivity.java | 25 +- .../edit/CalculatorFunctionsFragment.java | 26 +- .../edit/CalculatorOperatorsActivity.java | 25 +- .../edit/CalculatorOperatorsFragment.java | 24 ++ .../math/edit/CalculatorVarsActivity.java | 25 +- .../math/edit/CalculatorVarsFragment.java | 26 +- .../math/edit/MathEntityRemover.java | 24 +- .../math/edit/VarEditDialogFragment.java | 24 ++ .../calculator/math/edit/VarEditorSaver.java | 24 +- .../matrix/CalculatorMatrixActivity.java | 23 ++ .../matrix/CalculatorMatrixEditFragment.java | 24 ++ .../android/calculator/matrix/MatrixView.java | 23 ++ .../plot/AbstractCalculatorPlotFragment.java | 27 +- .../plot/AbstractGraphCalculator.java | 22 ++ .../plot/CalculatorGraph2dView.java | 26 +- .../plot/CalculatorGraph3dView.java | 26 +- .../plot/CalculatorPlotActivity.java | 23 ++ .../plot/CalculatorPlotFragment.java | 23 ++ ...alculatorPlotFunctionSettingsActivity.java | 25 ++ .../plot/CalculatorPlotFunctionsActivity.java | 25 ++ .../CalculatorPlotPreferenceActivity.java | 24 ++ .../plot/CalculatorPlotRangeActivity.java | 25 ++ .../solovyev/android/calculator/plot/FPS.java | 22 ++ .../android/calculator/plot/GLText.java | 272 ++++++++++-------- .../android/calculator/plot/GLView.java | 24 +- .../calculator/plot/Graph2dDimensions.java | 24 ++ .../android/calculator/plot/Graph3d.java | 24 +- .../calculator/plot/GraphCalculator.java | 22 ++ .../calculator/plot/GraphCalculatorImpl.java | 22 ++ .../android/calculator/plot/GraphData.java | 22 ++ .../android/calculator/plot/GraphView.java | 23 ++ .../calculator/plot/GraphViewHelper.java | 22 ++ .../android/calculator/plot/GraphsData.java | 22 ++ .../calculator/plot/PlotFunctionListItem.java | 23 ++ .../android/calculator/plot/PlotViewDef.java | 23 ++ .../android/calculator/plot/SpriteBatch.java | 134 +++++---- .../calculator/plot/TexampleRenderer.java | 72 +++-- .../calculator/plot/TextureRegion.java | 34 ++- .../android/calculator/plot/TouchHandler.java | 24 +- .../android/calculator/plot/Vertices.java | 145 ++++++---- .../android/calculator/plot/ZoomTracker.java | 22 ++ .../CalculatorPreferencesActivity.java | 25 +- .../CalculatorPurchaseDialogActivity.java | 26 ++ .../view/CalculatorAdditionalTitle.java | 24 +- .../view/OnDragListenerVibrator.java | 24 ++ .../calculator/wizard/AppWizardFlow.java | 23 ++ .../calculator/wizard/CalculatorLayout.java | 31 +- .../calculator/wizard/CalculatorMode.java | 33 ++- .../wizard/CalculatorWizardActivity.java | 25 +- .../wizard/ChooseLayoutWizardStep.java | 25 +- .../wizard/ChooseModeWizardStep.java | 25 +- .../wizard/DragButtonWizardStep.java | 28 +- .../FinishWizardConfirmationDialog.java | 24 +- .../calculator/wizard/ListWizardFlow.java | 23 ++ .../wizard/OnScreenCalculatorWizardStep.java | 25 +- .../calculator/wizard/WelcomeWizardStep.java | 23 ++ .../android/calculator/wizard/WizardFlow.java | 22 ++ .../android/calculator/wizard/WizardStep.java | 23 ++ .../android/calculator/wizard/Wizards.java | 27 +- .../android/fragments/FragmentUtils.java | 25 ++ .../android/AndroidNumeralBaseTest.java | 24 ++ .../AndroidCalculatorEditorViewTest.java | 106 ++++--- .../calculator/CalculatorTestUtils.java | 23 ++ .../calculator/TestCalculatorApplication.java | 22 ++ .../calculator/TextHighlighterTest.java | 23 +- .../calculator/history/HistoryUtilsTest.java | 23 +- .../android/calculator/model/VarTest.java | 23 +- .../plot/CalculatorGraph2dViewTest.java | 22 ++ .../wizard/CalculatorWizardActivityTest.java | 22 ++ .../OnScreenCalculatorWizardStepTest.java | 22 ++ .../calculator/wizard/WizardStepTest.java | 22 ++ core/pom.xml | 3 +- .../solovyev/acraanalyzer/AcraAnalyzer.java | 23 ++ .../AbstractCalculatorMathRegistry.java | 23 +- .../calculator/AbstractFixableError.java | 22 ++ .../calculator/AbstractNumberBuilder.java | 24 +- .../android/calculator/Calculator.java | 24 ++ .../calculator/CalculatorClipboard.java | 22 ++ .../CalculatorConversionEventData.java | 23 ++ .../CalculatorConversionEventDataImpl.java | 23 ++ .../android/calculator/CalculatorDisplay.java | 22 +- .../CalculatorDisplayChangeEventData.java | 22 ++ .../CalculatorDisplayChangeEventDataImpl.java | 22 ++ .../calculator/CalculatorDisplayImpl.java | 22 ++ .../calculator/CalculatorDisplayView.java | 22 ++ .../CalculatorDisplayViewState.java | 24 ++ .../CalculatorDisplayViewStateImpl.java | 24 ++ .../android/calculator/CalculatorEditor.java | 23 ++ .../CalculatorEditorChangeEventData.java | 22 ++ .../CalculatorEditorChangeEventDataImpl.java | 22 ++ .../calculator/CalculatorEditorImpl.java | 23 ++ .../calculator/CalculatorEditorView.java | 22 ++ .../calculator/CalculatorEditorViewState.java | 22 ++ .../CalculatorEditorViewStateImpl.java | 22 ++ .../android/calculator/CalculatorEngine.java | 23 ++ .../calculator/CalculatorEngineControl.java | 22 +- .../calculator/CalculatorEngineImpl.java | 23 ++ .../calculator/CalculatorEvalException.java | 23 +- .../CalculatorEvaluationEventData.java | 23 ++ .../CalculatorEvaluationEventDataImpl.java | 23 ++ .../calculator/CalculatorEventContainer.java | 22 ++ .../calculator/CalculatorEventData.java | 22 ++ .../calculator/CalculatorEventDataImpl.java | 22 ++ .../calculator/CalculatorEventHolder.java | 22 ++ .../calculator/CalculatorEventListener.java | 22 ++ .../calculator/CalculatorEventType.java | 22 ++ .../android/calculator/CalculatorFailure.java | 22 ++ .../calculator/CalculatorFailureImpl.java | 22 ++ .../calculator/CalculatorFixableError.java | 24 ++ .../CalculatorFunctionsMathRegistry.java | 24 +- .../android/calculator/CalculatorImpl.java | 24 ++ .../android/calculator/CalculatorInput.java | 23 ++ .../calculator/CalculatorInputImpl.java | 23 ++ .../calculator/CalculatorKeyboard.java | 22 ++ .../calculator/CalculatorKeyboardImpl.java | 22 ++ .../android/calculator/CalculatorLocator.java | 23 ++ .../android/calculator/CalculatorLogger.java | 22 ++ .../calculator/CalculatorMathEngine.java | 23 ++ .../calculator/CalculatorMathRegistry.java | 23 +- .../android/calculator/CalculatorMessage.java | 23 ++ .../calculator/CalculatorMessages.java | 23 ++ .../calculator/CalculatorNotifier.java | 23 ++ .../CalculatorOperatorsMathRegistry.java | 24 +- .../android/calculator/CalculatorOutput.java | 24 ++ .../calculator/CalculatorOutputImpl.java | 24 ++ .../calculator/CalculatorParseException.java | 23 +- .../CalculatorPostfixFunctionsRegistry.java | 24 +- .../CalculatorPreferenceService.java | 23 ++ .../calculator/CalculatorSpecialButton.java | 22 ++ .../android/calculator/CalculatorUtils.java | 23 ++ .../calculator/CalculatorVarsRegistry.java | 24 +- .../solovyev/android/calculator/Change.java | 22 ++ .../android/calculator/ChangeImpl.java | 22 ++ .../android/calculator/ConversionFailure.java | 22 ++ .../calculator/ConversionFailureImpl.java | 22 ++ .../android/calculator/DialogData.java | 23 ++ .../calculator/DummyCalculatorClipboard.java | 22 ++ .../calculator/DummyCalculatorNotifier.java | 23 ++ .../solovyev/android/calculator/Editor.java | 22 +- .../android/calculator/FixableError.java | 22 ++ .../android/calculator/FunctionCategory.java | 24 ++ .../ListCalculatorEventContainer.java | 25 +- .../android/calculator/LiteNumberBuilder.java | 24 +- .../solovyev/android/calculator/Locator.java | 22 ++ .../android/calculator/MathEntityDao.java | 22 ++ .../MathEntityPersistenceContainer.java | 22 ++ .../calculator/MathPersistenceEntity.java | 22 +- .../android/calculator/MessageDialogData.java | 23 ++ .../android/calculator/NumberBuilder.java | 24 +- .../android/calculator/OperatorCategory.java | 24 ++ .../calculator/PreparedExpression.java | 23 +- .../android/calculator/StringDialogData.java | 23 ++ .../calculator/SystemOutCalculatorLogger.java | 22 ++ .../calculator/ToJsclTextProcessor.java | 24 +- .../android/calculator/VarCategory.java | 24 ++ .../CalculatorExternalListenersContainer.java | 22 ++ .../function/FunctionBuilderAdapter.java | 24 ++ .../history/AbstractHistoryState.java | 23 +- .../CalculatorDisplayHistoryState.java | 23 +- .../calculator/history/CalculatorHistory.java | 23 ++ .../history/CalculatorHistoryImpl.java | 23 ++ .../history/CalculatorHistoryState.java | 22 +- .../history/EditorHistoryState.java | 22 +- .../android/calculator/history/History.java | 22 +- .../calculator/history/HistoryUtils.java | 23 +- .../jscl/FromJsclNumericTextProcessor.java | 24 +- .../calculator/jscl/JsclOperation.java | 23 +- .../android/calculator/math/MathType.java | 23 +- .../android/calculator/model/AFunction.java | 24 +- .../android/calculator/model/Functions.java | 22 ++ .../calculator/model/MathEntityBuilder.java | 23 +- .../android/calculator/model/Var.java | 24 +- .../android/calculator/model/Vars.java | 22 ++ .../calculator/plot/CalculatorPlotter.java | 23 ++ .../plot/CalculatorPlotterImpl.java | 25 ++ .../calculator/plot/FunctionEvaluator.java | 22 ++ .../plot/MapPlotResourceManager.java | 24 ++ .../calculator/plot/PlotBoundaries.java | 22 ++ .../android/calculator/plot/PlotData.java | 22 ++ .../android/calculator/plot/PlotFunction.java | 22 ++ .../calculator/plot/PlotLineColor.java | 22 ++ .../calculator/plot/PlotLineColorType.java | 22 ++ .../android/calculator/plot/PlotLineDef.java | 22 ++ .../calculator/plot/PlotLineStyle.java | 22 ++ .../calculator/plot/PlotResourceManager.java | 22 ++ .../android/calculator/plot/PlotUtils.java | 23 +- .../android/calculator/plot/XyFunction.java | 24 ++ .../calculator/text/DummyTextProcessor.java | 24 +- .../text/FromJsclSimplifyTextProcessor.java | 24 ++ .../calculator/text/TextProcessor.java | 23 ++ .../units/CalculatorNumeralBase.java | 24 ++ .../calculator/AbstractCalculatorTest.java | 22 ++ .../CalculatorDisplayViewStateImplTest.java | 23 ++ .../calculator/CalculatorEditorImplTest.java | 24 ++ .../CalculatorEditorViewStateImplTest.java | 23 ++ .../calculator/CalculatorImplTest.java | 22 ++ .../calculator/CalculatorTestUtils.java | 24 ++ .../FromJsclSimplifyTextProcessorTest.java | 22 ++ .../history/CalculatorHistoryImplTest.java | 24 ++ .../FromJsclNumericTextProcessorTest.java | 23 +- .../android/calculator/math/MathTypeTest.java | 23 +- .../model/AndroidCalculatorEngineTest.java | 22 +- .../calculator/model/FunctionsTest.java | 25 ++ .../calculator/model/NumeralBaseTest.java | 24 ++ .../model/ToJsclTextProcessorTest.java | 23 +- pom.xml | 25 +- 579 files changed, 14908 insertions(+), 3680 deletions(-) diff --git a/android-app-core/AndroidManifest.xml b/android-app-core/AndroidManifest.xml index a86dbd76..a755358f 100644 --- a/android-app-core/AndroidManifest.xml +++ b/android-app-core/AndroidManifest.xml @@ -1,11 +1,11 @@ + package="org.solovyev.android.calculator.core" + android:versionCode="1" + android:versionName="1.0"> + android:minSdkVersion="4" + android:targetSdkVersion="17"/> \ No newline at end of file diff --git a/android-app-core/pom.xml b/android-app-core/pom.xml index e1f82e7e..0b843f0a 100644 --- a/android-app-core/pom.xml +++ b/android-app-core/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/android-app-core/res/drawable/blue_button.xml b/android-app-core/res/drawable/blue_button.xml index 3f190da7..2908509f 100644 --- a/android-app-core/res/drawable/blue_button.xml +++ b/android-app-core/res/drawable/blue_button.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/blue_button_dark.xml b/android-app-core/res/drawable/blue_button_dark.xml index 38247e80..9301f26d 100644 --- a/android-app-core/res/drawable/blue_button_dark.xml +++ b/android-app-core/res/drawable/blue_button_dark.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/blue_button_dark_shape.xml b/android-app-core/res/drawable/blue_button_dark_shape.xml index 153639d6..77ffecfd 100644 --- a/android-app-core/res/drawable/blue_button_dark_shape.xml +++ b/android-app-core/res/drawable/blue_button_dark_shape.xml @@ -1,15 +1,31 @@ - + a:startColor="#000d1f" + a:endColor="#002255" + a:angle="90"/> + diff --git a/android-app-core/res/drawable/blue_button_shape.xml b/android-app-core/res/drawable/blue_button_shape.xml index fd8acd78..2f27a937 100644 --- a/android-app-core/res/drawable/blue_button_shape.xml +++ b/android-app-core/res/drawable/blue_button_shape.xml @@ -1,9 +1,31 @@ + + - + a:startColor="#001c45" + a:endColor="#003481" + a:angle="90"/> + diff --git a/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml b/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml index c029d95c..c4410967 100644 --- a/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml @@ -1,20 +1,28 @@ - + - - - + + + diff --git a/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml b/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml index eb72d05b..0998eb96 100644 --- a/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml @@ -1,25 +1,36 @@ - + - - - - - - + + + + + + diff --git a/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml b/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml index c9f87b73..44f03a67 100644 --- a/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml @@ -1,19 +1,26 @@ - + - - + + diff --git a/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml b/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml index 619ff9d3..dd385175 100644 --- a/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml @@ -1,26 +1,37 @@ - + - + - - - - - + + + + + diff --git a/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml b/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml index 4cda1e26..6c43f18a 100644 --- a/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml @@ -1,21 +1,29 @@ - + - - - - + + + + diff --git a/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml b/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml index e538a5f4..f9a720b6 100644 --- a/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml +++ b/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml @@ -1,33 +1,48 @@ - + - - + + - - + + - - + + - - + + diff --git a/android-app-core/res/drawable/gray_button.xml b/android-app-core/res/drawable/gray_button.xml index 967fbfc0..9ceef380 100644 --- a/android-app-core/res/drawable/gray_button.xml +++ b/android-app-core/res/drawable/gray_button.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/gray_button_dark.xml b/android-app-core/res/drawable/gray_button_dark.xml index 4c45b348..35f16cb9 100644 --- a/android-app-core/res/drawable/gray_button_dark.xml +++ b/android-app-core/res/drawable/gray_button_dark.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/gray_button_dark_shape.xml b/android-app-core/res/drawable/gray_button_dark_shape.xml index 6545aa5a..09c8dab8 100644 --- a/android-app-core/res/drawable/gray_button_dark_shape.xml +++ b/android-app-core/res/drawable/gray_button_dark_shape.xml @@ -1,9 +1,31 @@ + + - + a:startColor="#000000" + a:endColor="#333333" + a:angle="90"/> + diff --git a/android-app-core/res/drawable/gray_button_shape.xml b/android-app-core/res/drawable/gray_button_shape.xml index 1710094b..0ebdbe72 100644 --- a/android-app-core/res/drawable/gray_button_shape.xml +++ b/android-app-core/res/drawable/gray_button_shape.xml @@ -1,9 +1,31 @@ + + - + a:startColor="#071622" + a:endColor="#253541" + a:angle="90"/> + diff --git a/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml b/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml index 75077a99..71ae4541 100644 --- a/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml +++ b/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml @@ -1,33 +1,48 @@ - + - - + + - - + + - - + + - - + + diff --git a/android-app-core/res/drawable/metro_blue_button.xml b/android-app-core/res/drawable/metro_blue_button.xml index a638c635..0101d679 100644 --- a/android-app-core/res/drawable/metro_blue_button.xml +++ b/android-app-core/res/drawable/metro_blue_button.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_blue_button_shape.xml b/android-app-core/res/drawable/metro_blue_button_shape.xml index e6fc3fc1..d888ae92 100644 --- a/android-app-core/res/drawable/metro_blue_button_shape.xml +++ b/android-app-core/res/drawable/metro_blue_button_shape.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_blue_list_item.xml b/android-app-core/res/drawable/metro_blue_list_item.xml index 21559be3..cbc7a037 100644 --- a/android-app-core/res/drawable/metro_blue_list_item.xml +++ b/android-app-core/res/drawable/metro_blue_list_item.xml @@ -1,21 +1,51 @@ + + - - + + - - + + - - + + - - + + diff --git a/android-app-core/res/drawable/metro_button_dark.xml b/android-app-core/res/drawable/metro_button_dark.xml index 01eecc9c..cbaae7b8 100644 --- a/android-app-core/res/drawable/metro_button_dark.xml +++ b/android-app-core/res/drawable/metro_button_dark.xml @@ -1,8 +1,30 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_dark_shape.xml b/android-app-core/res/drawable/metro_button_dark_shape.xml index 3f06ca5b..2165b29a 100644 --- a/android-app-core/res/drawable/metro_button_dark_shape.xml +++ b/android-app-core/res/drawable/metro_button_dark_shape.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_green.xml b/android-app-core/res/drawable/metro_button_green.xml index 4fa1e269..78abe5d1 100644 --- a/android-app-core/res/drawable/metro_button_green.xml +++ b/android-app-core/res/drawable/metro_button_green.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_green_shape.xml b/android-app-core/res/drawable/metro_button_green_shape.xml index 01833fac..2887709b 100644 --- a/android-app-core/res/drawable/metro_button_green_shape.xml +++ b/android-app-core/res/drawable/metro_button_green_shape.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_light.xml b/android-app-core/res/drawable/metro_button_light.xml index 1498b5aa..a4c0a22c 100644 --- a/android-app-core/res/drawable/metro_button_light.xml +++ b/android-app-core/res/drawable/metro_button_light.xml @@ -1,8 +1,30 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_light_shape.xml b/android-app-core/res/drawable/metro_button_light_shape.xml index 32bbaf5c..78e13a77 100644 --- a/android-app-core/res/drawable/metro_button_light_shape.xml +++ b/android-app-core/res/drawable/metro_button_light_shape.xml @@ -1,19 +1,26 @@ - + - - + + diff --git a/android-app-core/res/drawable/metro_button_pressed.xml b/android-app-core/res/drawable/metro_button_pressed.xml index 386a4bad..72931a8f 100644 --- a/android-app-core/res/drawable/metro_button_pressed.xml +++ b/android-app-core/res/drawable/metro_button_pressed.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_purple.xml b/android-app-core/res/drawable/metro_button_purple.xml index d5c51b1e..dbae4798 100644 --- a/android-app-core/res/drawable/metro_button_purple.xml +++ b/android-app-core/res/drawable/metro_button_purple.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_purple_shape.xml b/android-app-core/res/drawable/metro_button_purple_shape.xml index e50eab0f..a994ce3b 100644 --- a/android-app-core/res/drawable/metro_button_purple_shape.xml +++ b/android-app-core/res/drawable/metro_button_purple_shape.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_green_list_item.xml b/android-app-core/res/drawable/metro_green_list_item.xml index e7292aa6..0ba94d5a 100644 --- a/android-app-core/res/drawable/metro_green_list_item.xml +++ b/android-app-core/res/drawable/metro_green_list_item.xml @@ -1,22 +1,52 @@ + + - - + + - - + + - - + + - - + + diff --git a/android-app-core/res/drawable/metro_purple_list_item.xml b/android-app-core/res/drawable/metro_purple_list_item.xml index 34bbe728..0c54af47 100644 --- a/android-app-core/res/drawable/metro_purple_list_item.xml +++ b/android-app-core/res/drawable/metro_purple_list_item.xml @@ -1,21 +1,51 @@ + + - - + + - - + + - - + + - - + + diff --git a/android-app-core/res/drawable/pane_background.xml b/android-app-core/res/drawable/pane_background.xml index 4058c468..23efe1bb 100644 --- a/android-app-core/res/drawable/pane_background.xml +++ b/android-app-core/res/drawable/pane_background.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/violet_button.xml b/android-app-core/res/drawable/violet_button.xml index 2f72752a..2113beb7 100644 --- a/android-app-core/res/drawable/violet_button.xml +++ b/android-app-core/res/drawable/violet_button.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/violet_button_dark.xml b/android-app-core/res/drawable/violet_button_dark.xml index 2d1232c8..2d979c5e 100644 --- a/android-app-core/res/drawable/violet_button_dark.xml +++ b/android-app-core/res/drawable/violet_button_dark.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/violet_button_dark_shape.xml b/android-app-core/res/drawable/violet_button_dark_shape.xml index 7409fe9c..5caaca03 100644 --- a/android-app-core/res/drawable/violet_button_dark_shape.xml +++ b/android-app-core/res/drawable/violet_button_dark_shape.xml @@ -1,15 +1,31 @@ - + a:startColor="#2b0325" + a:endColor="#4f1c47" + a:angle="90"/> + diff --git a/android-app-core/res/drawable/violet_button_shape.xml b/android-app-core/res/drawable/violet_button_shape.xml index 4ef0e931..771c2f9b 100644 --- a/android-app-core/res/drawable/violet_button_shape.xml +++ b/android-app-core/res/drawable/violet_button_shape.xml @@ -1,15 +1,31 @@ - + a:startColor="#520546" + a:endColor="#8a307c" + a:angle="90"/> + diff --git a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml b/android-app-core/res/layout/cpp_fixable_messages_dialog.xml index 333c2c04..77f3f036 100644 --- a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml +++ b/android-app-core/res/layout/cpp_fixable_messages_dialog.xml @@ -1,31 +1,53 @@ + + + style="?cpp_dialog_style"> + a:id="@+id/cpp_fixable_messages_container" + a:layout_width="match_parent" + a:layout_height="wrap_content" + a:orientation="vertical"/> + a:id="@+id/cpp_do_not_show_fixable_messages_checkbox" + a:text="@string/do_not_show_messages_in_session" + a:layout_width="match_parent" + a:layout_height="wrap_content"/> + a:layout_width="match_parent" + a:layout_height="wrap_content" + a:orientation="horizontal" + a:gravity="center">