Skip to content

Commit 0f55407

Browse files
WillieCubedsamtstern
WillieCubed
authored and
samtstern
committed
Use resource prefix for library resources (#796)
1 parent d995eb7 commit 0f55407

File tree

160 files changed

+6072
-6208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+6072
-6208
lines changed

‎auth/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ android {
1010
targetSdkVersion targetSdk
1111
versionCode 1
1212
versionName "1.0"
13+
14+
resourcePrefix "fui_"
1315
}
1416

1517
buildTypes {

‎auth/lint.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<lint>
3+
<issue id="all">
4+
<ignore path="src/main/res/values/com_crashlytics_export_strings.xml" />
5+
</issue>
6+
</lint>

‎auth/src/main/AndroidManifest.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,38 +32,38 @@
3232

3333
<activity
3434
android:name=".ui.email.RecoverPasswordActivity"
35-
android:label="@string/title_recover_password_activity"
36-
android:exported="false" />
35+
android:label="@string/fui_title_recover_password_activity"
36+
android:exported="false"/>
3737

3838
<activity
3939
android:name=".ui.email.RegisterEmailActivity"
40-
android:label="@string/sign_in_default"
41-
android:exported="false" />
40+
android:label="@string/fui_sign_in_default"
41+
android:exported="false"/>
4242

4343
<activity
4444
android:name=".ui.phone.PhoneVerificationActivity"
45-
android:label="@string/sign_in_with_phone_number"
46-
android:exported="false"
47-
android:windowSoftInputMode="stateAlwaysVisible" />
45+
android:label="@string/fui_sign_in_with_phone_number"
46+
android:windowSoftInputMode="stateAlwaysVisible"
47+
android:exported="false"/>
4848

4949
<activity
5050
android:name=".ui.accountlink.WelcomeBackIdpPrompt"
51-
android:label="@string/title_welcome_back_idp_prompt"
52-
android:exported="false" />
51+
android:label="@string/fui_title_welcome_back_idp_prompt"
52+
android:exported="false"/>
5353

5454
<activity
5555
android:name=".ui.accountlink.WelcomeBackPasswordPrompt"
56-
android:label="@string/title_welcome_back_password_prompt"
57-
android:exported="false" />
56+
android:label="@string/fui_title_welcome_back_password_prompt"
57+
android:exported="false"/>
5858

5959
<activity
6060
android:name=".ui.idp.AuthMethodPickerActivity"
61-
android:label="@string/default_toolbar_title"
62-
android:exported="false" />
61+
android:label="@string/fui_default_toolbar_title"
62+
android:exported="false"/>
6363

6464
<activity
6565
android:name="com.facebook.FacebookActivity"
66-
android:label="@string/app_name"
66+
android:label="@string/fui_app_name"
6767
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
6868
tools:ignore="MissingRegistered" />
6969

‎auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public EmailProvider(Activity activity, FlowParameters flowParameters) {
2323

2424
@Override
2525
public String getName(Context context) {
26-
return context.getString(R.string.provider_name_email);
26+
return context.getString(R.string.fui_provider_name_email);
2727
}
2828

2929
@Override
3030
@LayoutRes
3131
public int getButtonLayout() {
32-
return R.layout.provider_button_email;
32+
return R.layout.fui_provider_button_email;
3333
}
3434

3535
@Override

‎auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ public static AuthCredential createAuthCredential(IdpResponse response) {
7676

7777
@Override
7878
public String getName(Context context) {
79-
return context.getString(R.string.idp_name_facebook);
79+
return context.getString(R.string.fui_idp_name_facebook);
8080
}
8181

8282
@Override
8383
@LayoutRes
8484
public int getButtonLayout() {
85-
return R.layout.idp_button_facebook;
85+
return R.layout.fui_idp_button_facebook;
8686
}
8787

8888
@Override

‎auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ private GoogleSignInOptions getSignInOptions(@Nullable String email) {
9292

9393
@Override
9494
public String getName(Context context) {
95-
return context.getString(R.string.idp_name_google);
95+
return context.getString(R.string.fui_idp_name_google);
9696
}
9797

9898
@Override
9999
@LayoutRes
100100
public int getButtonLayout() {
101-
return R.layout.idp_button_google;
101+
return R.layout.fui_idp_button_google;
102102
}
103103

104104
@Override
@@ -133,7 +133,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
133133
Toast.makeText(
134134
mActivity,
135135
mActivity.getString(
136-
R.string.signed_in_with_specific_account,
136+
R.string.fui_signed_in_with_specific_account,
137137
result.getSignInAccount().getEmail()),
138138
Toast.LENGTH_SHORT).show();
139139
}

‎auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ public PhoneProvider(Activity activity, FlowParameters parameters) {
2424

2525
@Override
2626
public String getName(Context context) {
27-
return context.getString(R.string.provider_name_phone);
27+
return context.getString(R.string.fui_provider_name_phone);
2828
}
2929

3030
@Override
3131
@LayoutRes
3232
public int getButtonLayout() {
33-
return R.layout.provider_button_phone;
33+
return R.layout.fui_provider_button_phone;
3434
}
3535

3636
@Override

‎auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ private static void signOut() throws IllegalStateException {
6767

6868
@Override
6969
public String getName(Context context) {
70-
return context.getString(R.string.idp_name_twitter);
70+
return context.getString(R.string.fui_idp_name_twitter);
7171
}
7272

7373
@Override
7474
@LayoutRes
7575
public int getButtonLayout() {
76-
return R.layout.idp_button_twitter;
76+
return R.layout.fui_idp_button_twitter;
7777
}
7878

7979
@Override

‎auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public static Intent createIntent(
7373
@Override
7474
protected void onCreate(Bundle savedInstanceState) {
7575
super.onCreate(savedInstanceState);
76-
setContentView(R.layout.welcome_back_idp_prompt_layout);
76+
setContentView(R.layout.fui_welcome_back_idp_prompt_layout);
7777

7878
IdpResponse newUserIdpResponse = IdpResponse.fromResultIntent(getIntent());
7979
mPrevCredential = ProviderUtils.getAuthCredential(newUserIdpResponse);
@@ -118,14 +118,14 @@ protected void onCreate(Bundle savedInstanceState) {
118118
findViewById(R.id.welcome_back_idp_button).setOnClickListener(new OnClickListener() {
119119
@Override
120120
public void onClick(View view) {
121-
getDialogHolder().showLoadingDialog(R.string.progress_dialog_signing_in);
121+
getDialogHolder().showLoadingDialog(R.string.fui_progress_dialog_signing_in);
122122
mIdpProvider.startLogin(WelcomeBackIdpPrompt.this);
123123
}
124124
});
125125
}
126126

127127
private String getIdpPromptString(String email) {
128-
return getString(R.string.welcome_back_idp_prompt, email, mIdpProvider.getName(this));
128+
return getString(R.string.fui_welcome_back_idp_prompt, email, mIdpProvider.getName(this));
129129
}
130130

131131
@Override
@@ -191,7 +191,7 @@ public void onFailure() {
191191
}
192192

193193
private void finishWithError() {
194-
Toast.makeText(this, R.string.general_error, Toast.LENGTH_LONG).show();
194+
Toast.makeText(this, R.string.fui_general_error, Toast.LENGTH_LONG).show();
195195
finish(ResultCodes.CANCELED, IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
196196
}
197197

‎auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static Intent createIntent(
7979
@Override
8080
protected void onCreate(Bundle savedInstanceState) {
8181
super.onCreate(savedInstanceState);
82-
setContentView(R.layout.welcome_back_password_prompt_layout);
82+
setContentView(R.layout.fui_welcome_back_password_prompt_layout);
8383

8484
// Show keyboard
8585
getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
@@ -94,7 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
9494
ImeHelper.setImeOnDoneListener(mPasswordField, this);
9595

9696
// Create welcome back text with email bolded.
97-
String bodyText = getString(R.string.welcome_back_password_prompt_body, mEmail);
97+
String bodyText = getString(R.string.fui_welcome_back_password_prompt_body, mEmail);
9898

9999
SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(bodyText);
100100
int emailStart = bodyText.indexOf(mEmail);
@@ -137,12 +137,12 @@ private void validateAndSignIn() {
137137
private void validateAndSignIn(final String email, final String password) {
138138
// Check for null or empty password
139139
if (TextUtils.isEmpty(password)) {
140-
mPasswordLayout.setError(getString(R.string.required_field));
140+
mPasswordLayout.setError(getString(R.string.fui_required_field));
141141
return;
142142
} else {
143143
mPasswordLayout.setError(null);
144144
}
145-
getDialogHolder().showLoadingDialog(R.string.progress_dialog_signing_in);
145+
getDialogHolder().showLoadingDialog(R.string.fui_progress_dialog_signing_in);
146146

147147
final FirebaseAuth firebaseAuth = getAuthHelper().getFirebaseAuth();
148148

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static CheckEmailFragment newInstance(@NonNull FlowParameters flowParamet
9999
public View onCreateView(LayoutInflater inflater,
100100
@Nullable ViewGroup container,
101101
@Nullable Bundle savedInstanceState) {
102-
View v = inflater.inflate(R.layout.check_email_layout, container, false);
102+
View v = inflater.inflate(R.layout.fui_check_email_layout, container, false);
103103

104104
// Email field and validator
105105
mEmailLayout = (TextInputLayout) v.findViewById(R.id.email_layout);
@@ -179,7 +179,7 @@ private void validateAndProceed() {
179179
}
180180

181181
private void checkAccountExists(@NonNull final String email) {
182-
getDialogHolder().showLoadingDialog(R.string.progress_dialog_checking_accounts);
182+
getDialogHolder().showLoadingDialog(R.string.fui_progress_dialog_checking_accounts);
183183

184184
// Get name from SmartLock, if possible
185185
String name = null;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public PreambleHandler(Context context, FlowParameters parameters, @StringRes in
3535
mContext = context;
3636
mFlowParameters = parameters;
3737
mButtonText = buttonText;
38-
mLinkSpan = new ForegroundColorSpan(ContextCompat.getColor(mContext, R.color.linkColor));
38+
mLinkSpan = new ForegroundColorSpan(ContextCompat.getColor(mContext, R.color.fui_linkColor));
3939

4040
setupCreateAccountPreamble();
4141
}
@@ -54,8 +54,8 @@ private void setupCreateAccountPreamble() {
5454
mBuilder = new SpannableStringBuilder(withTargets);
5555

5656
replaceTarget(BTN_TARGET, mButtonText);
57-
replaceUrlTarget(TOS_TARGET, R.string.terms_of_service, mFlowParameters.termsOfServiceUrl);
58-
replaceUrlTarget(PP_TARGET, R.string.privacy_policy, mFlowParameters.privacyPolicyUrl);
57+
replaceUrlTarget(TOS_TARGET, R.string.fui_terms_of_service, mFlowParameters.termsOfServiceUrl);
58+
replaceUrlTarget(PP_TARGET, R.string.fui_privacy_policy, mFlowParameters.privacyPolicyUrl);
5959
}
6060

6161
private void replaceTarget(String target, @StringRes int replacementRes) {
@@ -84,13 +84,13 @@ private String getPreambleStringWithTargets() {
8484
boolean hasPp = !TextUtils.isEmpty(mFlowParameters.privacyPolicyUrl);
8585

8686
if (hasTos && hasPp) {
87-
return mContext.getString(R.string.create_account_preamble_tos_and_pp,
87+
return mContext.getString(R.string.fui_create_account_preamble_tos_and_pp,
8888
BTN_TARGET, TOS_TARGET, PP_TARGET);
8989
} else if (hasTos) {
90-
return mContext.getString(R.string.create_account_preamble_tos_only,
90+
return mContext.getString(R.string.fui_create_account_preamble_tos_only,
9191
BTN_TARGET, TOS_TARGET);
9292
} else if (hasPp) {
93-
return mContext.getString(R.string.create_account_preamble_pp_only,
93+
return mContext.getString(R.string.fui_create_account_preamble_pp_only,
9494
BTN_TARGET, PP_TARGET);
9595
} else {
9696
return null;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static Intent createIntent(Context context, FlowParameters flowParams, St
5252
@Override
5353
protected void onCreate(Bundle savedInstanceState) {
5454
super.onCreate(savedInstanceState);
55-
setContentView(R.layout.forgot_password_layout);
55+
setContentView(R.layout.fui_forgot_password_layout);
5656

5757
mEmailFieldValidator =
5858
new EmailFieldValidator((TextInputLayout) findViewById(R.id.email_layout));
@@ -86,7 +86,7 @@ public void onFailure(@NonNull Exception e) {
8686

8787
if (e instanceof FirebaseAuthInvalidUserException) {
8888
// No FirebaseUser exists with this email address, show error.
89-
mEmailEditText.setError(getString(R.string.error_email_does_not_exist));
89+
mEmailEditText.setError(getString(R.string.fui_error_email_does_not_exist));
9090
}
9191
}
9292
});
@@ -96,7 +96,7 @@ public void onFailure(@NonNull Exception e) {
9696
public void onClick(View view) {
9797
if (view.getId() == R.id.button_done) {
9898
if (mEmailFieldValidator.validate(mEmailEditText.getText())) {
99-
getDialogHolder().showLoadingDialog(R.string.progress_dialog_sending);
99+
getDialogHolder().showLoadingDialog(R.string.fui_progress_dialog_sending);
100100
next(mEmailEditText.getText().toString());
101101
}
102102
}

‎auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public static void show(String email, FragmentManager manager) {
3030
@Override
3131
public Dialog onCreateDialog(Bundle savedInstanceState) {
3232
return new AlertDialog.Builder(getContext())
33-
.setTitle(R.string.title_confirm_recover_password)
34-
.setMessage(getString(R.string.confirm_recovery_body,
33+
.setTitle(R.string.fui_title_confirm_recover_password)
34+
.setMessage(getString(R.string.fui_confirm_recovery_body,
3535
getArguments().getString(ExtraConstants.EXTRA_EMAIL)))
3636
.setOnDismissListener(new DialogInterface.OnDismissListener() {
3737
@Override

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static Intent createIntent(Context context, FlowParameters flowParams, St
5555
@Override
5656
protected void onCreate(Bundle savedInstanceState) {
5757
super.onCreate(savedInstanceState);
58-
setContentView(R.layout.activity_register_email);
58+
setContentView(R.layout.fui_activity_register_email);
5959

6060
if (savedInstanceState != null) {
6161
return;
@@ -132,12 +132,12 @@ public void onNewUser(User user) {
132132

133133
ft.disallowAddToBackStack().commit();
134134
} else {
135-
emailLayout.setError(getString(R.string.error_email_does_not_exist));
135+
emailLayout.setError(getString(R.string.fui_error_email_does_not_exist));
136136
}
137137
}
138138

139139
private void setSlideAnimation() {
140140
// Make the next activity slide in
141-
overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
141+
overridePendingTransition(R.anim.fui_slide_in_right, R.anim.fui_slide_out_left);
142142
}
143143
}

0 commit comments

Comments
 (0)