Merge branch 'master' into version-1.0.0-dev

samtstern · samtstern · commit 73571fb0a8e2 · 2016-10-13T14:34:03.000-07:00
Change-Id: I09194ea6d170f8d1fa0aa0d7d8e7d20367e55aba
diff --git a/.travis.yml b/.travis.yml
@@ -5,15 +5,13 @@ android:
   components:
     - platform-tools
     - tools
-    - build-tools-23.0.3
-    - android-23
+    - build-tools-24.0.3
+    - android-24
+
+    # Extras
     - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
     - addon-google_apis-google-24
-  licenses:
-    - 'android-sdk-preview-license-52d11cd2'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
 script:
   - ./gradlew clean :library:testAll :library:prepareArtifacts
diff --git a/README.md b/README.md
@@ -27,17 +27,17 @@ libraries.
 
 ```groovy
 dependencies {
-    // Single target that includes all FirebaseUI libraries
-    compile 'com.firebaseui:firebase-ui:0.6.0'
-
     // FirebaseUI Database only
-    compile 'com.firebaseui:firebase-ui-database:0.6.0'
+    compile 'com.firebaseui:firebase-ui-database:0.6.1'
 
     // FirebaseUI Auth only
-    compile 'com.firebaseui:firebase-ui-auth:0.6.0'
+    compile 'com.firebaseui:firebase-ui-auth:0.6.1'
 
     // FirebaseUI Storage only
-    compile 'com.firebaseui:firebase-ui-storage:0.6.0'
+    compile 'com.firebaseui:firebase-ui-storage:0.6.1'
+
+    // Single target that includes all FirebaseUI libraries above
+    compile 'com.firebaseui:firebase-ui:0.6.1'
 }
 ```
 
@@ -59,14 +59,15 @@ firebase-ui-storage
 ```
 
 Each version of FirebaseUI has dependency on a fixed version of these libraries, defined as the variable `firebase_version`
-in `common/constants.gradle`.  If you are using any dependencies in your app of the form 
+in `common/constants.gradle`.  If you are using any dependencies in your app of the form
 `compile 'com.google.firebase:firebase-*:x.y.z'` or `compile 'com.google.android.gms:play-services-*:x.y.z'`
 you need to make sure that you use the same version that your chosen version of FirebaseUI requires.
 
 For convenience, here are some examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
+| 0.6.1              | 9.6.1                          |
 | 0.6.0              | 9.6.0                          |
 | 0.5.3              | 9.4.0                          |
 | 0.4.4              | 9.4.0                          |
diff --git a/auth/README.md b/auth/README.md
@@ -43,18 +43,18 @@ Gradle, add:
 
 ```groovy
 dependencies {
-  // ...
-  compile 'com.firebaseui:firebase-ui-auth:0.6.0'
+    // ...
+    compile 'com.firebaseui:firebase-ui-auth:0.6.1'
 }
 ```
 
 If instead your project uses Maven, add:
 
 ```xml
 <dependency>
-  <groupId>com.firebaseui</groupId>
-  <artifactId>firebase-ui-auth</artifactId>
-  <version>0.6.0</version>
+    <groupId>com.firebaseui</groupId>
+    <artifactId>firebase-ui-auth</artifactId>
+    <version>0.6.1</version>
 </dependency>
 ```
 
@@ -72,8 +72,8 @@ the [Facebook developer dashboard](https://developers.facebook.com):
 
 ```xml
 <resources>
-  <!-- ... -->
-  <string name="facebook_application_id" translatable="false">APPID</string>
+    <!-- ... -->
+    <string name="facebook_application_id" translatable="false">APPID</string>
 </resources>
 ```
 
@@ -98,9 +98,9 @@ whether a
 ```java
 FirebaseAuth auth = FirebaseAuth.getInstance();
 if (auth.getCurrentUser() != null) {
-  // already signed in
+    // already signed in
 } else {
-  // not signed in
+    // not signed in
 }
 ```
 
@@ -260,17 +260,17 @@ completed once all necessary sign-out operations are completed:
 
 ```java
 public void onClick(View v) {
-  if (v.getId() == R.id.sign_out) {
-      AuthUI.getInstance()
-          .signOut(this)
-          .addOnCompleteListener(new OnCompleteListener<Void>() {
+if (v.getId() == R.id.sign_out) {
+    AuthUI.getInstance()
+        .signOut(this)
+        .addOnCompleteListener(new OnCompleteListener<Void>() {
             public void onComplete(@NonNull Task<Void> task) {
-              // user is now signed out
-              startActivity(new Intent(MyActivity.this, SignInActivity.class));
-              finish();
+                // user is now signed out
+                startActivity(new Intent(MyActivity.this, SignInActivity.class));
+                finish();
             }
-          });
-  }
+        });
+    }
 }
 ```
 
@@ -358,8 +358,8 @@ redefine a string to change it, for example:
 
 ```java
 <resources>
