CR fix firebase#5

Author: josefhruska

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

@@ -21,6 +21,7 @@
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
+
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ui.AppCompatBase;

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

@@ -85,7 +85,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (logoId == AuthUI.NO_LOGO) {
             findViewById(R.id.logo_layout).setVisibility(View.GONE);
         } else {
-            ImageView logo = (ImageView) findViewById(R.id.logo_layout);
+            ImageView logo = (ImageView) findViewById(R.id.logo_layout); // We can't wrap this view into linear layout so we have to change its id to avoid conflicts in tests.
             logo.setImageResource(logoId);
         }
     }

auth/src/main/res/layout-land/auth_method_picker_layout.xml

@@ -35,6 +35,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1.0">
 
+
         <LinearLayout
             android:id="@+id/btn_holder"
             style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"

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

@@ -39,8 +39,8 @@
         android:paddingTop="194dp">
 
         <Button
-            android:id="@+id/button_done"
             style="@style/FirebaseUI.FullWidthButtonSettleUp"
+            android:id="@+id/button_done"
             android:text="@string/button_text_send" />
 
     </LinearLayout>

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

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/FirebaseUI.WrapperStyle"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    style="@style/FirebaseUI.WrapperStyle">
 
     <TextView
-        style="@style/FirebaseUI.Text.Heading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        style="@style/FirebaseUI.Text.Heading"
         android:text="@string/welcome_back_email_header" />
 
     <TextView
@@ -21,8 +21,8 @@
         android:layout_height="wrap_content">
 
         <android.support.design.widget.TextInputLayout
-            xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/password_layout"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
             style="@style/FirebaseUI.Text.TextInputLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -32,31 +32,31 @@
             app:passwordToggleEnabled="true">
 
             <android.support.design.widget.TextInputEditText
-                android:id="@+id/password"
                 style="@style/FirebaseUI.EditText.PasswordField"
-                android:hint="@string/password_hint" />
+                android:id="@+id/password"
+                android:hint="@string/password_hint"/>
 
         </android.support.design.widget.TextInputLayout>
 
     </RelativeLayout>
 
     <LinearLayout
-        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_width="match_parent"
         android:paddingTop="16dp">
 
         <TextView
             android:id="@+id/trouble_signing_in"
-            style="@style/FirebaseUI.Text.Link"
+            android:text="@string/trouble_signing_in"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/trouble_signing_in" />
+            style="@style/FirebaseUI.Text.Link"/>
 
         <Button
-            android:id="@+id/button_done"
             style="@style/FirebaseUI.FullWidthButtonSettleUp"
-            android:text="@string/sign_in_default" />
+            android:text="@string/sign_in_default"
+            android:id="@+id/button_done"/>
 
     </LinearLayout>