diff --git a/calculatorpp/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png b/calculatorpp/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png new file mode 100644 index 00000000..0eff695d Binary files /dev/null and b/calculatorpp/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png differ diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png b/calculatorpp/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png new file mode 100644 index 00000000..9a6c8379 Binary files /dev/null and b/calculatorpp/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png differ diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png b/calculatorpp/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png new file mode 100644 index 00000000..0eab9c67 Binary files /dev/null and b/calculatorpp/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png differ diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png b/calculatorpp/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png new file mode 100644 index 00000000..f1581113 Binary files /dev/null and b/calculatorpp/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png differ diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png b/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png new file mode 100644 index 00000000..959e4b5d Binary files /dev/null and b/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png differ diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png b/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png new file mode 100644 index 00000000..35c08d20 Binary files /dev/null and b/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png differ diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png b/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png new file mode 100644 index 00000000..fad567a3 Binary files /dev/null and b/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png differ diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png b/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png new file mode 100644 index 00000000..62133e99 Binary files /dev/null and b/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png differ diff --git a/calculatorpp/res/drawable/default_abs__tab_indicator_ab_holo.xml b/calculatorpp/res/drawable/default_abs__tab_indicator_ab_holo.xml new file mode 100644 index 00000000..ea87857e --- /dev/null +++ b/calculatorpp/res/drawable/default_abs__tab_indicator_ab_holo.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/calculatorpp/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml b/calculatorpp/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml new file mode 100644 index 00000000..1f468ac7 --- /dev/null +++ b/calculatorpp/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/calculatorpp/res/drawable/metro_button_blue.xml b/calculatorpp/res/drawable/metro_blue_button.xml similarity index 77% rename from calculatorpp/res/drawable/metro_button_blue.xml rename to calculatorpp/res/drawable/metro_blue_button.xml index 5a23942f..24368529 100644 --- a/calculatorpp/res/drawable/metro_button_blue.xml +++ b/calculatorpp/res/drawable/metro_blue_button.xml @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/calculatorpp/res/drawable/metro_button_blue_shape.xml b/calculatorpp/res/drawable/metro_blue_button_shape.xml similarity index 100% rename from calculatorpp/res/drawable/metro_button_blue_shape.xml rename to calculatorpp/res/drawable/metro_blue_button_shape.xml diff --git a/calculatorpp/res/drawable/metro_blue_list_item.xml b/calculatorpp/res/drawable/metro_blue_list_item.xml new file mode 100644 index 00000000..98ac6a1d --- /dev/null +++ b/calculatorpp/res/drawable/metro_blue_list_item.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/calculatorpp/res/layout/help_faq.xml b/calculatorpp/res/layout/help_faq.xml deleted file mode 100644 index ae5d5f32..00000000 --- a/calculatorpp/res/layout/help_faq.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/calculatorpp/res/layout/help_faq_fragment.xml b/calculatorpp/res/layout/help_faq_fragment.xml new file mode 100644 index 00000000..859bdae3 --- /dev/null +++ b/calculatorpp/res/layout/help_faq_fragment.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + diff --git a/calculatorpp/res/layout/help_hints.xml b/calculatorpp/res/layout/help_hints.xml deleted file mode 100644 index 0a0b60e9..00000000 --- a/calculatorpp/res/layout/help_hints.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/calculatorpp/res/layout/help_hints_fragment.xml b/calculatorpp/res/layout/help_hints_fragment.xml new file mode 100644 index 00000000..18947e1f --- /dev/null +++ b/calculatorpp/res/layout/help_hints_fragment.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/layout/help_screens.xml b/calculatorpp/res/layout/help_screens.xml deleted file mode 100644 index ee4dab4a..00000000 --- a/calculatorpp/res/layout/help_screens.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/calculatorpp/res/layout/help_screens_fragment.xml b/calculatorpp/res/layout/help_screens_fragment.xml new file mode 100644 index 00000000..80a37755 --- /dev/null +++ b/calculatorpp/res/layout/help_screens_fragment.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/layout/history_item.xml b/calculatorpp/res/layout/history_item.xml index 7d7a1c27..d8919ddd 100644 --- a/calculatorpp/res/layout/history_item.xml +++ b/calculatorpp/res/layout/history_item.xml @@ -1,40 +1,41 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/layout/math_entity.xml b/calculatorpp/res/layout/math_entity.xml index 1007e1a4..b5189a82 100644 --- a/calculatorpp/res/layout/math_entity.xml +++ b/calculatorpp/res/layout/math_entity.xml @@ -1,27 +1,28 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/layout/saved_history_item.xml b/calculatorpp/res/layout/saved_history_item.xml index 138c8fe8..b6fbc7ea 100644 --- a/calculatorpp/res/layout/saved_history_item.xml +++ b/calculatorpp/res/layout/saved_history_item.xml @@ -1,41 +1,42 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/values-large-land/dimens.xml b/calculatorpp/res/values-large-land/dimens.xml deleted file mode 100644 index 0e042942..00000000 --- a/calculatorpp/res/values-large-land/dimens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - 15sp - 15sp - 20dp - \ No newline at end of file diff --git a/calculatorpp/res/values-large/dimens.xml b/calculatorpp/res/values-large/dimens.xml index df7ddf80..642d5abd 100644 --- a/calculatorpp/res/values-large/dimens.xml +++ b/calculatorpp/res/values-large/dimens.xml @@ -1,7 +1,8 @@ - - 15sp - 15sp - 20dp - 15sp - 10sp + + 10sp + 15sp + 15sp + 20dp + 15sp + 10sp \ No newline at end of file diff --git a/calculatorpp/res/values/attributes.xml b/calculatorpp/res/values/attributes.xml index eef6df9c..5de88918 100644 --- a/calculatorpp/res/values/attributes.xml +++ b/calculatorpp/res/values/attributes.xml @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/calculatorpp/res/values/dimens.xml b/calculatorpp/res/values/dimens.xml index 8c693f34..6e5dddaf 100644 --- a/calculatorpp/res/values/dimens.xml +++ b/calculatorpp/res/values/dimens.xml @@ -1,16 +1,17 @@ - - 0.5dp - 20sp - 30dp - 20dp - 25sp - 25sp - 5dp - 5dp - 20sp - 15sp - - - 5dp - 3dp + + 0.5dp + 20sp + 15sp + 30dp + 20dp + 25sp + 25sp + 5dp + 5dp + 20sp + 15sp + + + 5dp + 3dp \ No newline at end of file diff --git a/calculatorpp/res/values/styles.xml b/calculatorpp/res/values/styles.xml index daab2113..b1fe83ad 100644 --- a/calculatorpp/res/values/styles.xml +++ b/calculatorpp/res/values/styles.xml @@ -28,7 +28,7 @@ wrap_content wrap_content true - @drawable/metro_button_blue + @drawable/metro_blue_button @dimen/button_text_size @color/button_text_color @@ -62,7 +62,7 @@ center fill_parent fill_parent - 15dp + @dimen/fragment_text_size 5dp diff --git a/calculatorpp/res/values/text_strings.xml b/calculatorpp/res/values/text_strings.xml index 9564162d..bbb76f18 100644 --- a/calculatorpp/res/values/text_strings.xml +++ b/calculatorpp/res/values/text_strings.xml @@ -212,7 +212,7 @@ Other Derivatives/Integrals Calculator++ has been crashed… - Calculator++ crash report confirmation + Calculator++ crash report Unfortunately, Calculator++ has been crashed.\n\n In order to fix the problem we need some information about it. It\'s highly recommended to send crash report via email (after pressing \'Ok\' button you will see all sent data in the new window).\n\n diff --git a/calculatorpp/res/values/theme_default.xml b/calculatorpp/res/values/theme_default.xml index 1e46c128..d2b54117 100644 --- a/calculatorpp/res/values/theme_default.xml +++ b/calculatorpp/res/values/theme_default.xml @@ -20,6 +20,9 @@ 6dp + + - - \ No newline at end of file diff --git a/calculatorpp/res/values/theme_metro_blue.xml b/calculatorpp/res/values/theme_metro_blue.xml index e02a8ae1..024decf0 100644 --- a/calculatorpp/res/values/theme_metro_blue.xml +++ b/calculatorpp/res/values/theme_metro_blue.xml @@ -9,18 +9,36 @@ + + + + + + + + @style/metro_blue_fragment_list_view_item_style + + + @style/metro_blue_actionbar_tab_style + @style/metro_blue_actionbar_style + \ No newline at end of file diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java index 3643eb96..947ed850 100644 --- a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java +++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java @@ -1,78 +1,78 @@ -package org.solovyev.android.calculator.about; - -import android.support.v4.app.Fragment; -import org.jetbrains.annotations.NotNull; -import org.solovyev.android.calculator.CalculatorEditorFragment; -import org.solovyev.android.calculator.R; -import org.solovyev.android.calculator.help.CalculatorHelpFaqFragment; -import org.solovyev.android.calculator.help.CalculatorHelpHintsFragment; -import org.solovyev.android.calculator.help.CalculatorHelpScreensFragment; -import org.solovyev.android.calculator.history.CalculatorHistoryFragment; -import org.solovyev.android.calculator.history.CalculatorSavedHistoryFragment; -import org.solovyev.android.calculator.math.edit.CalculatorFunctionsFragment; -import org.solovyev.android.calculator.math.edit.CalculatorOperatorsFragment; -import org.solovyev.android.calculator.math.edit.CalculatorVarsFragment; -import org.solovyev.android.calculator.plot.CalculatorPlotFragment; - -/** - * User: Solovyev_S - * Date: 03.10.12 - * Time: 11:30 - */ -public enum CalculatorFragmentType { - - editor(CalculatorEditorFragment.class, R.layout.calc_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), - saved_history(CalculatorSavedHistoryFragment.class, R.layout.history_fragment, R.string.c_saved_history), - variables(CalculatorVarsFragment.class, R.layout.vars_fragment, R.string.c_vars), - functions(CalculatorFunctionsFragment.class, R.layout.math_entities_fragment, R.string.c_functions), - operators(CalculatorOperatorsFragment.class, R.layout.math_entities_fragment, R.string.c_operators), - plotter(CalculatorPlotFragment.class, R.layout.plot_fragment, R.string.c_plot), - about(CalculatorAboutFragment.class, R.layout.about_fragment, R.string.c_about), - - // todo serso: rename and inflate ad - faq(CalculatorHelpFaqFragment.class, R.layout.help_faq, R.string.c_faq), - hints(CalculatorHelpHintsFragment.class, R.layout.help_hints, R.string.c_hints), - screens(CalculatorHelpScreensFragment.class, R.layout.help_screens, R.string.c_screens), - release_notes(CalculatorReleaseNotesFragment.class, R.layout.release_notes_fragment, R.string.c_release_notes); - - @NotNull - private Class fragmentClass; - - private final int defaultLayoutId; - - private int defaultTitleResId; - - private CalculatorFragmentType(@NotNull Class fragmentClass, - int defaultLayoutId, - int defaultTitleResId) { - this.fragmentClass = fragmentClass; - this.defaultLayoutId = defaultLayoutId; - this.defaultTitleResId = defaultTitleResId; - } - - @NotNull - public String getFragmentTag() { - return this.name(); - } - - public int getDefaultTitleResId() { - return defaultTitleResId; - } - - @NotNull - public Class getFragmentClass() { - return fragmentClass; - } - - public int getDefaultLayoutId() { - return defaultLayoutId; - } - - @NotNull - public String createSubFragmentTag(@NotNull String subFragmentTag) { - return this.getFragmentTag() + "_" + subFragmentTag; - } -} +package org.solovyev.android.calculator.about; + +import android.support.v4.app.Fragment; +import org.jetbrains.annotations.NotNull; +import org.solovyev.android.calculator.CalculatorEditorFragment; +import org.solovyev.android.calculator.R; +import org.solovyev.android.calculator.help.CalculatorHelpFaqFragment; +import org.solovyev.android.calculator.help.CalculatorHelpHintsFragment; +import org.solovyev.android.calculator.help.CalculatorHelpScreensFragment; +import org.solovyev.android.calculator.history.CalculatorHistoryFragment; +import org.solovyev.android.calculator.history.CalculatorSavedHistoryFragment; +import org.solovyev.android.calculator.math.edit.CalculatorFunctionsFragment; +import org.solovyev.android.calculator.math.edit.CalculatorOperatorsFragment; +import org.solovyev.android.calculator.math.edit.CalculatorVarsFragment; +import org.solovyev.android.calculator.plot.CalculatorPlotFragment; + +/** + * User: Solovyev_S + * Date: 03.10.12 + * Time: 11:30 + */ +public enum CalculatorFragmentType { + + editor(CalculatorEditorFragment.class, R.layout.calc_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), + saved_history(CalculatorSavedHistoryFragment.class, R.layout.history_fragment, R.string.c_saved_history), + variables(CalculatorVarsFragment.class, R.layout.vars_fragment, R.string.c_vars), + functions(CalculatorFunctionsFragment.class, R.layout.math_entities_fragment, R.string.c_functions), + operators(CalculatorOperatorsFragment.class, R.layout.math_entities_fragment, R.string.c_operators), + plotter(CalculatorPlotFragment.class, R.layout.plot_fragment, R.string.c_plot), + about(CalculatorAboutFragment.class, R.layout.about_fragment, R.string.c_about), + + // todo serso: rename and inflate ad + faq(CalculatorHelpFaqFragment.class, R.layout.help_faq_fragment, R.string.c_faq), + hints(CalculatorHelpHintsFragment.class, R.layout.help_hints_fragment, R.string.c_hints), + screens(CalculatorHelpScreensFragment.class, R.layout.help_screens_fragment, R.string.c_screens), + release_notes(CalculatorReleaseNotesFragment.class, R.layout.release_notes_fragment, R.string.c_release_notes); + + @NotNull + private Class fragmentClass; + + private final int defaultLayoutId; + + private int defaultTitleResId; + + private CalculatorFragmentType(@NotNull Class fragmentClass, + int defaultLayoutId, + int defaultTitleResId) { + this.fragmentClass = fragmentClass; + this.defaultLayoutId = defaultLayoutId; + this.defaultTitleResId = defaultTitleResId; + } + + @NotNull + public String getFragmentTag() { + return this.name(); + } + + public int getDefaultTitleResId() { + return defaultTitleResId; + } + + @NotNull + public Class getFragmentClass() { + return fragmentClass; + } + + public int getDefaultLayoutId() { + return defaultLayoutId; + } + + @NotNull + public String createSubFragmentTag(@NotNull String subFragmentTag) { + return this.getFragmentTag() + "_" + subFragmentTag; + } +}