Merge pull request #500 from SUPERCILEX/inflate-errors

samtstern · web-flow · commit 632b0e08c5ec · 2017-01-09T11:14:45.000-05:00
[HIGH PRIORITY] Fix inflation errors
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java b/auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java
@@ -20,6 +20,7 @@
 import android.support.annotation.RestrictTo;
 
 import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.firebase.auth.FirebaseUser;
 
@@ -33,6 +34,7 @@ public ActivityHelper(HelperActivityBase activity, Intent intent) {
     }
 
     public void configureTheme() {
+        mActivity.setTheme(R.style.FirebaseUI); // Provides default values
         mActivity.setTheme(getFlowParams().themeId);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import android.support.annotation.RestrictTo;`
`21`	`21`
`22`	`22`	`import com.firebase.ui.auth.IdpResponse;`
	`23`	`+import com.firebase.ui.auth.R;`
`23`	`24`	`import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;`
`24`	`25`	`import com.google.firebase.auth.FirebaseUser;`
`25`	`26`
`@@ -33,6 +34,7 @@ public ActivityHelper(HelperActivityBase activity, Intent intent) {`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`public void configureTheme() {`
	`37`	`+ mActivity.setTheme(R.style.FirebaseUI); // Provides default values`
`36`	`38`	`mActivity.setTheme(getFlowParams().themeId);`
`37`	`39`	`}`
`38`	`40`