Skip to content

Commit f53fdae

Browse files
authored
Merge pull request firebase#3 from JosefHruska/master
Correct button colors + hide appbar on AuthPicker screen
2 parents 23117ab + ffd6321 commit f53fdae

File tree

9 files changed

+5
-17
lines changed

9 files changed

+5
-17
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@
3434
<!-- Auth UI demo -->
3535
<activity
3636
android:name=".auth.AuthUiActivity"
37-
android:theme="@style/AppTheme.NoActionbar"
3837
android:label="@string/name_auth_ui"/>
3938
<activity
4039
android:name=".auth.SignedInActivity"
41-
android:theme="@style/AppTheme.NoActionbar"
4240
android:label="@string/name_auth_ui"/>
4341

4442
<!-- Storage UI demo-->

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
<item name="colorAccent">@color/colorAccent</item>
77
</style>
88

9-
<style name="AppTheme.NoActionbar">
10-
<item name="windowActionBar">false</item>
11-
<item name="windowNoTitle">true</item>
12-
</style>
13-
149
<style name="PurpleTheme" parent="FirebaseUI">
1510
<item name="colorPrimary">@color/material_deep_purple_500</item>
1611
<item name="colorPrimaryDark">@color/material_deep_purple_700</item>

auth/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454

5555
<activity
5656
android:name=".ui.idp.AuthMethodPickerActivity"
57-
android:theme="@style/FirebaseUI.NoActionBar"
5857
android:label="@string/default_toolbar_title"
5958
android:exported="false"/>
6059

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ protected void onCreate(Bundle savedInstanceState) {
8181

8282
populateIdpList(mActivityHelper.getFlowParams().providerInfo);
8383

84+
getSupportActionBar().hide(); // Need to hide action bar programmatically - setting via theme doesn't work.
8485
int logoId = mActivityHelper.getFlowParams().logoId;
8586
if (logoId == AuthUI.NO_LOGO) {
8687
findViewById(R.id.logo_layout).setVisibility(View.GONE);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<item>
44
<shape android:shape="rectangle">
55
<corners android:radius="3dp"/>
6-
<solid android:color="#D0021B"/>
6+
<solid android:color="#747474"/>
77
</shape>
88
</item>
99
</selector>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
android:clipToPadding="false"
7-
android:background="@color/white"
87
android:clipChildren="false"
98
android:orientation="horizontal"
109
android:weightSum="2">

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
xmlns:tools="http://schemas.android.com/tools"
6-
android:background="@color/white"
76
android:clipChildren="false"
87
android:clipToPadding="false"
98
android:gravity="center"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<color name="transparent">#00FFFFFF</color>
1313
<color name="black">#000000</color>
14+
<color name="gray_1">#e4e4e4</color>
1415
<color name="gray_2">#d8d8d8</color>
1516
<color name="gray_3">#bbbbbb</color>
1617
<color name="gray_4">#888888</color>

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
<item name="android:textColorPrimary">@color/authui_inputTextColor</item>
1414
<item name="android:buttonStyle">@style/FirebaseUI.Button</item>
1515
<item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
16-
</style>
17-
18-
<style name="FirebaseUI.NoActionBar">
19-
<item name="windowActionBar">false</item>
20-
<item name="windowNoTitle">true</item>
16+
<item name="android:windowBackground">@color/gray_1</item>
2117
</style>
2218

2319
<style name="FirebaseUI.Transparent" parent="FirebaseUI">
@@ -244,7 +240,7 @@
244240
<item name="android:lineSpacingExtra">5sp</item>
245241
<item name="android:gravity">center</item>
246242
<item name="android:textSize">16sp</item>
247-
<item name="android:textColor">@color/gray_3</item>
243+
<item name="android:textColor">@color/gray_6</item>
248244
</style>
249245

250246
<style name="FirebaseUI.FullWidthButtonSettleUp" parent="FirebaseUI.Text">

0 commit comments

Comments
 (0)