Skip to content

Commit cd5fc16

Browse files
samtsternsamtstern
authored
Merge pull request #252 from PaoloRotolo/master
Allow users to set a custom toolbar title.
2 parents 17f9243 + 7339639 commit cd5fc16

File tree

9 files changed

+61
-37
lines changed

9 files changed

+61
-37
lines changed

‎auth/src/main/AndroidManifest.xml

Lines changed: 53 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,57 @@
33
package="com.firebase.ui.auth">
44

55
<application>
6-
<activity android:theme="@style/FirebaseUI.Dialog"
7-
android:name="com.firebase.ui.auth.ui.email.ConfirmRecoverPasswordActivity">
8-
</activity>
9-
<activity android:theme="@style/FirebaseUI.Translucent" android:name="com.firebase.ui.auth.ui.email.EmailHintContainerActivity" >
10-
</activity>
11-
<activity android:theme="@style/FirebaseUI" android:name="com.firebase.ui.auth.ui.email.RecoverPasswordActivity" >
12-
</activity>
13-
<activity android:theme="@style/FirebaseUI" android:name="com.firebase.ui.auth.ui.email.RegisterEmailActivity" >
14-
</activity>
15-
<activity android:theme="@style/FirebaseUI" android:name="com.firebase.ui.auth.ui.email.SignInNoPasswordActivity" >
16-
</activity>
17-
<activity android:theme="@style/FirebaseUI" android:name="com.firebase.ui.auth.ui.email.SignInActivity" >
18-
</activity>
19-
<activity android:theme="@style/FirebaseUI.Translucent"
20-
android:name="com.firebase.ui.auth.ui.account_link.SaveCredentialsActivity">
21-
</activity>
22-
<activity android:theme="@style/FirebaseUI" android:name="com.firebase.ui.auth.ui.account_link.AccountLinkInitActivity" >
23-
</activity>
24-
<activity android:theme="@style/FirebaseUI" android:name="com.firebase.ui.auth.ui.account_link.WelcomeBackIDPPrompt" >
25-
</activity>
26-
<activity android:theme="@style/FirebaseUI" android:name="com.firebase.ui.auth.ui.account_link.WelcomeBackPasswordPrompt" >
27-
</activity>
28-
<activity android:theme="@style/FirebaseUI" android:name=".ui.idp.AuthMethodPickerActivity" >
29-
</activity>
30-
<activity android:theme="@style/FirebaseUI.Translucent"
31-
android:name="com.firebase.ui.auth.ui.idp.IDPSignInContainerActivity" >
32-
</activity>
33-
<activity android:theme="@style/FirebaseUI.Translucent"
34-
android:name=".ui.ChooseAccountActivity" >
35-
</activity>
6+
<activity
7+
android:name="com.firebase.ui.auth.ui.email.ConfirmRecoverPasswordActivity"
8+
android:label="@string/title_confirm_recover_password_activity"
9+
android:theme="@style/FirebaseUI.Dialog" />
10+
<activity
11+
android:name="com.firebase.ui.auth.ui.email.EmailHintContainerActivity"
12+
android:label="@string/default_toolbar_title"
13+
android:theme="@style/FirebaseUI.Translucent" />
14+
<activity
15+
android:name="com.firebase.ui.auth.ui.email.RecoverPasswordActivity"
16+
android:label="@string/title_recover_password_activity"
17+
android:theme="@style/FirebaseUI" />
18+
<activity
19+
android:name="com.firebase.ui.auth.ui.email.RegisterEmailActivity"
20+
android:label="@string/title_register_email_activity"
21+
android:theme="@style/FirebaseUI" />
22+
<activity
23+
android:name="com.firebase.ui.auth.ui.email.SignInNoPasswordActivity"
24+
android:label="@string/title_sign_in_no_password_activity"
25+
android:theme="@style/FirebaseUI" />
26+
<activity
27+
android:name="com.firebase.ui.auth.ui.email.SignInActivity"
28+
android:label="@string/title_sign_in_activity"
29+
android:theme="@style/FirebaseUI" />
30+
<activity
31+
android:name="com.firebase.ui.auth.ui.account_link.SaveCredentialsActivity"
32+
android:label="@string/default_toolbar_title"
33+
android:theme="@style/FirebaseUI.Translucent" />
34+
<activity
35+
android:name="com.firebase.ui.auth.ui.account_link.AccountLinkInitActivity"
36+
android:theme="@style/FirebaseUI" />
37+
<activity
38+
android:name="com.firebase.ui.auth.ui.account_link.WelcomeBackIDPPrompt"
39+
android:label="@string/title_welcome_back_idp_prompt"
40+
android:theme="@style/FirebaseUI" />
41+
<activity
42+
android:name="com.firebase.ui.auth.ui.account_link.WelcomeBackPasswordPrompt"
43+
android:label="@string/title_welcome_back_password_prompt"
44+
android:theme="@style/FirebaseUI" />
45+
<activity
46+
android:name=".ui.idp.AuthMethodPickerActivity"
47+
android:label="@string/default_toolbar_title"
48+
android:theme="@style/FirebaseUI" />
49+
<activity
50+
android:name="com.firebase.ui.auth.ui.idp.IDPSignInContainerActivity"
51+
android:label="@string/default_toolbar_title"
52+
android:theme="@style/FirebaseUI.Translucent" />
53+
<activity
54+
android:name=".ui.ChooseAccountActivity"
55+
android:label="@string/default_toolbar_title"
56+
android:theme="@style/FirebaseUI.Translucent" />
3657

