Merge branch 'FirebaseArray' into firebase-array-explore

SUPERCILEX · SUPERCILEX · commit a4d7ad1c594e · 2017-03-01T10:48:28.000-08:00
diff --git a/app/src/main/java/com/firebase/uidemo/ChooserActivity.java b/app/src/main/java/com/firebase/uidemo/ChooserActivity.java
@@ -14,15 +14,15 @@
 
 package com.firebase.uidemo;
 
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.StringRes;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
 import android.widget.TextView;
 
 import com.firebase.uidemo.auth.AuthUiActivity;
@@ -31,73 +31,82 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnItemClick;
 
 public class ChooserActivity extends AppCompatActivity {
-
-    private static final Class[] CLASSES = new Class[]{
-            ChatActivity.class,
-            AuthUiActivity.class,
-            ImageActivity.class,
-    };
-
-    private static final int[] DESCRIPTION_NAMES = new int[] {
-            R.string.name_chat,
-            R.string.name_auth_ui,
-            R.string.name_image
-    };
-
-    private static final int[] DESCRIPTION_IDS = new int[] {
-            R.string.desc_chat,
-            R.string.desc_auth_ui,
-            R.string.desc_image
-    };
-
-    @BindView(R.id.list_view)
-    ListView mListView;
+    @BindView(R.id.activities)
+    RecyclerView mActivities;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_chooser);
         ButterKnife.bind(this);
 
-        mListView.setAdapter(new MyArrayAdapter(
-                this,
-                android.R.layout.simple_list_item_2,
-                CLASSES));
+        mActivities.setLayoutManager(new LinearLayoutManager(this));
+        mActivities.setAdapter(new ActivityChooserAdapter());
+        mActivities.setHasFixedSize(true);
     }
 
