Skip to content

Commit 2369c58

Browse files
author
josefhruska
committed
CR fix firebase#3
1 parent 151a332 commit 2369c58

18 files changed

+19
-40
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<item name="colorAccent">@color/colorAccent</item>
77
</style>
88

9-
<style name="AppTheme.NoToolbar" parent="Theme.AppCompat.Light.NoActionBar">
9+
<style name="AppTheme.NoToolbar">
1010
<item name="windowActionBar">false</item>
1111
<item name="windowNoTitle">true</item>
1212
</style>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
147147
if (savedInstanceState != null) {
148148
return;
149149
}
150+
150151
// Check for email
151152
String email = getArguments().getString(ExtraConstants.EXTRA_EMAIL);
152153
if (!TextUtils.isEmpty(email)) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import android.support.annotation.RestrictTo;
2121
import android.support.design.widget.TextInputLayout;
2222
import android.support.v4.app.FragmentTransaction;
23-
import android.support.v7.widget.Toolbar;
2423

2524
import com.firebase.ui.auth.IdpResponse;
2625
import com.firebase.ui.auth.R;
@@ -145,5 +144,4 @@ private void setSlideAnimation() {
145144
// Make the next activity slide in
146145
overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
147146
}
148-
149147
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
9292
}
9393
}
9494

