From 65f8adf492d7f3d304b078f0e8d018a4b5459a3e Mon Sep 17 00:00:00 2001 From: Mark O'Sullivan Date: Fri, 3 Apr 2015 18:29:58 +0100 Subject: [PATCH 1/9] First commit Changed the original code so it will now work with Android Lollipop. I've also changed all the choices so they are more generic and so it could be used as a template for future wizards. --- .gitignore | 59 +--- .idea/.name | 1 + .idea/compiler.xml | 23 ++ .idea/copyright/profiles_settings.xml | 3 + .idea/encodings.xml | 5 + .idea/gradle.xml | 4 +- .idea/misc.xml | 42 +++ .idea/modules.xml | 10 + .idea/scopes/scope_settings.xml | 5 + .idea/vcs.xml | 7 + Wizards.iml | 19 ++ app/.gitignore | 1 + app/app.iml | 92 ++++++ app/build.gradle | 25 ++ app/proguard-rules.pro | 17 ++ .../wizards/ApplicationTest.java | 13 + app/src/main/AndroidManifest.xml | 21 ++ .../markosullivan/wizards/MainActivity.java | 261 +++++++++++++++++ .../wizards/PresentWizardModel.java | 85 ++++++ .../wizard/model/AbstractWizardModel.java | 100 +++++++ .../wizards/wizard/model/BranchPage.java | 122 ++++++++ .../wizard/model/CustomerInfoPage.java | 52 ++++ .../wizards/wizard/model/ModelCallbacks.java | 26 ++ .../wizard/model/MultipleFixedChoicePage.java | 60 ++++ .../wizards/wizard/model/Page.java | 99 +++++++ .../wizards/wizard/model/PageList.java | 54 ++++ .../wizards/wizard/model/PageTreeNode.java | 27 ++ .../wizards/wizard/model/ReviewItem.java | 74 +++++ .../wizard/model/SingleFixedChoicePage.java | 69 +++++ .../wizard/ui/CustomerInfoFragment.java | 150 ++++++++++ .../wizard/ui/MultipleChoiceFragment.java | 141 +++++++++ .../wizard/ui/PageFragmentCallbacks.java | 21 ++ .../wizards/wizard/ui/ReviewFragment.java | 180 ++++++++++++ .../wizard/ui/SingleChoiceFragment.java | 125 ++++++++ .../wizards/wizard/ui/StepPagerStrip.java | 270 ++++++++++++++++++ .../main/res/drawable/finish_background.xml | 20 ++ .../drawable/selectable_item_background.xml | 4 + app/src/main/res/layout/activity_main.xml | 55 ++++ app/src/main/res/layout/fragment_page.xml | 33 +++ .../layout/fragment_page_customer_info.xml | 56 ++++ app/src/main/res/layout/list_item_review.xml | 44 +++ app/src/main/res/menu/menu_main.xml | 5 + app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes app/src/main/res/values-v21/styles.xml | 22 ++ app/src/main/res/values-w820dp/dimens.xml | 6 + app/src/main/res/values/colors.xml | 25 ++ app/src/main/res/values/dimens.xml | 21 ++ app/src/main/res/values/strings.xml | 34 +++ app/src/main/res/values/styles.xml | 44 +++ build.gradle | 45 +-- gradle.properties | 18 ++ settings.gradle | 1 + 55 files changed, 2606 insertions(+), 90 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/scopes/scope_settings.xml create mode 100644 .idea/vcs.xml create mode 100644 Wizards.iml create mode 100644 app/.gitignore create mode 100644 app/app.iml create mode 100644 app/build.gradle create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/com/markosullivan/wizards/ApplicationTest.java create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/markosullivan/wizards/MainActivity.java create mode 100644 app/src/main/java/com/markosullivan/wizards/PresentWizardModel.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/model/AbstractWizardModel.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/model/BranchPage.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/model/CustomerInfoPage.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/model/ModelCallbacks.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/model/MultipleFixedChoicePage.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/model/Page.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/model/PageList.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/model/PageTreeNode.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/model/ReviewItem.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/model/SingleFixedChoicePage.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/ui/CustomerInfoFragment.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/ui/MultipleChoiceFragment.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/ui/PageFragmentCallbacks.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/ui/ReviewFragment.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/ui/SingleChoiceFragment.java create mode 100644 app/src/main/java/com/markosullivan/wizards/wizard/ui/StepPagerStrip.java create mode 100644 app/src/main/res/drawable/finish_background.xml create mode 100644 app/src/main/res/drawable/selectable_item_background.xml create mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/layout/fragment_page.xml create mode 100644 app/src/main/res/layout/fragment_page_customer_info.xml create mode 100644 app/src/main/res/layout/list_item_review.xml create mode 100644 app/src/main/res/menu/menu_main.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/values-v21/styles.xml create mode 100644 app/src/main/res/values-w820dp/dimens.xml create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/dimens.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/styles.xml create mode 100644 gradle.properties create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index a287a2a..afbdab3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,57 +1,6 @@ +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries .DS_Store - -# Local sandbox -_sandbox - -# built application files -*.apk -*.ap_ - -# files for the dex VM -*.dex - -# Java class files -*.class - -# generated files -out/ -bin/ -gen/ - -# Local configuration file (sdk path, etc) -local.properties - -# Eclipse project files -.classpath -.project - -# IDEA files -*.iml -*.ipr -*.iws - -# Other build files -project.properties -ant.properties -build.xml -proguard-project.txt - -# Built application files -/*/build/ /build - -# Gradle generated files -.gradle/ - -# User-specific configurations -.idea/libraries/ -.idea/workspace.xml -.idea/tasks.xml -.idea/.name -.idea/compiler.xml -.idea/copyright/profiles_settings.xml -.idea/encodings.xml -.idea/misc.xml -.idea/modules.xml -.idea/scopes/scope_settings.xml -.idea/vcs.xml \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..56952aa --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Wizards \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..e206d70 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2caec4f..989e2b6 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,11 +3,13 @@