-    @OnItemClick(R.id.list_view)
-    public void onItemClick(int position) {
-        Class clicked = CLASSES[position];
-        startActivity(new Intent(this, clicked));
-    }
+    private static class ActivityChooserAdapter extends RecyclerView.Adapter<ActivityStarterHolder> {
+        private static final Class[] CLASSES = new Class[]{
+                ChatActivity.class,
+                AuthUiActivity.class,
+                ImageActivity.class,
+        };
+
+        private static final int[] DESCRIPTION_NAMES = new int[]{
+                R.string.name_chat,
+                R.string.name_auth_ui,
+                R.string.name_image
+        };
+
+        private static final int[] DESCRIPTION_IDS = new int[]{
+                R.string.desc_chat,
+                R.string.desc_auth_ui,
+                R.string.desc_image
+        };
 
-    public static class MyArrayAdapter extends ArrayAdapter<Class> {
-
-        private Context mContext;
+        @Override
+        public ActivityStarterHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            return new ActivityStarterHolder(
+                    LayoutInflater.from(parent.getContext())
+                            .inflate(R.layout.activity_chooser_item, parent, false));
+        }
 
-        public MyArrayAdapter(Context context, int resource, Class... objects) {
-            super(context, resource, objects);
-            mContext = context;
+        @Override
+        public void onBindViewHolder(ActivityStarterHolder holder, int position) {
+            holder.bind(CLASSES[position], DESCRIPTION_NAMES[position], DESCRIPTION_IDS[position]);
         }
 
         @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            View view;
+        public int getItemCount() {
+            return CLASSES.length;
+        }
+    }
+
+    private static class ActivityStarterHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        private TextView mTitle;
+        private TextView mDescription;
+
+        private Class mStarterClass;
 
-            if (convertView == null) {
-                LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(LAYOUT_INFLATER_SERVICE);
-                view = inflater.inflate(android.R.layout.simple_list_item_2, null);
-            } else {
-                view = convertView;
-            }
+        public ActivityStarterHolder(View itemView) {
+            super(itemView);
+            mTitle = (TextView) itemView.findViewById(R.id.text1);
+            mDescription = (TextView) itemView.findViewById(R.id.text2);
+        }
+
+        private void bind(Class aClass, @StringRes int name, @StringRes int description) {
+            mStarterClass = aClass;
 
-            ((TextView) view.findViewById(android.R.id.text1)).setText(DESCRIPTION_NAMES[position]);
-            ((TextView) view.findViewById(android.R.id.text2)).setText(DESCRIPTION_IDS[position]);
+            mTitle.setText(name);
+            mDescription.setText(description);
+            itemView.setOnClickListener(this);
+        }
 
-            return view;
+        @Override
+        public void onClick(View v) {
+            itemView.getContext().startActivity(new Intent(itemView.getContext(), mStarterClass));
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_chooser.xml b/app/src/main/res/layout/activity_chooser.xml
@@ -9,8 +9,8 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin">
 
-    <ListView
-        android:id="@+id/list_view"
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/activities"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
diff --git a/app/src/main/res/layout/activity_chooser_item.xml b/app/src/main/res/layout/activity_chooser_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    app:cardCornerRadius="5dp"
+    app:cardUseCompatPadding="true">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:textIsSelectable="false"
+            android:textStyle="bold"/>
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/text1"
+            android:layout_alignStart="@id/text1"
+            android:layout_below="@id/text1"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:textIsSelectable="false"/>
+
+    </RelativeLayout>
+
+</android.support.v7.widget.CardView>
diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -55,7 +55,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -356,11 +355,33 @@ public void writeToParcel(Parcel parcel, int i) {
             parcel.writeStringList(mScopes);
         }
 
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+
+            IdpConfig config = (IdpConfig) o;
+
+            return mProviderId.equals(config.mProviderId);
+        }
+
+        @Override
+        public int hashCode() {
+            return mProviderId.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            return "IdpConfig{" +
+                    "mProviderId='" + mProviderId + '\'' +
+                    ", mScopes=" + mScopes +
+                    '}';
+        }
+
         public static class Builder {
             private String mProviderId;
             private List<String> mScopes = new ArrayList<>();
 
-
             /**
              * Builds the configuration parameters for an identity provider.
              *
@@ -406,13 +427,12 @@ public IdpConfig build() {
     public final class SignInIntentBuilder {
         private int mLogo = NO_LOGO;
         private int mTheme = getDefaultTheme();
-        private LinkedHashSet<IdpConfig> mProviders = new LinkedHashSet<>();
+        private List<IdpConfig> mProviders = new ArrayList<>();
         private String mTosUrl;
         private boolean mIsSmartLockEnabled = true;
         private boolean mAllowNewEmailAccounts = true;
 
         private SignInIntentBuilder() {
-            mProviders.add(new IdpConfig.Builder(EMAIL_PROVIDER).build());
         }
 
         /**
@@ -458,15 +478,14 @@ public SignInIntentBuilder setTosUrl(@Nullable String tosUrl) {
          */
         public SignInIntentBuilder setProviders(@NonNull List<IdpConfig> idpConfigs) {
             mProviders.clear();
-            Set<String> configuredProviders = new HashSet<>();
-            for (IdpConfig idpConfig : idpConfigs) {
-                if (configuredProviders.contains(idpConfig.getProviderId())) {
+            for (IdpConfig config : idpConfigs) {
+                if (mProviders.contains(config)) {
                     throw new IllegalArgumentException("Each provider can only be set once. "
-                                                               + idpConfig.getProviderId()
+                                                               + config.getProviderId()
                                                                + " was set twice.");
+                } else {
+                    mProviders.add(config);
                 }
-                configuredProviders.add(idpConfig.getProviderId());
-                mProviders.add(idpConfig);
             }
             return this;
         }
@@ -495,6 +514,15 @@ public SignInIntentBuilder setProviders(@NonNull String... providers) {
             return this;
         }
 
+        private boolean isIdpAlreadyConfigured(@NonNull String providerId) {
+            for (IdpConfig config : mProviders) {
+                if (config.getProviderId().equals(providerId)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         /**
          * Enables or disables the use of Smart Lock for Passwords in the sign in flow.
          * <p>
@@ -515,23 +543,18 @@ public SignInIntentBuilder setAllowNewEmailAccounts(boolean enabled) {
             return this;
         }
 
-        private boolean isIdpAlreadyConfigured(@NonNull String providerId) {
-            for (IdpConfig config : mProviders) {
-                if (config.getProviderId().equals(providerId)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         public Intent build() {
             return KickoffActivity.createIntent(mApp.getApplicationContext(), getFlowParams());
         }
 
         @VisibleForTesting()
         public FlowParameters getFlowParams() {
+            if (mProviders.isEmpty()) {
+                mProviders.add(new IdpConfig.Builder(EMAIL_PROVIDER).build());
+            }
+
             return new FlowParameters(mApp.getName(),
-                                      new ArrayList<>(mProviders),
+                                      mProviders,
                                       mTheme,
                                       mLogo,
                                       mTosUrl,
diff --git a/constants.gradle b/constants.gradle
@@ -11,5 +11,5 @@ project.ext {
     buildTools = '25.0.2'
 
     firebaseVersion = '10.2.0'
-    supportLibraryVersion = '25.1.1'
+    supportLibraryVersion = '25.2.0'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 04 11:20:17 PST 2017
+#Tue Feb 21 17:40:47 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ project.ext {`
`11`	`11`	`buildTools = '25.0.2'`
`12`	`12`
`13`	`13`	`firebaseVersion = '10.2.0'`
`14`		`- supportLibraryVersion = '25.1.1'`
	`14`	`+ supportLibraryVersion = '25.2.0'`
`15`	`15`	`}`