Skip to content

Commit da44cc6

Browse files
author
Iain McGinniss
committed
Default theme fixes
Change-Id: Iad5909bdfc43005cfa923e1b3cac8f4fbcb2db39
1 parent 98a5a6b commit da44cc6

File tree

8 files changed

+69
-22
lines changed

8 files changed

+69
-22
lines changed

‎app/src/main/java/com/firebase/uidemo/ChatActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,13 @@ public void setIsSender(Boolean isSender) {
223223

224224
int color;
225225
if (isSender) {
226-
color = ContextCompat.getColor(mView.getContext(), R.color.green_300);
226+
color = ContextCompat.getColor(mView.getContext(), R.color.material_green_300);
227227

228228
left_arrow.setVisibility(View.GONE);
229229
right_arrow.setVisibility(View.VISIBLE);
230230
messageContainer.setGravity(Gravity.RIGHT);
231231
} else {
232-
color = ContextCompat.getColor(mView.getContext(), R.color.grey_300);
232+
color = ContextCompat.getColor(mView.getContext(), R.color.material_grey_300);
233233

234234
left_arrow.setVisibility(View.VISIBLE);
235235
right_arrow.setVisibility(View.GONE);

‎app/src/main/res/drawable/chat_message_arrow.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
android:shape="rectangle" >
1010
<stroke android:color="@android:color/transparent" android:width="10dp"/>
1111
<solid
12-
android:color="@color/grey_300" />
12+
android:color="@color/material_grey_300" />
1313
</shape>
1414
</rotate>

‎app/src/main/res/drawable/chat_message_background.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
33
<corners android:radius="4dp"/>
4-
<solid android:color="@color/grey_300" />
4+
<solid android:color="@color/material_grey_300" />
55
</shape>

‎app/src/main/res/values/colors.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
<resources>
2+
<color name="colorPrimary">#039BE5</color>
3+
<color name="colorPrimaryDark">#0288D1</color>
4+
<color name="colorAccent">#FFA000</color>
5+
26
<color name="material_deep_purple_50">#EDE7F6</color>
37
<color name="material_deep_purple_500">#673AB7</color>
48
<color name="material_deep_purple_700">#512DA8</color>
59
<color name="material_deep_purple_a200">#E040FB</color>
10+
611
<color name="material_green_50">#E8F5E9</color>
712
<color name="material_green_500">#4CAF50</color>
813
<color name="material_green_700">#388E3C</color>
14+
<color name="material_green_300">#AED581</color>
915
<color name="material_green_a200">#69F0AE</color>
1016

17+
<color name="material_grey_300">#E0E0E0</color>
18+
1119
<color name="material_lime_50">#F9FBE7</color>
1220
<color name="material_lime_a700">#AEEA00</color>
1321

‎auth/src/main/res/drawable/rounded_button.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<item >
1616
<shape android:shape="rectangle" >
1717
<corners android:radius="3dp" />
18-
<solid android:color="?attr/colorControlNormal"/>
18+
<solid android:color="?attr/colorButtonNormal"/>
1919
</shape>
2020
</item>
2121
</selector>

‎auth/src/main/res/values-v21/styles.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="FirebaseUI" parent="Theme.AppCompat.Light.DarkActionBar">
4+
<item name="colorPrimary">@color/authui_colorPrimary</item>
5+
<item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
6+
<item name="colorAccent">@color/authui_colorAccent</item>
7+
<item name="colorButtonNormal">@color/authui_colorPrimary</item>
8+
9+
<item name="android:colorPrimary">@color/authui_colorPrimary</item>
10+
<item name="android:colorPrimaryDark">@color/authui_colorPrimaryDark</item>
11+
<item name="android:colorAccent">@color/authui_colorAccent</item>
12+
<item name="android:colorButtonNormal">@color/authui_colorPrimary</item>
13+
14+
<item name="android:buttonStyle">@style/FirebaseUI.Button</item>
15+
<item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
16+
</style>
17+
18+
<style name="FirebaseUI.Dialog" parent="Base.Theme.AppCompat.Light.Dialog.MinWidth">
19+
<item name="colorPrimary">@color/authui_colorPrimary</item>
20+
<item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
21+
<item name="colorAccent">@color/authui_colorAccent</item>
22+
<item name="colorButtonNormal">@color/authui_colorPrimary</item>
23+
24+
<item name="android:colorPrimary">@color/authui_colorPrimary</item>
25+
<item name="android:colorPrimaryDark">@color/authui_colorPrimaryDark</item>
26+
<item name="android:colorAccent">@color/authui_colorAccent</item>
27+
<item name="android:colorButtonNormal">@color/authui_colorPrimary</item>
28+
29+
<item name="android:buttonStyle">@style/FirebaseUI.Button</item>
30+
<item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
31+
32+
<item name="android:layout_width">match_parent</item>
33+
<item name="android:windowMinWidthMajor">360dp</item>
34+
<item name="android:layout_height">match_parent</item>
35+
</style>
36+
</resources>

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="colorPrimary">#039BE5</color>
4-
<color name="colorPrimaryDark">#0288D1</color>
5-
<color name="colorAccent">#FFA000</color>
3+
<color name="authui_colorPrimary">#3E50B4</color>
4+
<color name="authui_colorPrimaryDark">#2F3E9E</color>
5+
<color name="authui_colorAccent">#3E50B4</color>
6+
<color name="authui_colorActivated">#1a237e</color>
67

7-
<color name="grey_300">#E0E0E0</color>
8-
<color name="green_300">#AED581</color>
9-
108
<color name="headingColor">#212121</color>
119
<color name="bodyTextColor">#c0000000</color>
1210
<color name="errorColor">#DD2C00</color>
1311
<color name="linkColor">#4285F4</color>
14-
<color name="buttonColor">@color/colorPrimary</color>
15-
<color name="buttonColorPressed">#1a237e</color>
12+
<color name="buttonColor">@color/authui_colorPrimary</color>
13+
<color name="buttonColorPressed">@color/authui_colorActivated</color>
1614
<color name="buttonTextColor">#FFFFFF</color>
1715
<color name="inputLabelColor">#757575</color>
1816
<color name="shadowColor">#eeeeee</color>

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<style name="FirebaseUI" parent="Theme.AppCompat.Light.DarkActionBar">
4-
<item name="colorPrimary">@color/colorPrimary</item>
5-
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
6-
<item name="colorAccent">@color/colorAccent</item>
4+
<item name="colorPrimary">@color/authui_colorPrimary</item>
5+
<item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
6+
<item name="colorAccent">@color/authui_colorAccent</item>
7+
<item name="colorButtonNormal">@color/authui_colorPrimary</item>
8+
79
<item name="android:buttonStyle">@style/FirebaseUI.Button</item>
810
<item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
911
</style>
1012

1113
<style name="FirebaseUI.Dialog" parent="Base.Theme.AppCompat.Light.Dialog.MinWidth">
14+
<item name="colorPrimary">@color/authui_colorPrimary</item>
15+
<item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
16+
<item name="colorAccent">@color/authui_colorAccent</item>
17+
<item name="colorButtonNormal">@color/authui_colorPrimary</item>
18+
1219
<item name="android:layout_width">match_parent</item>
1320
<item name="android:windowMinWidthMajor">360dp</item>
1421
<item name="android:layout_height">match_parent</item>
15-
<item name="colorPrimary">@color/colorPrimary</item>
16-
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
17-
<item name="colorAccent">@color/colorAccent</item>
22+
1823
</style>
1924

20-
<style name = "FirebaseUI.WrapperStyle">
25+
<style name="FirebaseUI.WrapperStyle">
2126
<item name="android:layout_height">match_parent</item>
2227
<item name="android:layout_width">match_parent</item>
2328
<item name="android:paddingTop">16dp</item>
@@ -146,8 +151,8 @@
146151
<item name="android:layout_width">match_parent</item>
147152
<item name="android:layout_height">wrap_content</item>
148153
<item name="android:fontFamily">sans-serif</item>
149-
<item name="android:colorActivatedHighlight">@color/colorPrimary</item>
150-
<item name="android:colorFocusedHighlight">@color/colorPrimary</item>
154+
<item name="android:colorActivatedHighlight">@color/authui_colorPrimary</item>
155+
<item name="android:colorFocusedHighlight">@color/authui_colorPrimary</item>
151156
</style>
152157

153158
<style name="FirebaseUI.EditText.PasswordField">

0 commit comments

Comments
 (0)