Kill BaseHelper and friends (#777)

Author: samtstern

auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java

@@ -8,7 +8,6 @@
 import android.support.annotation.RestrictTo;
 import android.util.Log;
 
-import com.firebase.ui.auth.ui.ActivityHelper;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.HelperActivityBase;
@@ -24,7 +23,7 @@ public class KickoffActivity extends HelperActivityBase {
     private boolean mIsWaitingForPlayServices = false;
 
     public static Intent createIntent(Context context, FlowParameters flowParams) {
-        return ActivityHelper.createBaseIntent(context, KickoffActivity.class, flowParams);
+        return HelperActivityBase.createBaseIntent(context, KickoffActivity.class, flowParams);
     }
 
     @Override
@@ -84,7 +83,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     private void start() {
-        FlowParameters flowParams = mActivityHelper.getFlowParams();
+        FlowParameters flowParams = getFlowParams();
         SignInDelegate.delegate(this, flowParams);
     }
 

auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java

@@ -8,19 +8,19 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
-import com.firebase.ui.auth.ui.BaseHelper;
+import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
 import com.google.firebase.auth.EmailAuthProvider;
 
 public class EmailProvider implements Provider {
     private static final int RC_EMAIL_FLOW = 2;
 
     private Activity mActivity;
-    private BaseHelper mHelper;
+    private FlowParameters mFlowParameters;
 
-    public EmailProvider(Activity activity, BaseHelper helper) {
+    public EmailProvider(Activity activity, FlowParameters flowParameters) {
         mActivity = activity;
-        mHelper = helper;
+        mFlowParameters = flowParameters;
     }
 
     @Override
@@ -43,14 +43,15 @@ public int getButtonLayout() {
     @Override
     public void startLogin(Activity activity) {
         activity.startActivityForResult(
-                RegisterEmailActivity.createIntent(activity, mHelper.getFlowParams()),
+                RegisterEmailActivity.createIntent(activity, mFlowParameters),
                 RC_EMAIL_FLOW);
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == RC_EMAIL_FLOW && resultCode == ResultCodes.OK) {
-            mHelper.finishActivity(mActivity, ResultCodes.OK, data);
+            mActivity.setResult(ResultCodes.OK, data);
+            mActivity.finish();
         }
     }
 }

auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java

@@ -8,7 +8,7 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
-import com.firebase.ui.auth.ui.BaseHelper;
+import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.phone.PhoneVerificationActivity;
 import com.google.firebase.auth.PhoneAuthProvider;
 
@@ -17,11 +17,11 @@ public class PhoneProvider implements Provider {
     private static final int RC_PHONE_FLOW = 4;
 
     private Activity mActivity;
-    private BaseHelper mHelper;
+    private FlowParameters mFlowParameters;
 
-    public PhoneProvider(Activity activity, BaseHelper helper) {
+    public PhoneProvider(Activity activity, FlowParameters parameters) {
         mActivity = activity;
-        mHelper = helper;
+        mFlowParameters = parameters;
     }
 
     @Override
@@ -44,14 +44,15 @@ public int getButtonLayout() {
     @Override
     public void startLogin(Activity activity) {
         activity.startActivityForResult(
-                PhoneVerificationActivity.createIntent(activity, mHelper.getFlowParams(), null),
+                PhoneVerificationActivity.createIntent(activity, mFlowParameters, null),
                 RC_PHONE_FLOW);
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == RC_PHONE_FLOW && resultCode == ResultCodes.OK) {
-            mHelper.finishActivity(mActivity, ResultCodes.OK, data);
+            mActivity.setResult(ResultCodes.OK, data);
+            mActivity.finish();
         }
     }
 }

auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java

@@ -17,14 +17,21 @@
 import android.os.Bundle;
 import android.support.annotation.RestrictTo;
 
+import com.firebase.ui.auth.R;
+
 @SuppressWarnings("Registered")
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class AppCompatBase extends HelperActivityBase {
 
     @Override
     protected void onCreate(Bundle savedInstance) {
         super.onCreate(savedInstance);
-        mActivityHelper.configureTheme();
+        configureTheme();
+    }
+
+    private void configureTheme() {
+        setTheme(R.style.FirebaseUI); // Provides default values
+        setTheme(getFlowParams().themeId);
     }
 
 }

auth/src/main/java/com/firebase/ui/auth/ui/AppCompatBase.java

@@ -13,6 +13,8 @@
  */
 package com.firebase.ui.auth.ui;
 
+import android.content.Intent;
+import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.DrawableRes;
@@ -78,6 +80,30 @@ public FlowParameters(
         this.allowNewEmailAccounts = allowNewEmailAccounts;
     }
 
+    /**
+     * Extract FlowParameters from an Intent.
+     */
+    public static FlowParameters fromIntent(Intent intent) {
+        return intent.getParcelableExtra(ExtraConstants.EXTRA_FLOW_PARAMS);
+    }
+
+    /**
+     * Extract FlowParameters from a Bundle.
+     */
+    public static FlowParameters fromBundle(Bundle bundle) {
+        return bundle.getParcelable(ExtraConstants.EXTRA_FLOW_PARAMS);
+    }
+
+    /**
+     * Create a bundle containing this FlowParameters object as
+     * {@link ExtraConstants#EXTRA_FLOW_PARAMS}.
+     */
+    public Bundle toBundle() {
+        Bundle bundle = new Bundle();
+        bundle.putParcelable(ExtraConstants.EXTRA_FLOW_PARAMS, this);
+        return bundle;
+    }
+
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(appName);