CR fix #2

Author: josefhruska

app/src/main/AndroidManifest.xml

@@ -34,9 +34,11 @@
         <!-- Auth UI demo -->
         <activity
             android:name=".auth.AuthUiActivity"
+            android:theme="@style/AppTheme.NoToolbar"
             android:label="@string/name_auth_ui"/>
         <activity
             android:name=".auth.SignedInActivity"
+            android:theme="@style/AppTheme.NoToolbar"
             android:label="@string/name_auth_ui"/>
 
         <!-- Storage UI demo-->

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

@@ -1,9 +1,12 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme.NoToolbar" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>

auth/src/main/AndroidManifest.xml

@@ -54,6 +54,7 @@
 
         <activity
             android:name=".ui.idp.AuthMethodPickerActivity"
+            android:theme="@style/FirebaseUI.NoToolbar"
             android:label="@string/default_toolbar_title"
             android:exported="false"/>
 

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

@@ -19,7 +19,6 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.DrawableRes;
-import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StyleRes;

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

@@ -16,11 +16,9 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.DrawableRes;
-import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
-import android.support.annotation.StringRes;
 import android.support.annotation.StyleRes;
 
 import com.firebase.ui.auth.AuthUI.IdpConfig;

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

@@ -57,9 +57,8 @@ public static Intent createIntent(Context context, FlowParameters flowParams, St
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTheme(R.style.FirebaseUI);
         setContentView(R.layout.activity_register_email);
-        setToolbar();
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         if (savedInstanceState != null) {
             return;
         }
@@ -147,14 +146,4 @@ private void setSlideAnimation() {
         overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
     }
 
-    private void setToolbar() {
-        try {
-            Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-            setSupportActionBar(toolbar);
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        } catch (IllegalStateException e) {
-            // It is handled correctly but there is something wrong with tests.
-        }
-    }
-
 }

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

@@ -120,17 +120,14 @@ private void populateIdpList(List<IdpConfig> providers) {
                 case GoogleAuthProvider.PROVIDER_ID:
                     loginButton = getLayoutInflater()
                             .inflate(R.layout.idp_button_google, btnHolder, false);
-                    btnHolder.invalidate();
                     break;
                 case FacebookAuthProvider.PROVIDER_ID:
                     loginButton = getLayoutInflater()
                             .inflate(R.layout.idp_button_facebook, btnHolder, false);
-                    btnHolder.invalidate();
                     break;
                 case TwitterAuthProvider.PROVIDER_ID:
                     loginButton = getLayoutInflater()
                             .inflate(R.layout.idp_button_twitter, btnHolder, false);
-                    btnHolder.invalidate();
                     break;
                 default:
                     Log.e(TAG, "No button for provider " + provider.getProviderId());

auth/src/main/res/drawable/edit_text_cursor_custom.xml renamed to auth/src/main/res/drawable/edit_text_cursor_settleup.xml

@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="3dp"/>
-            <solid android:color="#d0021b"/>
+            <solid android:color="#ffffff"/>
         </shape>
     </item>
 </selector>

auth/src/main/res/drawable/idp_button_background_google.xml

@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/whiteColor">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/gray_6"
-        app:theme="@style/Toolbar" />
-
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
         android:orientation="vertical">
 
         <FrameLayout

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

@@ -23,7 +23,7 @@
         <android.support.design.widget.TextInputEditText
             android:id="@+id/email"
             style="@style/FirebaseUI.EditText.EmailField"
-            android:textCursorDrawable="@drawable/edit_text_cursor_custom" />
+            android:textCursorDrawable="@drawable/edit_text_cursor_settleup" />
 
     </android.support.design.widget.TextInputLayout>
 

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

@@ -15,12 +15,12 @@
     <android.support.design.widget.TextInputLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/email_layout"
         style="@style/FirebaseUI.Text.TextInputLayout"
+        android:paddingTop="16dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/body_text"
         android:paddingLeft="32dp"
         android:paddingRight="32dp"
-        android:paddingTop="16dp"
         app:errorTextAppearance="@style/FirebaseUI.Text.ErrorText"
         app:hintTextAppearance="@style/FirebaseUI.Text.HintText">
 

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

@@ -60,7 +60,7 @@
                 <android.support.design.widget.TextInputEditText
                     android:id="@+id/email"
                     style="@style/FirebaseUI.EditText.EmailField"
-                    android:textCursorDrawable="@drawable/edit_text_cursor_custom" />
+                    android:textCursorDrawable="@drawable/edit_text_cursor_settleup" />
 
             </android.support.design.widget.TextInputLayout>
 
@@ -82,7 +82,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:imeOptions="actionDone"
-                    android:textCursorDrawable="@drawable/edit_text_cursor_custom" />
+                    android:textCursorDrawable="@drawable/edit_text_cursor_settleup" />
 
             </android.support.design.widget.TextInputLayout>
 

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

@@ -15,6 +15,11 @@
         <item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
     </style>
 
+    <style name="FirebaseUI.NoToolbar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
     <style name="FirebaseUI.Transparent" parent="FirebaseUI">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>