Permalink
Browse files

Merge remote-tracking branch 'frankandrobot/wizardlatest' into integr…

…ate-wizard

Point OutlineActivity to the new setup wizard

Conflicts:
	.gitignore
	build.xml
	project.properties
	res/values/strings.xml
	src/com/matburt/mobileorg/MobileOrgActivity.java
  • Loading branch information...
2 parents 231a87f + 7b29659 commit 1ae10f0f72b6267f3398aad472f3596a481cd123 @matburt committed Dec 4, 2011
Showing with 3,470 additions and 4 deletions.
  1. +0 −2 .gitignore
  2. +3 −0 AndroidManifest.xml
  3. +8 −0 ROADMAP
  4. +0 −1 build.xml
  5. +36 −0 proguard.cfg
  6. +17 −0 res/anim/cycle_7.xml
  7. +21 −0 res/anim/shake.xml
  8. BIN res/drawable/go_next.png
  9. BIN res/drawable/go_next_gray.png
  10. BIN res/drawable/go_next_pressed.png
  11. BIN res/drawable/go_next_selected.png
  12. BIN res/drawable/go_previous.png
  13. BIN res/drawable/go_previous_gray.png
  14. BIN res/drawable/go_previous_pressed.png
  15. BIN res/drawable/go_previous_selected.png
  16. BIN res/drawable/logo.png
  17. +10 −0 res/drawable/wizard_next_button.xml
  18. +10 −0 res/drawable/wizard_previous_button.xml
  19. +20 −0 res/layout/folder_adapter_row.xml
  20. +37 −0 res/layout/wizard.xml
  21. +68 −0 res/layout/wizard_dropbox.xml
  22. +27 −0 res/layout/wizard_folder_pick_list.xml
  23. +16 −0 res/layout/wizard_navbar.xml
  24. +14 −0 res/layout/wizard_navbar_first.xml
  25. +29 −0 res/layout/wizard_navbar_last.xml
  26. +12 −0 res/layout/wizard_next_button.xml
  27. +44 −0 res/layout/wizard_page1.xml
  28. +12 −0 res/layout/wizard_previous_button.xml
  29. +14 −0 res/layout/wizard_previous_button_navbar.xml
  30. +80 −0 res/layout/wizard_webdav.xml
  31. +17 −0 res/values/strings.xml
  32. +3 −0 src-img/credits.txt
  33. +586 −0 src-img/go-next.svg
  34. +588 −0 src-img/go-previous.svg
  35. BIN src-img/inkscape_pasted_image_20110901_112511.png
  36. +126 −0 src-img/normal-mdpi-template.svg
  37. +116 −0 src-img/wizard_next_button.svg
  38. +132 −0 src-img/wizard_prev_button.svg
  39. +161 −0 src/com/matburt/mobileorg/Dropbox/Dropbox.java
  40. +6 −0 src/com/matburt/mobileorg/Dropbox/DropboxLoginListener.java
  41. +152 −0 src/com/matburt/mobileorg/Dropbox/LoginAsyncTask.java
  42. +8 −1 src/com/matburt/mobileorg/Gui/OutlineActivity.java
  43. +146 −0 src/com/matburt/mobileorg/Settings/DirectoryBrowser.java
  44. +421 −0 src/com/matburt/mobileorg/Settings/WizardActivity.java
  45. +339 −0 src/com/matburt/mobileorg/Views/PageFlipView.java
  46. +134 −0 src/com/matburt/mobileorg/Views/PageView.java
  47. +57 −0 src/com/matburt/mobileorg/Views/WideLinearLayout.java
