Skip to content

Commit 5793bd8

Browse files
lsiraclsirac
committed
Minor fixes before merge
1 parent 420da68 commit 5793bd8

11 files changed

+35
-39
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ protected void onFailure(@NonNull Exception e) {
110110
});
111111

112112
TextView termsText = findViewById(R.id.main_tos_and_pp);
113-
PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicyText(AuthMethodPickerActivity.this,
113+
PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicyText(this,
114114
getFlowParams(),
115115
termsText);
116116
}

‎auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ public static SubmitConfirmationCodeFragment newInstance(FlowParameters flowPara
7474
@Override
7575
public View onCreateView(@NonNull LayoutInflater inflater,
7676
@Nullable ViewGroup container,
77-
@Nullable
78-
Bundle savedInstanceState) {
77+
@Nullable Bundle savedInstanceState) {
7978
View v = inflater.inflate(R.layout.fui_confirmation_code_layout, container, false);
8079
FragmentActivity parentActivity = getActivity();
8180

‎auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,15 +277,15 @@ private void setupPrivacyDisclosures(TextView footerText) {
277277
final String multipleProviderFlowText = getString(R.string.fui_sms_terms_of_service,
278278
verifyPhoneButtonText);
279279
FlowParameters flowParameters = getFlowParams();
280-
PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicySmsText(getContext(),
281-
flowParameters,
282-
mSmsTermsText,
283-
multipleProviderFlowText);
284-
285-
if (!flowParameters.isSingleProviderFlow()) {
280+
if (flowParameters.isSingleProviderFlow()) {
281+
PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicySmsText(getContext(),
282+
flowParameters,
283+
mSmsTermsText);
284+
} else {
286285
PrivacyDisclosureUtils.setupTermsOfServiceFooter(getContext(),
287286
flowParameters,
288287
footerText);
288+
mSmsTermsText.setText(multipleProviderFlowText);
289289
}
290290
}
291291

‎auth/src/main/java/com/firebase/ui/auth/util/data/PrivacyDisclosureUtils.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
public class PrivacyDisclosureUtils {
1414

1515
private static final int NO_TOS_OR_PP = -1;
16+
1617
public static void setupTermsOfServiceAndPrivacyPolicyText(Context context,
1718
FlowParameters flowParameters,
1819
TextView termsText) {
@@ -33,21 +34,16 @@ public static void setupTermsOfServiceFooter(Context context,
3334

3435
public static void setupTermsOfServiceAndPrivacyPolicySmsText(Context context,
3536
FlowParameters flowParameters,
36-
TextView termsText,
37-
String multipleProviderFlowSmsMsg) {
38-
if (flowParameters.isSingleProviderFlow()) {
39-
PreambleHandler.setup(context,
40-
flowParameters,
41-
R.string.fui_verify_phone_number,
42-
getTermsSmsStringResource(flowParameters),
43-
termsText);
44-
} else {
45-
termsText.setText(multipleProviderFlowSmsMsg);
46-
}
37+
TextView termsText) {
38+
PreambleHandler.setup(context,
39+
flowParameters,
40+
R.string.fui_verify_phone_number,
41+
getTermsSmsStringResource(flowParameters),
42+
termsText);
4743
}
4844

49-
private static @StringRes
50-
int getGlobalTermsStringResource(FlowParameters flowParameters) {
45+
@StringRes
46+
private static int getGlobalTermsStringResource(FlowParameters flowParameters) {
5147
boolean termsOfServiceUrlProvided = flowParameters.isTermsOfServiceUrlProvided();
5248
boolean privacyPolicyUrlProvided = flowParameters.isPrivacyPolicyUrlProvided();
5349
if (termsOfServiceUrlProvided && privacyPolicyUrlProvided) {
@@ -60,8 +56,8 @@ int getGlobalTermsStringResource(FlowParameters flowParameters) {
6056
return NO_TOS_OR_PP;
6157
}
6258

63-
private static @StringRes
64-
int getGlobalTermsFooterStringResource(FlowParameters flowParameters) {
59+
@StringRes
60+
private static int getGlobalTermsFooterStringResource(FlowParameters flowParameters) {
6561
boolean termsOfServiceUrlProvided = flowParameters.isTermsOfServiceUrlProvided();
6662
boolean privacyPolicyUrlProvided = flowParameters.isPrivacyPolicyUrlProvided();
6763
if (termsOfServiceUrlProvided && privacyPolicyUrlProvided) {
@@ -74,8 +70,8 @@ int getGlobalTermsFooterStringResource(FlowParameters flowParameters) {
7470
return NO_TOS_OR_PP; // add constant
7571
}
7672

77-
private static @StringRes
78-
int getTermsSmsStringResource(FlowParameters flowParameters) {
73+
@StringRes
74+
private static int getTermsSmsStringResource(FlowParameters flowParameters) {
7975
boolean termsOfServiceUrlProvided = flowParameters.isTermsOfServiceUrlProvided();
8076
boolean privacyPolicyUrlProvided = flowParameters.isPrivacyPolicyUrlProvided();
8177
if (termsOfServiceUrlProvided && privacyPolicyUrlProvided) {

‎auth/src/main/java/com/firebase/ui/auth/util/ui/PreambleHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static void setup(Context context,
5555
@StringRes int textViewText,
5656
TextView textView) {
5757
PreambleHandler handler = new PreambleHandler(context, parameters, buttonText);
58-
handler.setupPreamble(textViewText);
58+
handler.initPreamble(textViewText);
5959
handler.setPreamble(textView);
6060
}
6161

@@ -64,7 +64,7 @@ private void setPreamble(TextView textView) {
6464
textView.setText(mBuilder);
6565
}
6666

67-
private void setupPreamble(@StringRes int textViewText) {
67+
private void initPreamble(@StringRes int textViewText) {
6868
String withTargets = getPreambleStringWithTargets(textViewText, mButtonText != NO_BUTTON);
6969
if (withTargets == null) {
7070
return;

‎auth/src/main/res/layout-land/fui_auth_method_picker_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
android:layout_width="match_parent"
4141
android:layout_height="wrap_content"
4242
android:layout_marginTop="@dimen/fui_field_padding_vert"
43-
android:textColor="?android:textColorTertiary"
43+
android:textColor="?android:attr/textColorTertiary"
4444
app:layout_constraintTop_toBottomOf="parent" />
4545

4646
</android.support.constraint.ConstraintLayout>

‎auth/src/main/res/layout/fui_check_email_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
android:layout_width="match_parent"
5757
android:layout_height="wrap_content"
5858
android:layout_marginTop="@dimen/fui_field_padding_vert"
59-
android:paddingRight="15dp"
60-
android:paddingBottom="15dp"
59+
android:paddingRight="16dp"
60+
android:paddingBottom="16dp"
6161
android:gravity="end"
6262
app:layout_constraintBottom_toBottomOf="parent" />
6363

‎auth/src/main/res/layout/fui_confirmation_code_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@
110110
android:layout_width="match_parent"
111111
android:layout_height="wrap_content"
112112
android:layout_marginTop="@dimen/fui_field_padding_vert"
113-
android:paddingRight="15dp"
114-
android:paddingBottom="15dp"
113+
android:paddingRight="16dp"
114+
android:paddingBottom="16dp"
115115
android:gravity="end"
116116
app:layout_constraintBottom_toBottomOf="parent" />
117117
</android.support.constraint.ConstraintLayout>

‎auth/src/main/res/layout/fui_phone_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
android:layout_width="match_parent"
6363
android:layout_height="wrap_content"
6464
android:layout_marginTop="@dimen/fui_field_padding_vert"
65-
android:paddingRight="15dp"
66-
android:paddingBottom="15dp"
65+
android:paddingRight="16dp"
66+
android:paddingBottom="16dp"
6767
android:gravity="end"
6868
app:layout_constraintBottom_toBottomOf="parent" />
6969
</android.support.constraint.ConstraintLayout>

‎auth/src/main/res/layout/fui_register_email_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
android:layout_width="match_parent"
7979
android:layout_height="wrap_content"
8080
android:layout_marginTop="@dimen/fui_field_padding_vert"
81-
android:paddingRight="15dp"
82-
android:paddingBottom="15dp"
81+
android:paddingRight="16dp"
82+
android:paddingBottom="16dp"
8383
android:gravity="end"
8484
app:layout_constraintBottom_toBottomOf="parent" />
8585
</android.support.constraint.ConstraintLayout>

‎library/quality/quality.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ android {
7676
disable 'ObsoleteLintCustomCheck', // TODO ButterKnife will fix this in v9.0
7777
'IconExpectedSize',
7878
'InvalidPackage', // Firestore uses GRPC which makes lint mad
79-
'NewerVersionAvailable', 'GradleDependency' // For reproducible builds
80-
'MissingTranslation' // TODO remove in future PR
79+
'NewerVersionAvailable', 'GradleDependency', // For reproducible builds
80+
'MissingTranslation', // TODO remove in future PR
81+
'UnusedResources' // TODO remove in future PR
8182

8283
baseline file("$configDir/lint-baseline.xml")
8384
checkAllWarnings true

0 commit comments

Comments
 (0)