Merge "Terms of service URL and minor UI polish pt.3"

Author: Aaron Mandle

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

@@ -45,12 +45,20 @@ public static Intent createIntent(
             @NonNull String appName,
             @NonNull String apiaryKey,
             @NonNull String applicationId,
+            String termsOfServiceUrl,
             int theme,
             @Nullable List<String> providers) {
         ArrayList<IDPProviderParcel> providerParcels = new ArrayList<>();
         if (providers == null || providers.size() == 0) {
             return CredentialsInitActivity.createIntent(
-                    context,appName, providerParcels, apiaryKey, applicationId, theme);
+                    context,
+                    appName,
+                    providerParcels,
+                    apiaryKey,
+                    applicationId,
+                    termsOfServiceUrl,
+                    theme
+            );
         }
 
         for (String provider : providers) {
@@ -63,6 +71,13 @@ public static Intent createIntent(
             }
         }
         return CredentialsInitActivity.createIntent(
-                context,appName, providerParcels, apiaryKey, applicationId, theme);
+                context,
+                appName,
+                providerParcels,
+                apiaryKey,
+                applicationId,
+                termsOfServiceUrl,
+                theme
+        );
     }
 }

auth/src/main/java/com/firebase/ui/auth/choreographer/ControllerConstants.java

@@ -25,6 +25,7 @@ public class ControllerConstants {
     public static final String EXTRA_APPLICATION_ID = "extra_application_id";
     public static final String EXTRA_APIARY_KEY = "extra_apiary_key";
     public static final String EXTRA_SUCCESS = "success_extra";
+    public static final String EXTRA_TERMS_OF_SERVICE_URL = "extra_tos_url";
     public static final String EXTRA_ID_TOKEN = "extra_id_token";
     public static final String EXTRA_RESTORE_PASSWORD_FLAG = "extra_restore_password_flag";
     public static final String EXTRA_HINT_INTENT = "hintIntent";

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

@@ -38,13 +38,15 @@ public abstract class BaseActivity extends android.support.v7.app.AppCompatActiv
 
     protected int mId;
     protected String mAppName;
+    protected String mTermsOfServiceUrl;
     protected AtomicBoolean isPendingFinishing = new AtomicBoolean(false);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Intent previousIntent = getIntent();
         mAppName = getIntent().getStringExtra(ControllerConstants.EXTRA_APP_NAME);
+        mTermsOfServiceUrl = getIntent().getStringExtra(ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL);
         mId = previousIntent.getIntExtra(EXTRA_ID, Controller.DEFAULT_INIT_FLOW_ID);
         mController = setUpController();
     }
@@ -113,13 +115,21 @@ protected void doAction(Action action) {
         } else if (action.getNextId() == Controller.START_NEW_FLOW_ID) {
            Intent newFlowIntent = action.getNextIntent();
             newFlowIntent.putExtra(ControllerConstants.EXTRA_APP_NAME, mAppName);
+            newFlowIntent.putExtra(
+                    ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL,
+                    mTermsOfServiceUrl
+            );
             this.startActivityForResult(newFlowIntent, NEXT_FLOW);
             return;
         }
         if (action.hasNextAction()) {
             this.startActivity(action.getNextIntent()
                     .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
                     .putExtra(ControllerConstants.EXTRA_APP_NAME, mAppName)
+                    .putExtra(
+                            ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL,
+                            mTermsOfServiceUrl
+                    )
                     .putExtra(EXTRA_ID, action.getNextId()));
         } else {
             this.setResult(action.getFinishResultCode(), action.getFinishData());

auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialsInitActivity.java

@@ -56,13 +56,14 @@ public void onCreate(Bundle savedInstance) {
 
     public static Intent createIntent(
             Context context, String appName, ArrayList<IDPProviderParcel> parcels, String
-            apiaryKey, String applicationId, int theme) {
+            apiaryKey, String applicationId, String termsOfServiceUrl, int theme) {
         return new Intent()
                 .setClass(context, CredentialsInitActivity.class)
                 .putExtra(EXTRA_ID, CredentialsController.ID_INIT)
                 .putExtra(ControllerConstants.EXTRA_APP_NAME, appName)
                 .putExtra(ControllerConstants.EXTRA_APIARY_KEY, apiaryKey)
                 .putExtra(ControllerConstants.EXTRA_APPLICATION_ID, applicationId)
+                .putExtra(ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL, termsOfServiceUrl)
                 .putParcelableArrayListExtra(ControllerConstants.EXTRA_PROVIDERS, parcels)
                 .putExtra(ControllerConstants.EXTRA_THEME, theme);
     }

auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java

@@ -15,6 +15,7 @@
 package com.firebase.ui.auth.ui.email;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.content.ContextCompat;
@@ -94,6 +95,9 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void setUpTermsOfService() {
+        if (mTermsOfServiceUrl == null) {
+            return;
+        }
         ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(ContextCompat.getColor
                 (getApplicationContext(), R.color.linkColor));
 
@@ -104,6 +108,14 @@ private void setUpTermsOfService() {
         spannableStringBuilder.setSpan(foregroundColorSpan, start, start + link.length(), 0);
         TextView agreementText = (TextView) findViewById(R.id.create_account_text);
         agreementText.setText(spannableStringBuilder);
+        agreementText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(Intent.ACTION_VIEW).setData(Uri.parse
+                        (mTermsOfServiceUrl));
+                startActivity(intent);
+            }
+        });
     }
 
     @Override

auth/src/main/res/layout/register_email_layout.xml

@@ -83,9 +83,8 @@
             android:id="@+id/create_account_text"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:paddingTop="336dp"
+            android:layout_marginTop="336dp"
             style="@style/FirebaseUI.Text.BodyText"
-            android:text="@string/create_account_preamble"
             />
 
 

auth/src/main/res/layout/welcome_back_password_prompt_layout.xml

@@ -21,7 +21,7 @@
             android:id="@+id/password_layout"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             style="@style/FirebaseUI.Text.TextInputLayout"
-            android:paddingTop="136dp"
+            android:paddingTop="16dp"
             app:hintTextAppearance="@style/FirebaseUI.Text.HintText"
             app:errorTextAppearance="@style/FirebaseUI.Text.ErrorText"
             android:layout_width="match_parent"
@@ -37,7 +37,7 @@
         <ImageView
             style="@style/FirebaseUI.ImageView.VisibilityToggle"
             android:id="@+id/toggle_visibility"
-            android:paddingTop="154dp"
+            android:paddingTop="34dp"
             android:layout_alignEnd="@id/password_layout"
             android:layout_alignRight="@id/password_layout">
         </ImageView>

auth/src/main/res/values/colors.xml

@@ -4,7 +4,7 @@
     <color name="colorPrimaryDark">#2F3E9E</color>
     <color name="colorAccent">#3E50B4</color>
     <color name="headingColor">#212121</color>
-    <color name="bodyTextColor">#757575</color>
+    <color name="bodyTextColor">#c0000000</color>
     <color name="errorColor">#DD2C00</color>
     <color name="linkColor">#4285F4</color>
     <color name="buttonColor">@color/colorPrimary</color>