View
@@ -4,5 +4,3 @@ bin
local.properties
matburt-key.keystore
dbprivate.xml
-.classpath
-.project
View
@@ -41,6 +41,9 @@
<activity android:name=".Settings.SettingsActivity"
android:label="MobileOrg Settings">
</activity>
+ <activity android:name=".Settings.WizardActivity"
+ android:label="MobileOrg Wizard">
+ </activity>
<activity android:name=".Synchronizers.DropboxAuthActivity"
android:label="Dropbox Authentication">
</activity>
View
@@ -0,0 +1,8 @@
+* Roadmap
+** TODO Finalize design of Wizard
+*** DONE Add text to strings.xml ("I want to...")
+*** TODO Create image resources for different resolutions
+*** TODO Fix bugs
+ + rotation bug
+ + i just noticed a bug when you swype right to the homescreen, it "snaps" back for some reason
+ + users should be able to re-run wizard with current settings filled in
View
@@ -45,7 +45,6 @@
unless="sdk.dir"
/>
-
<!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets -->
<!--
View
@@ -0,0 +1,36 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+ native <methods>;
+}
+
+-keepclasseswithmembernames class * {
+ public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembernames class * {
+ public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers enum * {
+ public static **[] values();
+ public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+ public static final android.os.Parcelable$Creator *;
+}
View
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ 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.
+-->
+
+<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android" android:cycles="7" />
View
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ 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.
+-->
+
+<translate
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fromXDelta="0" android:toXDelta="10"
+ android:duration="1000"
+ android:interpolator="@anim/cycle_7" />
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/go_next_gray"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/go_next_pressed"
+ android:state_pressed="true" />
+ <item android:drawable="@drawable/go_next_selected"
+ android:state_focused="true" />
+ <item android:drawable="@drawable/go_next" />
+</selector>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/go_previous_gray"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/go_previous_pressed"
+ android:state_pressed="true" />
+ <item android:drawable="@drawable/go_previous_selected"
+ android:state_focused="true" />
+ <item android:drawable="@drawable/go_previous" />
+</selector>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp">
+ <CheckBox
+ android:id="@+id/checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/folder"
+ android:paddingLeft="10dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="18dp"
+ android:layout_weight="1.0"
+ />
+</LinearLayout>
View
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.matburt.mobileorg.Views.PageFlipView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/wizard_parent"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:fillViewport="true"
+ android:layout_alignParentTop="true">
+ <com.matburt.mobileorg.Views.WideLinearLayout
+ android:id="@+id/wizard_container"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:orientation="horizontal">
+ <!-- page 1 -->
+ <ScrollView
+ android:id="@+id/wizard_page1_container"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:fillViewport="true">
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <include
+ android:layout_marginTop="10dp"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1.0"
+ android:id="@+id/wizard_page1"
+ layout="@layout/wizard_page1" />
+ <include
+ layout="@layout/wizard_navbar_first" />
+ </LinearLayout>
+ </ScrollView>
+ </com.matburt.mobileorg.Views.WideLinearLayout>
+</com.matburt.mobileorg.Views.PageFlipView>
+
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:fillViewport="true">
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="20dp"
+ android:paddingLeft="20dp"
+ android:paddingRight="20dp"
+ android:id="@+id/wizard_dropbox">
+ <TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/log_in_to_dropbox"
+ android:textSize="20dp"
+ android:textStyle="bold"
+ android:paddingBottom="20dp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/email"
+ android:textSize="20dp"/>
+ <EditText
+ android:id="@+id/wizard_dropbox_email"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textSize="20dp"
+ android:inputType="textEmailAddress"
+ android:singleLine="true"/>
+ <TextView
+ android:paddingTop="10dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/password"
+ android:textSize="20dp"/>
+ <EditText
+ android:id="@+id/wizard_dropbox_password"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textSize="20dp"
+ android:inputType="textPassword"
+ android:password="true"
+ android:singleLine="true"/>
+ <Button
+ android:layout_marginTop="10dp"
+ android:id="@+id/wizard_dropbox_login_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/login"
+ android:textSize="20dp"/>
+ </LinearLayout>
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1dp"
+ android:layout_weight="1.0"
+ />
+ <include layout="@layout/wizard_navbar"/>
+ </LinearLayout>
+</ScrollView>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/wizard_folder_pick_list"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/pick_folder"
+ android:textStyle="bold"
+ android:textSize="20dp"/>
+ <ListView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="80dp"
+ android:id="@+id/wizard_folder_list"/>
+ <!-- 60dp = 48dp size of arrows + 10dp margin -->
+ </LinearLayout>
+ <include layout="@layout/wizard_navbar_last" />
+</RelativeLayout>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <include
+ layout="@layout/wizard_previous_button"/>
+ <View
+ android:layout_width="wrap_content"
+ android:layout_height="1dp"
+ android:layout_weight="1.0"
+ />
+ <include
+ layout="@layout/wizard_next_button"/>
+</LinearLayout>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <View
+ android:layout_width="wrap_content"
+ android:layout_height="1dp"
+ android:layout_weight="1.0"
+ />
+ <include
+ layout="@layout/wizard_next_button"/>
+</LinearLayout>
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/wizard_navbar_last"
+ android:background="#ff000000"
+ android:paddingTop="10dp"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true">
+ <LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <include
+ layout="@layout/wizard_previous_button"/>
+ <View
+ android:layout_width="wrap_content"
+ android:layout_height="1dp"
+ android:layout_weight="1.0"
+ />
+ <Button
+ android:id="@+id/wizard_done_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Done"
+ android:textSize="20dp"/>
+ </LinearLayout>
+</RelativeLayout>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/wizard_next_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/wizard_next_button"
+ android:layout_gravity="right"
+ android:layout_marginRight="10dp"
+ android:layout_marginBottom="10dp"
+ android:layout_marginTop="10dp"
+ />
Oops, something went wrong.

0 comments on commit 1ae10f0

Please sign in to comment.