Merge branch 'master' into version-3.0.1-dev

Change-Id: Ibb982a03e14834cf16a0624aac55f6ebc4680330

Author: samtstern

.travis.yml

@@ -10,18 +10,14 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
     - $HOME/.android/build-cache
-before_install:
-  - mkdir "$ANDROID_HOME/licenses" || true
-  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
 android:
   components:
     # https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
     - tools
     - tools
 before_script:
   - mv library/google-services.json app/google-services.json
-  - ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;26.0.1" "platforms;android-26" "extras;google;m2repository"
+  - echo y | ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;26.0.1" "platforms;android-26" "extras;google;m2repository"
 script: ./gradlew clean assembleDebug check
 after_failure:
   # tests

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -23,6 +23,7 @@
 import android.support.annotation.StyleRes;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AppCompatDelegate;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -193,6 +194,10 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
         if (isGoogleMisconfigured() || isFacebookMisconfigured() || isTwitterMisconfigured()) {
             showSnackbar(R.string.configuration_required);
         }
+
+        if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
+            mUseDarkTheme.setChecked(true);
+        }
     }
 
     @OnClick(R.id.sign_in)
@@ -281,22 +286,26 @@ private void setFacebookScopesEnabled(boolean enabled) {
         mFacebookScopePhotos.setEnabled(enabled);
     }
 
+    @OnClick({R.id.default_theme, R.id.purple_theme, R.id.green_theme, R.id.dark_theme})
+    public void toggleDarkTheme() {
+        int mode = mUseDarkTheme.isChecked() ?
+                AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_AUTO;
+        AppCompatDelegate.setDefaultNightMode(mode);
+        getDelegate().setLocalNightMode(mode);
+    }
+
     @MainThread
     @StyleRes
     private int getSelectedTheme() {
-        if (mUseDefaultTheme.isChecked()) {
-            return AuthUI.getDefaultTheme();
+        if (mUseGreenTheme.isChecked()) {
+            return R.style.GreenTheme;
         }
 
         if (mUsePurpleTheme.isChecked()) {
             return R.style.PurpleTheme;
         }
 
-        if (mUseDarkTheme.isChecked()) {
-            return R.style.DarkTheme;
-        }
-
-        return R.style.GreenTheme;
+        return AuthUI.getDefaultTheme();
     }
 
     @MainThread

app/src/main/res/values-night/colors.xml

@@ -0,0 +1,4 @@
+<resources>
+    <color name="colorPrimary">#016AA8</color>
+    <color name="colorPrimaryDark">#01579B</color>
+</resources>

app/src/main/res/values-v21/styles.xml

@@ -3,12 +3,6 @@
     <color name="colorPrimaryDark">#0288D1</color>
     <color name="colorAccent">#FFA000</color>
 
-    <!-- Text -->
-    <color name="text_default_material_dark_primary">#ffffffff</color>
-    <color name="text_default_material_light_primary">#de000000</color>
-    <color name="text_default_material_dark_secondary">#b3ffffff</color>
-    <color name="text_default_material_light_secondary">#8a000000</color>
-
     <color name="material_deep_purple_50">#EDE7F6</color>
     <color name="material_deep_purple_500">#673AB7</color>
     <color name="material_deep_purple_700">#512DA8</color>
@@ -20,15 +14,9 @@
 
     <color name="material_gray_300">#E0E0E0</color>
     <color name="material_gray_500">#9e9e9e</color>
-    <color name="material_gray_850">#ff303030</color>
-    <color name="material_gray_900">#ff212121</color>
 
     <color name="material_lime_a700">#AEEA00</color>
-
-    <color name="material_purple_50">#F3E5F5</color>
     <color name="material_purple_a700">#AA00FF</color>
-
     <color name="material_red_a200">#FF5252</color>
 
-    <color name="material_deep_teal_a200">#ff80cbc4</color>
 </resources>

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

@@ -21,20 +21,6 @@
         <item name="android:windowBackground">@color/material_green_50</item>
     </style>
 
-    <style name="DarkTheme">
-        <item name="colorPrimary">@color/material_gray_900</item>
-        <item name="colorPrimaryDark">@android:color/black</item>
-        <item name="colorAccent">@android:color/black</item>
-        <item name="android:colorBackground">@color/material_gray_850</item>
-        <item name="android:colorForeground">@android:color/white</item>
-        <item name="android:textColor">@color/text_default_material_dark_primary</item>
-        <item name="android:textColorPrimary">@color/text_default_material_dark_primary</item>
-        <item name="android:textColorPrimaryInverse">@color/text_default_material_light_primary</item>
-        <item name="android:textColorSecondary">@color/text_default_material_dark_secondary</item>
-        <item name="android:textColorSecondaryInverse">@color/text_default_material_light_secondary</item>
-        <item name="android:windowBackground">@color/material_gray_850</item>
-    </style>
-
     <style name="WarnButton" parent="Widget.AppCompat.Button.Colored">
         <item name="colorButtonNormal">@color/material_red_a200</item>
         <item name="android:textColor">@android:color/white</item>

app/src/main/res/values/styles.xml

@@ -49,7 +49,7 @@ dependencies {
     compile 'com.firebaseui:firebase-ui-auth:3.0.0'
 
     // Required only if Facebook login support is required
-    compile('com.facebook.android:facebook-android-sdk:4.26.0')
+    compile 'com.facebook.android:facebook-login:4.27.0'
 
     // Required only if Twitter login support is required
     compile("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }

auth/README.md

@@ -35,7 +35,7 @@ dependencies {
 }
 
 /**
- * Returns list of tasks names that prepareArtfacts should depend on.
+ * Returns list of tasks names that prepareArtifacts should depend on.
  */
 def prepareArtifactsTasks() {
     return submodules.collect { name ->

library/build.gradle

@@ -19,7 +19,7 @@ To load an image from a `StorageReference`, first register in your `AppGlideModu
 public class MyAppGlideModule extends AppGlideModule {
 
     @Override
-    public void registerComponents(Context context, Registry registry) {
+    public void registerComponents(Context context, Glide glide, Registry registry) {
         // Register FirebaseImageLoader to handle StorageReference
         registry.append(StorageReference.class, InputStream.class,
                 new FirebaseImageLoader.Factory());
@@ -38,11 +38,13 @@ ImageView imageView = ...;
 
 // Download directly from StorageReference using Glide
 // (See MyAppGlideModule for Loader registration)
-GlidApp.with(this /* context */)
+GlideApp.with(this /* context */)
         .load(storageReference)
         .into(imageView);
 ```
 
+If GlideApp is not an importable class, build your application first before trying to use. For more information, see Glide v4 ['Generated API'][generated-api] documentation.
+
 Images displayed using `FirebaseImageLoader` are cached by their path in Cloud Storage, so
 repeated loads will be fast and conserve bandwidth. For more information on caching in Glide,
 see [this guide][glide-caching].
@@ -51,3 +53,4 @@ see [this guide][glide-caching].
 [glide]: https://github.com/bumptech/glide
 [storage-reference]: https://firebase.google.com/docs/reference/android/com/google/firebase/storage/StorageReference
 [glide-caching]: https://github.com/bumptech/glide/wiki/Caching-and-Cache-Invalidation
+[generated-api]: https://bumptech.github.io/glide/doc/generatedapi.html