95-
@Override
96-
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
97-
super.onViewCreated(view, savedInstanceState);
98-
if (!mPasswordInput.isHintAnimationEnabled()) {
99-
mPasswordInput.setHintAnimationEnabled(true);
100-
((TextInputLayout) getView().findViewById(R.id.name_layout)).setHintAnimationEnabled(true);
101-
mEmailInput.setHintAnimationEnabled(true);
102-
}
103-
}
104-
10595
@Nullable
10696
@Override
10797
public View onCreateView(LayoutInflater inflater,

auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/EmailFieldValidator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ public EmailFieldValidator(TextInputLayout errorContainer) {
3232
public boolean isValid(CharSequence charSequence) {
3333
return Patterns.EMAIL_ADDRESS.matcher(charSequence).matches();
3434
}
35-
3635
}

auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ public PasswordFieldValidator(TextInputLayout errorContainer, int minLength) {
3232
public boolean isValid(CharSequence charSequence) {
3333
return charSequence.length() >= mMinLength;
3434
}
35-
3635
}

auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/RequiredFieldValidator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.firebase.ui.auth.R;
2020

2121
public class RequiredFieldValidator extends BaseValidator {
22-
2322
public RequiredFieldValidator(TextInputLayout errorContainer) {
2423
super(errorContainer);
2524
mErrorMessage = mErrorContainer.getResources().getString(R.string.required_field);
@@ -29,5 +28,4 @@ public RequiredFieldValidator(TextInputLayout errorContainer) {
2928
public boolean isValid(CharSequence charSequence) {
3029
return charSequence != null && charSequence.length() > 0;
3130
}
32-
3331
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33
<item>
44
<shape android:shape="rectangle">
5-
<corners android:radius="3dp" />
6-
<solid android:color="#747474" />
5+
<corners android:radius="3dp"/>
6+
<solid android:color="#D0021B"/>
77
</shape>
88
</item>
99
</selector>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
android:layout_width="match_parent"
45
android:layout_height="match_parent"
56
android:clipToPadding="false"
@@ -32,7 +33,7 @@
3233
<RelativeLayout
3334
android:layout_width="0dp"
3435
android:layout_height="match_parent"
35-
android:layout_weight="1">
36+
android:layout_weight="1.0">
3637

3738
<LinearLayout
3839
android:id="@+id/btn_holder"
@@ -51,6 +52,7 @@
5152
android:layout_marginBottom="0dp"
5253
android:layout_width="match_parent"
5354
android:visibility="gone"
55+
tools:visibility="visible"
5456
android:layout_gravity="center"
5557
android:text="@string/idp_name_email" />
5658

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
</android.support.design.widget.TextInputLayout>
2929

30-
<TextView
30+
<Button
3131
android:id="@+id/button_next"
3232
style="@style/FirebaseUI.FullWidthButtonSettleUp"
3333
android:layout_alignParentBottom="true"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
android:gravity="end"
3737
android:paddingTop="194dp">
3838

39-
<TextView
39+
<Button
4040
android:id="@+id/button_done"
4141
style="@style/FirebaseUI.FullWidthButtonSettleUp"
4242
android:text="@string/button_text_send" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797

9898
</ScrollView>
9999

100-
<TextView
100+
<Button
101101
android:id="@+id/button_create"
102102
style="@style/FirebaseUI.FullWidthButtonSettleUp"
103103
android:text="@string/sign_up" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
style="@style/FirebaseUI.WrapperStyle"
5-
android:orientation="vertical"
65
android:paddingLeft="0dp"
7-
android:paddingRight="0dp">
6+
android:paddingRight="0dp"
7+
android:orientation="vertical">
88

99
<TextView
1010
android:paddingLeft="32dp"
@@ -20,7 +20,7 @@
2020
android:paddingRight="32dp"
2121
tools:text="Good news! You've already used [email protected]. Sign in with Google to continue to SuperApp" />
2222

23-
<TextView
23+
<Button
2424
android:id="@+id/welcome_back_idp_button"
2525
style="@style/FirebaseUI.FullWidthButtonSettleUp"
2626
android:layout_alignParentBottom="true"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
android:layout_weight="1"
5252
android:text="@string/trouble_signing_in" />
5353

54-
<TextView
54+
<Button
5555
android:id="@+id/button_done"
5656
style="@style/FirebaseUI.FullWidthButtonSettleUp"
5757
android:text="@string/sign_in_default" />

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,6 @@
247247
<item name="android:textColor">@color/gray_3</item>
248248
</style>
249249

250-
<style name="Toolbar" parent="@style/ThemeOverlay.AppCompat.ActionBar">
251-
<!-- Customize color of navigation drawer icon and back arrow -->
252-
<item name="colorControlNormal">@color/whiteColor</item>
253-
</style>
254-
255250
<style name="FirebaseUI.FullWidthButtonSettleUp" parent="FirebaseUI.Text">
256251
<item name="android:background">@drawable/ripple_background</item>
257252
<item name="android:fitsSystemWindows">true</item>

auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import android.content.Intent;
1818
import android.widget.Button;
19-
import android.widget.TextView;
2019

2120
import com.firebase.ui.auth.BuildConfig;
2221
import com.firebase.ui.auth.R;
@@ -61,7 +60,7 @@ private RecoverPasswordActivity createActivity() {
6160
@Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
6261
public void testNextButton_sendsEmail() {
6362
RecoverPasswordActivity recoverPasswordActivity = createActivity();
64-
TextView nextButton = (TextView) recoverPasswordActivity.findViewById(R.id.button_done);
63+
Button nextButton = (Button) recoverPasswordActivity.findViewById(R.id.button_done);
6564
when(ActivityHelperShadow.sFirebaseAuth.sendPasswordResetEmail(TestConstants.EMAIL))
6665
.thenReturn(new AutoCompleteTask<Void>(null, true, null));
6766
nextButton.performClick();

auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import android.support.design.widget.TextInputLayout;
2020
import android.widget.Button;
2121
import android.widget.EditText;
22-
import android.widget.TextView;
2322

2423
import com.firebase.ui.auth.AuthUI;
2524
import com.firebase.ui.auth.BuildConfig;
@@ -80,7 +79,7 @@ public void testSignUpButton_validatesFields() {
8079
// Trigger RegisterEmailFragment (bypass check email)
8180
registerEmailActivity.onNewUser(new User.Builder(TestConstants.EMAIL).build());
8281

83-
TextView button = (TextView) registerEmailActivity.findViewById(R.id.button_create);
82+
Button button = (Button) registerEmailActivity.findViewById(R.id.button_create);
8483
button.performClick();
8584

8685
TextInputLayout nameLayout = (TextInputLayout)
@@ -142,7 +141,7 @@ public void testSignUpButton_successfulRegistrationShouldContinueToSaveCredentia
142141
true,
143142
null));
144143

145-
TextView button = (TextView) registerEmailActivity.findViewById(R.id.button_create);
144+
Button button = (Button) registerEmailActivity.findViewById(R.id.button_create);
146145
button.performClick();
147146

148147
TestHelper.verifySmartLockSave(

auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import android.support.design.widget.TextInputLayout;
1919
import android.widget.Button;
2020
import android.widget.EditText;
21-
import android.widget.TextView;
2221

2322
import com.firebase.ui.auth.BuildConfig;
2423
import com.firebase.ui.auth.IdpResponse;
@@ -78,7 +77,7 @@ private WelcomeBackPasswordPrompt createActivity() {
7877
@Test
7978
public void testSignInButton_validatesFields() {
8079
WelcomeBackPasswordPrompt welcomeBack = createActivity();
81-
TextView signIn = (TextView) welcomeBack.findViewById(R.id.button_done);
80+
Button signIn = (Button) welcomeBack.findViewById(R.id.button_done);
8281
signIn.performClick();
8382
TextInputLayout passwordLayout =
8483
(TextInputLayout) welcomeBack.findViewById(R.id.password_layout);
@@ -114,7 +113,7 @@ public void testSignInButton_signsInAndSavesCredentials() {
114113
when(mockFirebaseUser.getEmail()).thenReturn(TestConstants.EMAIL);
115114
when(mockFirebaseUser.getPhotoUrl()).thenReturn(TestConstants.PHOTO_URI);
116115

117-
TextView signIn = (TextView) welcomeBackActivity.findViewById(R.id.button_done);
116+
Button signIn = (Button) welcomeBackActivity.findViewById(R.id.button_done);
118117
signIn.performClick();
119118

120119
verify(ActivityHelperShadow.sFirebaseAuth).signInWithEmailAndPassword(

0 commit comments

Comments
 (0)