From 8d0c631bfc63aff9a89d257b5106db02608611e1 Mon Sep 17 00:00:00 2001 From: serso Date: Fri, 13 Dec 2013 23:09:54 +0400 Subject: [PATCH] wizard moved to ACL --- .../res/values-de/text_wizard.xml | 2 +- .../res/values-es/text_wizard.xml | 2 +- .../res/values-fr/text_wizard.xml | 2 +- .../res/values-it/text_wizard.xml | 2 +- .../res/values-nl/text_wizard.xml | 2 +- .../res/values-pl/text_wizard.xml | 2 +- .../res/values-pt-rbr/text_wizard.xml | 2 +- .../res/values-ru/text_wizard.xml | 2 +- .../res/values-uk/text_wizard.xml | 2 +- .../res/values-zh-rtw/text_wizard.xml | 2 +- android-app-core/res/values/ids.xml | 4 + android-app-core/res/values/text_strings.xml | 2 + android-app-core/res/values/text_wizard.xml | 2 +- .../org/solovyev/android/AndroidUtils2.java | 36 --- android-app/project.properties | 37 +-- android-app/res/layout/cpp_wizard.xml | 6 +- .../calculator/CalculatorActivity.java | 27 +- .../calculator/CalculatorApplication.java | 41 ++- .../CalculatorPreferencesActivity.java | 8 +- .../wizard/CalculatorWizardActivity.java | 282 +----------------- ...ardStep.java => CalculatorWizardStep.java} | 40 ++- .../calculator/wizard/CalculatorWizards.java | 75 +++++ .../FinishWizardConfirmationDialog.java | 59 ---- .../calculator/wizard/ListWizardFlow.java | 96 ------ .../android/calculator/wizard/WizardFlow.java | 49 --- .../android/calculator/wizard/Wizards.java | 142 --------- .../calculator/TestCalculatorApplication.java | 4 + .../wizard/CalculatorWizardActivityTest.java | 105 ++++--- .../wizard/CalculatorWizardTest.java | 101 +++++++ .../OnScreenCalculatorWizardStepTest.java | 21 +- .../calculator/wizard/WizardStepTest.java | 14 +- .../calculator/wizard/WizardsTest.java | 88 ------ pom.xml | 8 +- 33 files changed, 393 insertions(+), 874 deletions(-) delete mode 100644 android-app-core/src/main/java/org/solovyev/android/AndroidUtils2.java rename android-app/src/main/java/org/solovyev/android/calculator/wizard/{WizardStep.java => CalculatorWizardStep.java} (82%) create mode 100644 android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizards.java delete mode 100644 android-app/src/main/java/org/solovyev/android/calculator/wizard/FinishWizardConfirmationDialog.java delete mode 100644 android-app/src/main/java/org/solovyev/android/calculator/wizard/ListWizardFlow.java delete mode 100644 android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardFlow.java delete mode 100644 android-app/src/main/java/org/solovyev/android/calculator/wizard/Wizards.java create mode 100644 android-app/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardTest.java delete mode 100644 android-app/src/test/java/org/solovyev/android/calculator/wizard/WizardsTest.java diff --git a/android-app-core/res/values-de/text_wizard.xml b/android-app-core/res/values-de/text_wizard.xml index ca8d1ca3..d885b8aa 100644 --- a/android-app-core/res/values-de/text_wizard.xml +++ b/android-app-core/res/values-de/text_wizard.xml @@ -34,5 +34,5 @@ und der Quelltext kann auf GitHub gefunden werden. Der Rechner im separaten Fenster ermöglicht es Ihnen zu rechnen, während dem benutzen anderer Apps. Rechner im separaten Fenster aktivieren (zweites Symbol erscheint in der Liste der Anwendungen) \"Durchziehen\" Schaltfläche ist eine exklusive Funktion der Calculator++, die schnelle Zugriff auf die sekundären Funktionen bietet - Wollen Sie den Assistenten wirklich beenden? + Wollen Sie den Assistenten wirklich beenden? diff --git a/android-app-core/res/values-es/text_wizard.xml b/android-app-core/res/values-es/text_wizard.xml index ea981c84..da57873e 100644 --- a/android-app-core/res/values-es/text_wizard.xml +++ b/android-app-core/res/values-es/text_wizard.xml @@ -33,5 +33,5 @@ El resultado no se redondea, y los radianes son la unidad de ángulo predetermin La calculadora en ventana independiente te permite realizar cálculos mientras utilizas otras aplicaciones en tu dispositivo Activar la calculadora en ventana independiente (aparecerá un segundo icono en la lista de aplicaciones) El botón de arrastre es una característica exclusiva de Calculadora ++ que proporciona un acceso rápido a las funciones secundarias - ¿Realmente quiere finalizar el asistente? + ¿Realmente quiere finalizar el asistente? diff --git a/android-app-core/res/values-fr/text_wizard.xml b/android-app-core/res/values-fr/text_wizard.xml index af2a5286..442b1e5e 100644 --- a/android-app-core/res/values-fr/text_wizard.xml +++ b/android-app-core/res/values-fr/text_wizard.xml @@ -33,5 +33,5 @@ Le résultat n\'est pas arrondi et est affiché en notation scientifique, le rad Avoir la calculatrice ouverte dans une fenêtre séparée vous permet de calculer tout en utilisant les autres applications de votre appareil Activer la calculatrice dans une fenêtre séparée (une deuxième icône apparaîtra dans la liste des applications) Le glissement sur une touche est une fonctionnalité exclusive à Calculator++ ce qui permet un accès rapide aux fonctions secondaires - Quitter l\'assistant ? + Quitter l\'assistant ? diff --git a/android-app-core/res/values-it/text_wizard.xml b/android-app-core/res/values-it/text_wizard.xml index 2bfdc49f..a77aa1db 100644 --- a/android-app-core/res/values-it/text_wizard.xml +++ b/android-app-core/res/values-it/text_wizard.xml @@ -32,5 +32,5 @@ Il risultato non è arrotondato, ed è presentato in notazione scientifica, i ra La calcolatrice in una finestra separata consente di fare calcoli durante l\'utilizzo di altre applicazioni sul dispositivo Abilitare la calcolatrice in una finestra separata (una seconda icona comparirà nell\'elenco applicazioni) Il trascinamento pulsanti è una funzione esclusiva di Calculator++ che permette un accesso rapido alle funzioni secondarie - Vuoi veramente terminare la procedura guidata? + Vuoi veramente terminare la procedura guidata? diff --git a/android-app-core/res/values-nl/text_wizard.xml b/android-app-core/res/values-nl/text_wizard.xml index adb22dea..5453f277 100644 --- a/android-app-core/res/values-nl/text_wizard.xml +++ b/android-app-core/res/values-nl/text_wizard.xml @@ -32,5 +32,5 @@ Resultaat is niet afgerond en wordt gepresenteerd in de ingenieursnotatie, worde Calculator in afzonderlijk venster kunt u berekeningen uitvoeren tijdens het gebruik van andere apps op uw apparaat Calculator in afzonderlijk venster inschakelen (het tweede pictogram wordt weergegeven in de appslijst) De sleepknop is een exclusieve functie van Calculator ++ die snel toegang tot de secundaire functies biedt - Do you really want to finish wizard? + Do you really want to finish wizard? diff --git a/android-app-core/res/values-pl/text_wizard.xml b/android-app-core/res/values-pl/text_wizard.xml index 1a4433f4..851b2473 100644 --- a/android-app-core/res/values-pl/text_wizard.xml +++ b/android-app-core/res/values-pl/text_wizard.xml @@ -34,5 +34,5 @@ Wynik nie jest zaokrąglony i jest przedstawiony w postaci inżynierskiej, a dom Kalkulator w osobnym oknie pozwoli Ci wykonywać obliczenia w trakcie korzystania z innych aplikacji na Twoim urządzeniu Włącz kalkulator w osobnym oknie (pojawi się druga ikona na liście aplikacji) Przeciąganie po przycisku jest wyjątkowym rozwiązaniem w programie Calculator++, które zapewnia szybki dostęp do alternatywnych funkcji - Czy na pewno chcesz zakończyć konfigurację programu? + Czy na pewno chcesz zakończyć konfigurację programu? diff --git a/android-app-core/res/values-pt-rbr/text_wizard.xml b/android-app-core/res/values-pt-rbr/text_wizard.xml index 5e1df637..51ea29cc 100644 --- a/android-app-core/res/values-pt-rbr/text_wizard.xml +++ b/android-app-core/res/values-pt-rbr/text_wizard.xml @@ -31,5 +31,5 @@ A calculadora em janela separada permite que você faça cálculos enquanto estiver usando outros aplicativos no seu dispositivo Habilitar a calculadora em janela separada (um segundo ícone aparecerá na lista de aplicativos) Drag button é uma funcionalidade exclusiva de Calculator++ que fornece acesso rápido às funções secundárias - Parar a configuração da aplicação? + Parar a configuração da aplicação? diff --git a/android-app-core/res/values-ru/text_wizard.xml b/android-app-core/res/values-ru/text_wizard.xml index 3b04b7b3..ebdb064c 100644 --- a/android-app-core/res/values-ru/text_wizard.xml +++ b/android-app-core/res/values-ru/text_wizard.xml @@ -32,5 +32,5 @@ Включить калькулятор в отдельном окне (вторая иконка появится в списке приложений) Специально разработанные кнопки позволяют быстро и просто использовать дополнительные возможности калькулятора - Вы действительно хотите завершить визард? + Вы действительно хотите завершить визард? diff --git a/android-app-core/res/values-uk/text_wizard.xml b/android-app-core/res/values-uk/text_wizard.xml index 723b8c50..2c03f380 100644 --- a/android-app-core/res/values-uk/text_wizard.xml +++ b/android-app-core/res/values-uk/text_wizard.xml @@ -31,5 +31,5 @@ Калькулятор в окремому вікні - дає змогу виконувати розрахунки під час використання інших програм на вашому пристрої Увімкнути калькулятор в окремому вікні (додаткова іконка з\'явиться у списку програм) Кнопки з розширеними функціями є винятковою рисою Калькулятор++, які забезпечують швидкий доступ до додаткових функцій - Ви дійсно бажаєте вийти з майстра? + Ви дійсно бажаєте вийти з майстра? diff --git a/android-app-core/res/values-zh-rtw/text_wizard.xml b/android-app-core/res/values-zh-rtw/text_wizard.xml index c604df75..ee1d432e 100644 --- a/android-app-core/res/values-zh-rtw/text_wizard.xml +++ b/android-app-core/res/values-zh-rtw/text_wizard.xml @@ -31,5 +31,5 @@ 独立窗口模式的计算器可以让你在使用其他应用程序的同时进行计算。 启用独立窗口模式的计算器（在应用程序列表中将出现第二个图标） 拖动按钮是Calculator++的独创亮点，可以让你快速使用辅助功能。 - Do you really want to finish wizard? + Do you really want to finish wizard? diff --git a/android-app-core/res/values/ids.xml b/android-app-core/res/values/ids.xml index f8c84de6..e21a5ace 100644 --- a/android-app-core/res/values/ids.xml +++ b/android-app-core/res/values/ids.xml @@ -56,4 +56,8 @@ + + + + \ No newline at end of file diff --git a/android-app-core/res/values/text_strings.xml b/android-app-core/res/values/text_strings.xml index 1b8dc6ad..a96817d2 100644 --- a/android-app-core/res/values/text_strings.xml +++ b/android-app-core/res/values/text_strings.xml @@ -320,4 +320,6 @@ If you have any problems or questions feel free to contact me directly (contacts are available in Main->Menu->About) + Yes + No diff --git a/android-app-core/res/values/text_wizard.xml b/android-app-core/res/values/text_wizard.xml index 620928b2..e6ff410c 100644 --- a/android-app-core/res/values/text_wizard.xml +++ b/android-app-core/res/values/text_wizard.xml @@ -46,5 +46,5 @@ Drag button is an exclusive feature of Calculator++ which provides fast access to the secondary functions - Do you really want to finish wizard? + Do you really want to finish wizard? diff --git a/android-app-core/src/main/java/org/solovyev/android/AndroidUtils2.java b/android-app-core/src/main/java/org/solovyev/android/AndroidUtils2.java deleted file mode 100644 index 6180603f..00000000 --- a/android-app-core/src/main/java/org/solovyev/android/AndroidUtils2.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2013 serso aka se.solovyev - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * Contact details - * - * Email: se.solovyev@gmail.com - * Site: http://se.solovyev.org - */ - -package org.solovyev.android; - -/** - * User: Solovyev_S - * Date: 03.10.12 - * Time: 10:48 - */ -public final class AndroidUtils2 { - - private AndroidUtils2() { - throw new AssertionError(); - } - -} diff --git a/android-app/project.properties b/android-app/project.properties index 7382ccd3..0a815a7c 100644 --- a/android-app/project.properties +++ b/android-app/project.properties @@ -13,22 +13,23 @@ target=android-17 android.library.reference.1=../android-app-core android.library.reference.2=../android-app-widget android.library.reference.3=../android-app-onscreen -android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-all_1.1.3-SNAPSHOT -android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-ads_1.1.3-SNAPSHOT -android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-core_1.1.3-SNAPSHOT -android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-billing_1.1.3-SNAPSHOT -android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-db_1.1.3-SNAPSHOT -android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-security_1.1.3-SNAPSHOT -android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-http_1.1.3-SNAPSHOT -android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-lists_1.1.3-SNAPSHOT -android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-views_1.1.3-SNAPSHOT -android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.1.3-SNAPSHOT -android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-menus_1.1.3-SNAPSHOT -android.library.reference.15=gen-external-apklibs/org.solovyev.android_android-common-other_1.1.3-SNAPSHOT -android.library.reference.16=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.1.3-SNAPSHOT +android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-all_1.1.11 +android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-ads_1.1.11 +android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-core_1.1.11 +android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-billing_1.1.11 +android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-db_1.1.11 +android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-security_1.1.11 +android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-http_1.1.11 +android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-lists_1.1.11 +android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-views_1.1.11 +android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.1.11 +android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-menus_1.1.11 +android.library.reference.15=gen-external-apklibs/org.solovyev.android_android-common-other_1.1.11 +android.library.reference.16=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.1.11 android.library.reference.17=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0 -android.library.reference.18=gen-external-apklibs/org.solovyev.android_android-common-keyboards_1.1.3-SNAPSHOT -android.library.reference.19=gen-external-apklibs/org.solovyev.android_android-common-app_1.1.3-SNAPSHOT -android.library.reference.20=gen-external-apklibs/org.solovyev.android_android-common-networks_1.1.3-SNAPSHOT -android.library.reference.21=gen-external-apklibs/org.solovyev.android_android-common-fragments_1.1.3-SNAPSHOT -android.library.reference.22=gen-external-apklibs/org.solovyev.android_android-common-tasks_1.1.3-SNAPSHOT \ No newline at end of file +android.library.reference.18=gen-external-apklibs/org.solovyev.android_android-common-keyboards_1.1.11 +android.library.reference.19=gen-external-apklibs/org.solovyev.android_android-common-app_1.1.11 +android.library.reference.20=gen-external-apklibs/org.solovyev.android_android-common-networks_1.1.11 +android.library.reference.21=gen-external-apklibs/org.solovyev.android_android-common-fragments_1.1.11 +android.library.reference.22=gen-external-apklibs/org.solovyev.android_android-common-tasks_1.1.11 +android.library.reference.23=gen-external-apklibs/org.solovyev.android_android-common-wizard_1.1.11 \ No newline at end of file diff --git a/android-app/res/layout/cpp_wizard.xml b/android-app/res/layout/cpp_wizard.xml index 72b3a2ec..d04e84a7 100644 --- a/android-app/res/layout/cpp_wizard.xml +++ b/android-app/res/layout/cpp_wizard.xml @@ -29,7 +29,7 @@