Skip to content

Commit 208659d

Browse files
lsiracsamtstern
authored andcommitted
Added ToS/Pp footer to all screens in log in flow (#1303)
1 parent 66be717 commit 208659d

6 files changed

+31
-8
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@
2626
import android.support.v7.app.AlertDialog;
2727
import android.view.View;
2828
import android.widget.EditText;
29+
import android.widget.TextView;
2930

3031
import com.firebase.ui.auth.R;
3132
import com.firebase.ui.auth.data.model.FlowParameters;
3233
import com.firebase.ui.auth.ui.AppCompatBase;
3334
import com.firebase.ui.auth.util.ExtraConstants;
35+
import com.firebase.ui.auth.util.data.PrivacyDisclosureUtils;
3436
import com.firebase.ui.auth.util.ui.ImeHelper;
3537
import com.firebase.ui.auth.util.ui.fieldvalidators.EmailFieldValidator;
3638
import com.firebase.ui.auth.viewmodel.ResourceObserver;
@@ -94,6 +96,9 @@ protected void onFailure(@NonNull Exception e) {
9496

9597
ImeHelper.setImeOnDoneListener(mEmailEditText, this);
9698
findViewById(R.id.button_done).setOnClickListener(this);
99+
100+
TextView footerText = findViewById(R.id.email_footer_tos_and_pp_text);
101+
PrivacyDisclosureUtils.setupTermsOfServiceFooter(this, getFlowParams(), footerText);
97102
}
98103

99104
@Override

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import com.firebase.ui.auth.data.model.FlowParameters;
4141
import com.firebase.ui.auth.ui.AppCompatBase;
4242
import com.firebase.ui.auth.util.ExtraConstants;
43+
import com.firebase.ui.auth.util.data.PrivacyDisclosureUtils;
4344
import com.firebase.ui.auth.util.data.ProviderUtils;
4445
import com.firebase.ui.auth.util.ui.ImeHelper;
4546
import com.firebase.ui.auth.viewmodel.ResourceObserver;
@@ -122,6 +123,9 @@ protected void onFailure(@NonNull Exception e) {
122123
mPasswordLayout.setError(getString(getErrorMessage(e)));
123124
}
124125
});
126+
127+
TextView footerText = findViewById(R.id.email_footer_tos_and_pp_text);
128+
PrivacyDisclosureUtils.setupTermsOfServiceFooter(this, getFlowParams(), footerText);
125129
}
126130

127131
@StringRes

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import com.firebase.ui.auth.data.remote.TwitterSignInHandler;
4242
import com.firebase.ui.auth.ui.AppCompatBase;
4343
import com.firebase.ui.auth.util.ExtraConstants;
44+
import com.firebase.ui.auth.util.data.PrivacyDisclosureUtils;
4445
import com.firebase.ui.auth.util.data.ProviderUtils;
4546
import com.firebase.ui.auth.viewmodel.ResourceObserver;
4647
import com.firebase.ui.auth.viewmodel.idp.LinkingSocialProviderResponseHandler;
@@ -165,6 +166,9 @@ protected void onFailure(@NonNull Exception e) {
165166
finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
166167
}
167168
});
169+
170+
TextView footerText = findViewById(R.id.email_footer_tos_and_pp_text);
171+
PrivacyDisclosureUtils.setupTermsOfServiceFooter(this, getFlowParams(), footerText);
168172
}
169173

170174
@Override

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:app="http://schemas.android.com/apk/res-auto"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent">
@@ -34,6 +33,10 @@
3433
android:layout_marginTop="@dimen/fui_field_padding_vert"
3534
android:text="@string/fui_button_text_send" />
3635

36+
<TextView
37+
android:id="@+id/email_footer_tos_and_pp_text"
38+
style="@style/FirebaseUI.PrivacyFooter" />
39+
3740
</LinearLayout>
3841

3942
</ScrollView>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:tools="http://schemas.android.com/tools"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent">
@@ -39,6 +38,10 @@
3938
style="@style/FirebaseUI.Button"
4039
android:text="@string/fui_sign_in_default" />
4140

41+
<TextView
42+
android:id="@+id/email_footer_tos_and_pp_text"
43+
style="@style/FirebaseUI.PrivacyFooter" />
44+
4245
</LinearLayout>
4346

4447
</LinearLayout>

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:app="http://schemas.android.com/apk/res-auto"
54
xmlns:tools="http://schemas.android.com/tools"
65
android:layout_width="match_parent"
@@ -59,18 +58,23 @@
5958
android:layout_height="wrap_content"
6059
android:layout_marginTop="@dimen/fui_field_padding_vert"
6160
android:text="@string/fui_trouble_signing_in"
62-
app:layout_constraintStart_toStartOf="parent"
6361
app:layout_constraintEnd_toStartOf="@+id/button_done"
62+
app:layout_constraintStart_toStartOf="parent"
6463
app:layout_constraintTop_toBottomOf="@+id/password_layout" />
6564

6665
<Button
6766
android:id="@+id/button_done"
6867
style="@style/FirebaseUI.Button"
6968
android:text="@string/fui_sign_in_default"
70-
app:layout_constraintStart_toEndOf="@+id/trouble_signing_in"
7169
app:layout_constraintEnd_toEndOf="parent"
70+
app:layout_constraintStart_toEndOf="@+id/trouble_signing_in"
7271
app:layout_constraintTop_toTopOf="@+id/trouble_signing_in" />
7372

73+
<TextView
74+
android:id="@+id/email_footer_tos_and_pp_text"
75+
style="@style/FirebaseUI.PrivacyFooter"
76+
app:layout_constraintTop_toBottomOf="@id/button_done" />
77+
7478
</android.support.constraint.ConstraintLayout>
7579

7680
</LinearLayout>

0 commit comments

Comments
 (0)