-  <!-- was "Signing up..." -->
-  <string name="progress_dialog_signing_up">Creating your shiny new account...</string>
+    <!-- was "Signing up..." -->
+    <string name="progress_dialog_signing_up">Creating your shiny new account...</string>
 </resources>
 ```
 
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -32,9 +32,11 @@ android {
 
 dependencies {
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile "org.robolectric:robolectric:3.1.1"
-    compile "com.android.support:appcompat-v7:${project.ext.support_library_version}"
+    testCompile 'org.mockito:mockito-core:2.2.0'
+    testCompile 'org.robolectric:robolectric:3.1.2'
+    // See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
+    testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
+    
     compile 'com.facebook.android:facebook-android-sdk:4.14.1'
     compile("com.twitter.sdk.android:twitter:2.0.0@aar") {
         transitive = true;
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java
@@ -90,8 +90,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (mIdpProvider == null) {
             getIntent().putExtra(
                     ExtraConstants.EXTRA_ERROR_MESSAGE,
-                    "Firebase login successful. Account linking failed due to provider not "
-                            + "enabled by application");
+                    "Firebase login successful. Account linking failed due to provider not enabled by application");
             finish(RESULT_CANCELED, getIntent());
             return;
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java
@@ -82,6 +82,8 @@ protected void onCreate(Bundle savedInstanceState) {
         TextView bodyTextView = ((TextView) findViewById(R.id.welcome_back_password_body));
         bodyTextView.setText(spannableStringBuilder);
 
+        ((TextInputLayout) findViewById(R.id.password_layout)).setPasswordVisibilityToggleEnabled(false);
+
         // Click listeners
         findViewById(R.id.button_done).setOnClickListener(this);
         findViewById(R.id.toggle_visibility).setOnClickListener(
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/ImageFocusTransparencyChanger.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/ImageFocusTransparencyChanger.java
@@ -39,6 +39,5 @@ public void onFocusChange(View v, boolean hasFocus) {
         } else {
             mTogglePasswordImage.setAlpha(mSlightlyVisible);
         }
-
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
@@ -66,7 +66,6 @@ public class RegisterEmailActivity extends AppCompatBase implements View.OnClick
     private EmailFieldValidator mEmailFieldValidator;
     private PasswordFieldValidator mPasswordFieldValidator;
     private RequiredFieldValidator mNameValidator;
-    private ImageView mTogglePasswordImage;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -83,14 +82,15 @@ protected void onCreate(Bundle savedInstanceState) {
         getResources().getValue(R.dimen.slightly_visible_icon, slightlyVisibleIcon, true);
 
         mPasswordEditText = (EditText) findViewById(R.id.password);
-        mTogglePasswordImage = (ImageView) findViewById(R.id.toggle_visibility);
+        ((TextInputLayout) findViewById(R.id.password_layout)).setPasswordVisibilityToggleEnabled(false);
+        ImageView togglePasswordImage = (ImageView) findViewById(R.id.toggle_visibility);
 
         mPasswordEditText.setOnFocusChangeListener(new ImageFocusTransparencyChanger(
-                mTogglePasswordImage,
+                togglePasswordImage,
                 visibleIcon.getFloat(),
                 slightlyVisibleIcon.getFloat()));
 
-        mTogglePasswordImage.setOnClickListener(new PasswordToggler(mPasswordEditText));
+        togglePasswordImage.setOnClickListener(new PasswordToggler(mPasswordEditText));
 
         mNameEditText = (EditText) findViewById(R.id.name);
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/SignInActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/SignInActivity.java
@@ -50,7 +50,6 @@ public class SignInActivity extends AppCompatBase implements View.OnClickListene
     private EditText mPasswordEditText;
     private EmailFieldValidator mEmailValidator;
     private RequiredFieldValidator mPasswordValidator;
-    private ImageView mTogglePasswordImage;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -68,14 +67,15 @@ protected void onCreate(Bundle savedInstanceState) {
         getResources().getValue(R.dimen.slightly_visible_icon, slightlyVisibleIcon, true);
 
         mPasswordEditText = (EditText) findViewById(R.id.password);
-        mTogglePasswordImage = (ImageView) findViewById(R.id.toggle_visibility);
+        ((TextInputLayout) findViewById(R.id.password_layout)).setPasswordVisibilityToggleEnabled(false);
+        ImageView togglePasswordImage = (ImageView) findViewById(R.id.toggle_visibility);
 
         mPasswordEditText.setOnFocusChangeListener(new ImageFocusTransparencyChanger(
-                mTogglePasswordImage,
+                togglePasswordImage,
                 visibleIcon.getFloat(),
                 slightlyVisibleIcon.getFloat()));
 
-        mTogglePasswordImage.setOnClickListener(new PasswordToggler(mPasswordEditText));
+        togglePasswordImage.setOnClickListener(new PasswordToggler(mPasswordEditText));
 
         mEmailValidator = new EmailFieldValidator((TextInputLayout) findViewById(R.id
                 .email_layout));
diff --git a/auth/src/main/res/layout/sign_in_layout.xml b/auth/src/main/res/layout/sign_in_layout.xml
@@ -34,7 +34,7 @@
         android:layout_height="wrap_content">
 
         <EditText
-            style="@style/FirebaseUI.EditText"
+            style="@style/FirebaseUI.EditText.PasswordField"
             android:id="@+id/password"
             android:hint="@string/password_hint"
             />
diff --git a/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml b/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml
@@ -28,7 +28,7 @@
             android:layout_height="wrap_content">
 
             <EditText
-                style="@style/FirebaseUI.EditText"
+                style="@style/FirebaseUI.EditText.PasswordField"
                 android:id="@+id/password"
                 android:hint="@string/password_hint"
                 />
diff --git a/auth/src/main/res/values/styles.xml b/auth/src/main/res/values/styles.xml
@@ -160,7 +160,7 @@
         <item name="android:inputType">textPassword</item>
     </style>
 
-    <style name="FirebaseUI.ImageView"></style>
+    <style name="FirebaseUI.ImageView"/>
 
     <style name="FirebaseUI.ImageView.VisibilityToggle">
         <item name="android:layout_marginBottom">12dp</item>
diff --git a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
@@ -14,8 +14,6 @@
 
 package com.firebase.ui.auth;
 
-import static junit.framework.Assert.assertEquals;
-
 import android.content.Intent;
 
 import com.firebase.ui.auth.test_helpers.CustomRobolectricGradleTestRunner;
@@ -31,8 +29,10 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import static junit.framework.Assert.assertEquals;
+
 @RunWith(CustomRobolectricGradleTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
+@Config(constants = BuildConfig.class, sdk = 23)
 public class AuthUITest {
     private FirebaseApp mFirebaseApp;
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/test_helpers/CustomRobolectricGradleTestRunner.java b/auth/src/test/java/com/firebase/ui/auth/test_helpers/CustomRobolectricGradleTestRunner.java
@@ -23,11 +23,11 @@
 import com.firebase.ui.auth.util.FirebaseAuthWrapperImpl;
 
 import org.junit.runners.model.InitializationError;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.internal.bytecode.InstrumentationConfiguration;
 
-public class CustomRobolectricGradleTestRunner extends RobolectricGradleTestRunner {
+public class CustomRobolectricGradleTestRunner extends RobolectricTestRunner {
     public CustomRobolectricGradleTestRunner(Class<?> klass) throws InitializationError {
         super(klass);
     }
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/ChooseAccountActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/ChooseAccountActivityTest.java
@@ -53,7 +53,7 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(CustomRobolectricGradleTestRunner.class)
-@Config(constants = BuildConfig.class, shadows = {ActivityHelperShadow.class}, sdk = 21)
+@Config(constants = BuildConfig.class, shadows = {ActivityHelperShadow.class}, sdk = 23)
 public class ChooseAccountActivityTest {
     private FirebaseApp mFirebaseApp;
     @Mock private CredentialsAPI mCredentialsAPI;
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java
@@ -14,18 +14,14 @@
 
 package com.firebase.ui.auth.ui.email;
 
-import static junit.framework.Assert.assertEquals;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import android.content.Intent;
 import android.widget.Button;
 
+import com.firebase.ui.auth.BuildConfig;
+import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.test_helpers.ActivityHelperShadow;
 import com.firebase.ui.auth.test_helpers.AutoCompleteTask;
-import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.test_helpers.CustomRobolectricGradleTestRunner;
-import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.test_helpers.TestConstants;
 import com.firebase.ui.auth.test_helpers.TestHelper;
 import com.firebase.ui.auth.ui.ExtraConstants;
@@ -40,8 +36,12 @@
 
 import java.util.Collections;
 
+import static junit.framework.Assert.assertEquals;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(CustomRobolectricGradleTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
+@Config(constants = BuildConfig.class, sdk = 23)
 public class RecoverPasswordActivityTest {
 
     @Before
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
@@ -53,7 +53,7 @@
 
 
 @RunWith(CustomRobolectricGradleTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
+@Config(constants = BuildConfig.class, sdk = 23)
 public class RegisterEmailActivityTest {
 
     private RegisterEmailActivity createActivity(String email) {
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInActivityTest.java
@@ -51,7 +51,7 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(CustomRobolectricGradleTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
+@Config(constants = BuildConfig.class, sdk = 23)
 public class SignInActivityTest {
 
     @Before
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInNoPasswordActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInNoPasswordActivityTest.java
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
diff --git a/auth/src/test/java/com/firebase/ui/auth/util/HeadlessAPIWrapperImplTest.java b/auth/src/test/java/com/firebase/ui/auth/util/HeadlessAPIWrapperImplTest.java
diff --git a/common/constants.gradle b/common/constants.gradle
diff --git a/database/README.md b/database/README.md
diff --git a/storage/README.md b/storage/README.md

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,5 @@ public void onFocusChange(View v, boolean hasFocus) {`
`39`	`39`	`} else {`
`40`	`40`	`mTogglePasswordImage.setAlpha(mSlightlyVisible);`
`41`	`41`	`}`
`42`		`-`
`43`	`42`	`}`
`44`	`43`	`}`