diff --git a/calculatorpp-core/pom.xml b/calculatorpp-core/pom.xml index bb3e2cbf..815fc82e 100644 --- a/calculatorpp-core/pom.xml +++ b/calculatorpp-core/pom.xml @@ -5,12 +5,12 @@ org.solovyev.android calculatorpp-parent - 1.5.1-SNAPSHOT + 1.5.1-b2-SNAPSHOT org.solovyev.android calculatorpp-core - 1.5.1-SNAPSHOT + 1.5.1-b2-SNAPSHOT Calculator++ Application Core jar diff --git a/calculatorpp-test/pom.xml b/calculatorpp-test/pom.xml index 3f309f94..7a462f96 100644 --- a/calculatorpp-test/pom.xml +++ b/calculatorpp-test/pom.xml @@ -4,7 +4,7 @@ org.solovyev.android calculatorpp-parent - 1.5.1-SNAPSHOT + 1.5.1-b2-SNAPSHOT 4.0.0 diff --git a/calculatorpp/AndroidManifest.xml b/calculatorpp/AndroidManifest.xml index fb22ca67..750a2b1d 100644 --- a/calculatorpp/AndroidManifest.xml +++ b/calculatorpp/AndroidManifest.xml @@ -50,7 +50,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -86,6 +86,18 @@ + + + + + + + + + + + + diff --git a/calculatorpp/pom.xml b/calculatorpp/pom.xml index 774e1d29..6481fda0 100644 --- a/calculatorpp/pom.xml +++ b/calculatorpp/pom.xml @@ -4,7 +4,7 @@ org.solovyev.android calculatorpp-parent - 1.5.1-SNAPSHOT + 1.5.1-b2-SNAPSHOT 4.0.0 @@ -21,7 +21,7 @@ org.solovyev.android calculatorpp-core - 1.5.1-SNAPSHOT + 1.5.1-b2-SNAPSHOT diff --git a/calculatorpp/project.properties b/calculatorpp/project.properties index c0cbfcbe..a00e8017 100644 --- a/calculatorpp/project.properties +++ b/calculatorpp/project.properties @@ -9,19 +9,19 @@ # Project target. target=android-15 -android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.5 -android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.5 -android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.5 -android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.5 -android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.5 -android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.5 -android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.5 -android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.5 -android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.5 -android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.5 -android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.5 -android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.5 +android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6 +android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6 +android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6 +android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6 +android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6 +android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6 +android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6 +android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6 +android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6 +android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6 +android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6 +android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6 android.library.reference.13=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0 -android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.5 +android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6 diff --git a/calculatorpp/res/drawable/blue_button.xml b/calculatorpp/res/drawable/blue_button.xml index 4e0ef759..dc5f61c0 100644 --- a/calculatorpp/res/drawable/blue_button.xml +++ b/calculatorpp/res/drawable/blue_button.xml @@ -1,8 +1,10 @@ - - - - + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/drawable/blue_button_dark.xml b/calculatorpp/res/drawable/blue_button_dark.xml index a2bde68b..39fd8f86 100644 --- a/calculatorpp/res/drawable/blue_button_dark.xml +++ b/calculatorpp/res/drawable/blue_button_dark.xml @@ -1,14 +1,10 @@ - + - - - - + + + + + \ No newline at end of file diff --git a/calculatorpp/res/drawable/blue_button_dark_shape.xml b/calculatorpp/res/drawable/blue_button_dark_shape.xml new file mode 100644 index 00000000..a2bde68b --- /dev/null +++ b/calculatorpp/res/drawable/blue_button_dark_shape.xml @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/calculatorpp/res/drawable/blue_button_shape.xml b/calculatorpp/res/drawable/blue_button_shape.xml new file mode 100644 index 00000000..4e0ef759 --- /dev/null +++ b/calculatorpp/res/drawable/blue_button_shape.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/calculatorpp/res/drawable/violet_button.xml b/calculatorpp/res/drawable/violet_button.xml index b5133366..f1f10580 100644 --- a/calculatorpp/res/drawable/violet_button.xml +++ b/calculatorpp/res/drawable/violet_button.xml @@ -1,14 +1,10 @@ - + - - - - + + + + + \ No newline at end of file diff --git a/calculatorpp/res/drawable/violet_button_dark.xml b/calculatorpp/res/drawable/violet_button_dark.xml index b8553175..b1b755df 100644 --- a/calculatorpp/res/drawable/violet_button_dark.xml +++ b/calculatorpp/res/drawable/violet_button_dark.xml @@ -1,14 +1,10 @@ - + - - - - + + + + + \ No newline at end of file diff --git a/calculatorpp/res/drawable/violet_button_dark_shape.xml b/calculatorpp/res/drawable/violet_button_dark_shape.xml new file mode 100644 index 00000000..b8553175 --- /dev/null +++ b/calculatorpp/res/drawable/violet_button_dark_shape.xml @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/calculatorpp/res/drawable/violet_button_shape.xml b/calculatorpp/res/drawable/violet_button_shape.xml new file mode 100644 index 00000000..b5133366 --- /dev/null +++ b/calculatorpp/res/drawable/violet_button_shape.xml @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/calculatorpp/res/values-ru/text_about.xml b/calculatorpp/res/values-ru/text_about.xml index 1396202b..675914b2 100644 --- a/calculatorpp/res/values-ru/text_about.xml +++ b/calculatorpp/res/values-ru/text_about.xml @@ -232,7 +232,7 @@ 1. Поддержка пользовательских функций (кнопка +f или кнопка + на экране функций)\n - 2. Добавлены различные размеры виджета: 3x3, 3x4, 4x4\n + 2. Добавлены различные размеры виджета: 3x3, 3x4, 4x4, 4x5\n 3. Добавлено несколько функций: re(x), im(x), √3(x), √4(x), √n(x, n)\n 4. Система счисления/единицы измерения углов по умолчанию + окно с ошибками расчётов\n 5. Ускорена работа приложения\n diff --git a/calculatorpp/res/values-ru/text_strings.xml b/calculatorpp/res/values-ru/text_strings.xml index f195c3b5..72a38b90 100644 --- a/calculatorpp/res/values-ru/text_strings.xml +++ b/calculatorpp/res/values-ru/text_strings.xml @@ -265,5 +265,9 @@ Единицы измерения углов по умолчанию \'%1$s\' отличаются от текущих \'%2$s\'. Забыли их вернуть? Закрыть + Калькулятор++ Виджет (3x3) + Калькулятор++ Виджет (3x4) + Калькулятор++ Виджет (4x4) + Калькулятор++ Виджет (4x5) \ No newline at end of file diff --git a/calculatorpp/res/values/text_about.xml b/calculatorpp/res/values/text_about.xml index d06c00d9..648949c0 100644 --- a/calculatorpp/res/values/text_about.xml +++ b/calculatorpp/res/values/text_about.xml @@ -231,7 +231,7 @@ 1. Support for user-defined functions (see +f button or + button inside functions screen)\n - 2. Widget in different sizes: 3x3, 3x4, 4x4\n + 2. Widget in different sizes: 3x3, 3x4, 4x4, 4x5\n 3. Several functions added: re(x), im(x), √3(x), √4(x), √n(x, n)\n 4. Default number systems/angle units + special warning dialog in case of calculations errors\n 5. Performance improvements\n diff --git a/calculatorpp/res/values/text_strings.xml b/calculatorpp/res/values/text_strings.xml index 48a24f0e..032d36af 100644 --- a/calculatorpp/res/values/text_strings.xml +++ b/calculatorpp/res/values/text_strings.xml @@ -265,5 +265,9 @@ Defines the default angle units Default angle units \'%1$s\' differs from current \'%2$s\'. Forgot to change back? Close + Calculator++ Widget (3x3) + Calculator++ Widget (3x4) + Calculator++ Widget (4x4) + Calculator++ Widget (4x5) \ No newline at end of file diff --git a/calculatorpp/res/xml/calculator_widget_info_4x5.xml b/calculatorpp/res/xml/calculator_widget_info_4x5.xml new file mode 100644 index 00000000..cdd5e7ad --- /dev/null +++ b/calculatorpp/res/xml/calculator_widget_info_4x5.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java new file mode 100644 index 00000000..300efb9c --- /dev/null +++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java @@ -0,0 +1,9 @@ +package org.solovyev.android.calculator.widget; + +/** + * User: serso + * Date: 11/18/12 + * Time: 7:43 PM + */ +public class CalculatorWidgetProvider4x5 extends AbstractCalculatorWidgetProvider { +} diff --git a/pom.xml b/pom.xml index 33be05a7..43df7149 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.solovyev.android calculatorpp-parent pom - 1.5.1-SNAPSHOT + 1.5.1-b2-SNAPSHOT Calculator++ @@ -30,7 +30,7 @@ UTF-8 - 1.0.5 + 1.0.6 1.0.3