Initial new signup/login flow

inaturalist · Aug 25, 2015 · 3560751 · 3560751
1 parent 72a2bd6
commit 3560751
Show file tree

Hide file tree

Showing 103 changed files with 1,739 additions and 207 deletions.
diff --git a/iNaturalist/build.gradle b/iNaturalist/build.gradle
@@ -14,6 +14,7 @@ repositories {
     maven { url 'https://maven.fabric.io/public' }
 }
 
+
 android {
     compileSdkVersion 'Google Inc.:Google APIs:19'
     buildToolsVersion "22.0.1"
@@ -52,11 +53,10 @@ dependencies {
     compile 'org.apache.commons:commons-lang3:3.1'
     compile 'org.apache.httpcomponents:httpmime:4.3.3'
     compile 'org.apache.httpcomponents:httpcore:4.4.1'
-    compile 'com.facebook.android:facebook-android-sdk:3.23.1'
+    compile 'com.facebook.android:facebook-android-sdk:4.1.0'
     compile 'com.loopj.android:android-async-http:1.4.7'
     compile('com.crashlytics.sdk.android:crashlytics:2.4.0@aar') {
         transitive = true;
     }
     compile 'com.melnykov:floatingactionbutton:1.3.0'
-
 }
diff --git a/iNaturalist/iNaturalist-release.apk b/iNaturalist/iNaturalist-release.apk
diff --git a/iNaturalist/iNaturalist.iml b/iNaturalist/iNaturalist.iml
@@ -76,7 +76,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.1.3/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics-core/2.3.3/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics/2.4.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.android/facebook-android-sdk/3.23.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.android/facebook-android-sdk/4.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services/5.0.89/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.melnykov/floatingactionbutton/1.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.4/jars" />
@@ -100,20 +100,20 @@
     <orderEntry type="library" exported="" name="floatingactionbutton-1.3.0" level="project" />
     <orderEntry type="library" exported="" name="crashlytics-core-2.3.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="bolts-android-1.2.0" level="project" />
     <orderEntry type="library" exported="" name="commons-collections4-4.0" level="project" />
     <orderEntry type="library" exported="" name="answers-1.2.2" level="project" />
     <orderEntry type="library" exported="" name="crashlytics-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-5.0.89" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="android-async-http-1.4.7" level="project" />
     <orderEntry type="library" exported="" name="actionbarsherlock-4.4.0" level="project" />
-    <orderEntry type="library" exported="" name="facebook-android-sdk-3.23.1" level="project" />
     <orderEntry type="library" exported="" name="httpmime-4.3.3" level="project" />
     <orderEntry type="library" exported="" name="FlurryAnalytics-4.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="facebook-android-sdk-4.1.0" level="project" />
     <orderEntry type="library" exported="" name="beta-1.1.3" level="project" />
     <orderEntry type="library" exported="" name="httpcore-4.4.1" level="project" />
-    <orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="commons-lang3-3.1" level="project" />
     <orderEntry type="library" exported="" name="fabric-1.3.4" level="project" />

diff --git a/iNaturalist/src/main/AndroidManifest.xml b/iNaturalist/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.inaturalist.android"
     android:versionCode="56"
-    android:versionName="1.4.0" >
+    android:versionName="1.3.23" >
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="15" />
 
@@ -100,7 +100,18 @@
             android:label="@string/app_name"
             android:name=".TaxonSearchActivity" >
         </activity>
-
+
+        <activity
+            android:configChanges="orientation"
+            android:screenOrientation="portrait"
+            android:name=".LoginSignupActivity" >
+        </activity>
+
+        <activity
+            android:configChanges="orientation"
+            android:screenOrientation="portrait"
+            android:name=".OnboardingActivity" >
+        </activity>
         <activity
             android:configChanges="orientation"
             android:label="@string/app_name"
@@ -139,9 +150,16 @@
             android:label="@string/settings"
             android:name=".INaturalistPrefsActivity" >
         </activity>
+        <!--
         <activity android:name="com.facebook.LoginActivity"
           android:theme="@android:style/Theme.Translucent.NoTitleBar"
-          android:label="@string/app_name" />
+          android:label="@string/app_name" />-->
+
+        <activity android:name="com.facebook.FacebookActivity"
+            android:configChanges=
+                "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:label="@string/app_name" />
         <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
         <activity
             android:configChanges="orientation"

diff --git a/iNaturalist/src/main/java/org/inaturalist/android/ActivityHelper.java b/iNaturalist/src/main/java/org/inaturalist/android/ActivityHelper.java
@@ -40,6 +40,13 @@ public void alert(int title, int msg) {
     }
 
     public void alert(String title, String msg) {
+        confirm(title, msg, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialogInterface, int i) {
+                dialogInterface.cancel();
+            }
+        }, null);
+        /*
         AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
         builder.setMessage(msg)
         .setTitle(title)
@@ -50,6 +57,7 @@ public void onClick(DialogInterface dialog, int id) {
         });
         AlertDialog alert = builder.create();
         alert.show();
+        */
     }
 
     public void confirm(int titleRes, Object msg, DialogInterface.OnClickListener okListener, DialogInterface.OnClickListener cancelListener) {

diff --git a/iNaturalist/src/main/java/org/inaturalist/android/INaturalistApp.java b/iNaturalist/src/main/java/org/inaturalist/android/INaturalistApp.java
@@ -1,6 +1,7 @@
 package org.inaturalist.android;
 
 import com.crashlytics.android.Crashlytics;
+import com.facebook.FacebookSdk;
 
 import io.fabric.sdk.android.Fabric;
 import java.io.BufferedInputStream;
@@ -57,6 +58,15 @@ public class INaturalistApp extends Application {
     private Locale locale = null;
     private Locale deviceLocale = null;
     private OnDownloadFileProgress mDownloadCallback;
+    private boolean mOnboardingShownBefore = false;
+
+    public boolean shownOnboarding() {
+        return mOnboardingShownBefore;
+    }
+
+    public void setShownOnboarding(boolean value) {
+        mOnboardingShownBefore = true;
+    }
 
     public interface INotificationCallback {
     	public void onNotification(String title, String content);
@@ -66,6 +76,7 @@ public interface INotificationCallback {
     public void onCreate() {
         super.onCreate();
         Fabric.with(this, new Crashlytics());
+        FacebookSdk.sdkInitialize(getApplicationContext());
 
         mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         INaturalistApp.context = getApplicationContext();