3758
<activity
3859
android:name="com.facebook.FacebookActivity"
@@ -46,8 +67,10 @@
4667
android:exported="true">
4768
<intent-filter>
4869
<action android:name="android.intent.action.VIEW" />
70+
4971
<category android:name="android.intent.category.DEFAULT" />
5072
<category android:name="android.intent.category.BROWSABLE" />
73+
5174
<data android:scheme="@string/facebook_login_protocol_scheme" />
5275
</intent-filter>
5376
</activity>

‎auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public class WelcomeBackIDPPrompt extends AppCompatBase
5858
@Override
5959
protected void onCreate(Bundle savedInstanceState) {
6060
super.onCreate(savedInstanceState);
61-
setTitle(getResources().getString(R.string.sign_in));
6261
mProviderId = getProviderIdFromIntent();
6362
mPrevIdpResponse = getIntent().getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE);
6463
setContentView(R.layout.welcome_back_idp_prompt_layout);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public class WelcomeBackPasswordPrompt extends AppCompatBase implements View.OnC
6161
@Override
6262
protected void onCreate(Bundle savedInstanceState) {
6363
super.onCreate(savedInstanceState);
64-
setTitle(R.string.sign_in);
6564
setContentView(R.layout.welcome_back_password_prompt_layout);
6665
mPasswordLayout = (TextInputLayout) findViewById(R.id.password_layout);
6766
mIdpResponse = getIntent().getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ protected void onCreate(Bundle savedInstanceState) {
3737
// intentionally do not configure the theme on this activity, it is a dialog
3838

3939
setContentView(R.layout.confirm_recovery_layout);
40-
setTitle(R.string.check_your_email);
4140
String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
4241
boolean isSuccess = getIntent().getBooleanExtra(ExtraConstants.EXTRA_SUCCESS, true);
4342

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public class RecoverPasswordActivity extends AppCompatBase implements View.OnCli
4343
@Override
4444
protected void onCreate(Bundle savedInstanceState) {
4545
super.onCreate(savedInstanceState);
46-
setTitle(R.string.recover_password_title);
4746
setContentView(R.layout.forgot_password_layout);
4847
String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
4948

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public class RegisterEmailActivity extends AppCompatBase implements View.OnClick
6161
@Override
6262
protected void onCreate(Bundle savedInstanceState) {
6363
super.onCreate(savedInstanceState);
64-
setTitle(R.string.create_account_title);
6564
setContentView(R.layout.register_email_layout);
6665

6766
String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public class SignInActivity extends AppCompatBase implements View.OnClickListene
5353
@Override
5454
protected void onCreate(Bundle savedInstanceState) {
5555
super.onCreate(savedInstanceState);
56-
setTitle(R.string.sign_in);
5756
setContentView(R.layout.sign_in_layout);
5857

5958
String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public class SignInNoPasswordActivity extends AppCompatBase implements View.OnCl
4040
protected void onCreate(Bundle savedInstanceState) {
4141
super.onCreate(savedInstanceState);
4242
mAcquireEmailHelper = new AcquireEmailHelper(mActivityHelper);
43-
setTitle(R.string.sign_in_with_email);
4443
setContentView(R.layout.signin_no_password_layout);
4544

4645
String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);

‎auth/src/main/res/values/strings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
22
<string name="app_name">ui_flow</string>
3+
<string name="default_toolbar_title">@string/app_name</string>
4+
<string name="title_welcome_back_password_prompt">@string/sign_in</string>
5+
<string name="title_sign_in_activity">@string/sign_in</string>
6+
<string name="title_sign_in_no_password_activity">@string/sign_in_with_email</string>
7+
<string name="title_welcome_back_idp_prompt">@string/sign_in</string>
8+
<string name="title_register_email_activity">@string/create_account_title</string>
9+
<string name="title_recover_password_activity">@string/recover_password_title</string>
10+
<string name="title_confirm_recover_password_activity">@string/check_your_email</string>
311
<string name="email_hint">Email</string>
412
<string name="sign_in_no_password_title">Put an email to use for sign in</string>
513
<string name="password_hint">Password</string>

0 commit comments

Comments
 (0)