Skip to content

Add support for dark themes #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 21, 2016
Merged

Add support for dark themes #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
992a181
add support for a dark theme
Oct 21, 2016
12b561a
fix for text color propagation
Oct 21, 2016
241b760
set the edit text color
Oct 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ public class AuthUiActivity extends AppCompatActivity {
@BindView(R.id.purple_theme)
RadioButton mUsePurpleTheme;

@BindView(R.id.dark_theme)
RadioButton mUseDarkTheme;

@BindView(R.id.email_provider)
CheckBox mUseEmailProvider;

Expand Down Expand Up @@ -249,6 +252,10 @@ private int getSelectedTheme() {
return R.style.PurpleTheme;
}

if (mUseDarkTheme.isChecked()) {
return R.style.DarkTheme;
}

return R.style.GreenTheme;
}

Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/layout/auth_ui_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/green_theme" />

<RadioButton
android:id="@+id/dark_theme"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dark_theme" />
</RadioGroup>

<TextView
Expand Down
29 changes: 28 additions & 1 deletion app/src/main/res/values-v21/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<resources>

<style name="PurpleTheme" parent="FirebaseUI">
<item name="android:textColor">#000000</item>
<item name="android:textColorPrimary">@color/material_deep_purple_50</item>

<item name="colorPrimary">@color/material_deep_purple_500</item>
<item name="android:colorPrimary">@color/material_deep_purple_500</item>

Expand All @@ -10,10 +13,12 @@
<item name="colorAccent">@color/material_lime_a700</item>
<item name="android:colorAccent">@color/material_lime_a700</item>


<item name="colorControlNormal">@color/material_deep_purple_500</item>
<item name="android:colorControlNormal">@color/material_deep_purple_500</item>

<item name="colorButtonNormal">@color/material_deep_purple_500</item>
<item name="android:colorButtonNormal">@color/material_deep_purple_500</item>

<item name="colorControlActivated">@color/material_deep_purple_a200</item>
<item name="android:colorControlActivated">@color/material_deep_purple_a200</item>

Expand All @@ -24,6 +29,9 @@
</style>

<style name="GreenTheme" parent="FirebaseUI">
<item name="android:textColor">@color/material_green_500</item>
<item name="android:textColorPrimary">@color/material_green_50</item>

<item name="colorPrimary">@color/material_green_500</item>
<item name="android:colorPrimary">@color/material_green_500</item>

Expand All @@ -33,6 +41,9 @@
<item name="colorAccent">@color/material_purple_a700</item>
<item name="android:colorAccent">@color/material_purple_a700</item>

<item name="colorButtonNormal">@color/material_purple_a700</item>
<item name="android:colorButtonNormal">@color/material_purple_a700</item>

<item name="colorControlNormal">@color/material_green_500</item>
<item name="android:colorControlNormal">@color/material_green_500</item>

Expand All @@ -45,6 +56,22 @@
<item name="android:windowBackground">@color/material_green_50</item>
</style>

<style name="DarkTheme" parent="FirebaseUI">
<item name="colorPrimary">@color/primary_material_dark</item>
<item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
<item name="colorAccent">@color/accent_material_dark</item>
<item name="android:colorBackground">@color/background_material_dark</item>
<item name="android:colorForeground">@color/foreground_material_dark</item>
<item name="android:navigationBarColor">@android:color/black</item>
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:textColor">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item>
<item name="android:textColorSecondary">@color/abc_secondary_text_material_dark</item>
<item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:windowBackground">@color/background_material_dark</item>
</style>

<style name="WarnButton" parent="Widget.AppCompat.Button.Colored">
<item name="android:colorButtonNormal">@color/material_red_a200</item>
<item name="android:textColor">@android:color/white</item>
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,9 @@
<color name="material_purple_a700">#AA00FF</color>

<color name="material_red_a200">#FF5252</color>

<color name="material_grey_200">#EEEEEE</color>
<color name="material_grey_400">#BDBDBD</color>
<color name="material_grey_500">#9E9E9E</color>
<color name="material_grey_700">#616161</color>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<string name="sign_in">Start</string>
<string name="green_theme">Green Theme</string>
<string name="purple_theme">Purple Theme</string>
<string name="dark_theme">Dark Theme</string>
<string name="use_theme_header">Use theme:</string>
<string name="logo_header">Logo:</string>
<string name="firebase_logo_label">Firebase Auth</string>
Expand Down
20 changes: 20 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<item name="colorControlActivated">@color/material_deep_purple_a200</item>
<item name="colorControlHighlight">@color/material_lime_a700</item>
<item name="android:windowBackground">@color/material_deep_purple_50</item>
<item name="android:textColor">@color/material_grey_900</item>
<item name="android:textColorPrimary">@color/material_deep_purple_50</item>
<item name="colorButtonNormal">@color/material_deep_purple_500</item>
</style>

<style name="GreenTheme" parent="FirebaseUI">
Expand All @@ -24,6 +27,23 @@
<item name="colorControlActivated">@color/material_lime_a700</item>
<item name="colorControlHighlight">@color/material_green_a200</item>
<item name="android:windowBackground">@color/material_green_50</item>
<item name="android:textColor">@color/material_grey_900</item>
<item name="android:textColorPrimary">@color/material_deep_purple_50</item>
<item name="colorButtonNormal">@color/material_green_500</item>
</style>

<style name="DarkTheme" parent="FirebaseUI">
<item name="colorPrimary">@color/primary_material_dark</item>
<item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
<item name="colorAccent">@color/accent_material_dark</item>
<item name="android:colorBackground">@color/background_material_dark</item>
<item name="android:colorForeground">@color/foreground_material_dark</item>
<item name="android:textColor">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item>
<item name="android:textColorSecondary">@color/abc_secondary_text_material_dark</item>
<item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:windowBackground">@color/background_material_dark</item>
</style>

<style name="WarnButton" parent="Widget.AppCompat.Button.Colored">
Expand Down
21 changes: 0 additions & 21 deletions auth/src/main/res/drawable-v21/rounded_button.xml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions auth/src/main/res/drawable/rounded_button.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion auth/src/main/res/layout/confirm_recovery_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
android:orientation="vertical"
style="@style/FirebaseUI.WrapperStyle">
<TextView
style="@style/FirebaseUI.Text.BodyText"
style="@style/FirebaseUI.Text.BodyTextNoColor"
android:id="@+id/body_text"/>
<Button
style="@style/FirebaseUI.Button.AlertButton"
Expand Down
35 changes: 17 additions & 18 deletions auth/src/main/res/values-v21/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,31 @@
<item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
<item name="colorAccent">@color/authui_colorAccent</item>
<item name="colorButtonNormal">@color/authui_colorPrimary</item>

<item name="android:colorPrimary">@color/authui_colorPrimary</item>
<item name="android:colorPrimaryDark">@color/authui_colorPrimaryDark</item>
<item name="android:colorAccent">@color/authui_colorAccent</item>
<item name="android:colorButtonNormal">@color/authui_colorPrimary</item>

<item name="android:textColorHint">@color/authui_colorPrimary</item>
<item name="android:buttonStyle">@style/FirebaseUI.Button</item>
<item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
<item name="android:textViewStyle">@style/FirebaseUI.Text.BodyText</item>
<item name="android:textColorPrimary">#FFF</item>
<item name="android:textColor">#000</item>
</style>

<style name="FirebaseUI.Dialog" parent="Base.Theme.AppCompat.Light.Dialog.MinWidth">
<item name="colorPrimary">@color/authui_colorPrimary</item>
<item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
<item name="colorAccent">@color/authui_colorAccent</item>
<item name="colorButtonNormal">@color/authui_colorPrimary</item>

<item name="android:colorPrimary">@color/authui_colorPrimary</item>
<item name="android:colorPrimaryDark">@color/authui_colorPrimaryDark</item>
<item name="android:colorAccent">@color/authui_colorAccent</item>
<item name="android:colorButtonNormal">@color/authui_colorPrimary</item>

<item name="android:buttonStyle">@style/FirebaseUI.Button</item>
<item name="android:editTextStyle">@style/FirebaseUI.EditText</item>

<item name="android:layout_width">match_parent</item>
<item name="android:windowMinWidthMajor">360dp</item>
<item name="android:layout_height">match_parent</item>
</style>
</resources>

<style name="FirebaseUI.EditText">
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">8sp</item>
<item name="android:textColorHint">?android:textColor</item>
<item name="android:textColor">?android:textColor</item>
<item name="android:editTextColor">?android:textColor</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textCursorDrawable">@null</item>
</style>
</resources>
11 changes: 4 additions & 7 deletions auth/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@
<color name="authui_colorPrimaryDark">#2F3E9E</color>
<color name="authui_colorAccent">#3E50B4</color>
<color name="authui_colorActivated">#1a237e</color>
<color name="authui_inputTextColor">#FFFFFF</color>
<color name="authui_inputTextColorDisabled">#333333</color>
<color name="authui_inputTextColorDark">#000000</color>
<color name="authui_inputTextColorDarkDisabled">#333333</color>

<color name="headingColor">#212121</color>
<color name="bodyTextColor">#c0000000</color>
<color name="errorColor">#DD2C00</color>
<color name="linkColor">#4285F4</color>
<color name="buttonColor">@color/authui_colorPrimary</color>
<color name="buttonColorPressed">@color/authui_colorActivated</color>
<color name="buttonTextColor">#FFFFFF</color>
<color name="inputLabelColor">#757575</color>
<color name="shadowColor">#eeeeee</color>
</resources>
42 changes: 17 additions & 25 deletions auth/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="FirebaseUI" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:textColor">@color/authui_inputTextColorDark</item>
<item name="android:textColorPrimary">@color/authui_inputTextColor</item>
<item name="colorPrimary">@color/authui_colorPrimary</item>
<item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
<item name="colorAccent">@color/authui_colorAccent</item>
<item name="colorButtonNormal">@color/authui_colorPrimary</item>

<item name="android:buttonStyle">@style/FirebaseUI.Button</item>
<item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
<item name="colorControlNormal">@color/authui_colorPrimary</item>
<item name="colorControlActivated">@color/authui_colorAccent</item>
<item name="colorControlHighlight">@color/authui_colorAccent</item>
</style>

<style name="FirebaseUI.Dialog" parent="Base.Theme.AppCompat.Light.Dialog.MinWidth">
<item name="colorPrimary">@color/authui_colorPrimary</item>
<item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
<item name="colorAccent">@color/authui_colorAccent</item>
<item name="colorButtonNormal">@color/authui_colorPrimary</item>

<item name="android:layout_width">match_parent</item>
<item name="android:windowMinWidthMajor">360dp</item>
<item name="android:layout_height">match_parent</item>
Expand Down Expand Up @@ -106,10 +105,11 @@
<!-- Common styles -->
<style name="FirebaseUI.Text.TextInputLayout">
<item name="android:paddingTop">8dp</item>
<item name="android:textColorHint">?android:attr/textColor</item>
</style>

<style name="FirebaseUI.Text.HintText" parent="FirebaseUI.Text.T12">
<item name="android:textColor">@color/inputLabelColor</item>
<item name="android:textColor">?android:attr/textColor</item>
</style>

<style name="FirebaseUI.Text.ErrorText" parent="FirebaseUI.Text.T12">
Expand All @@ -120,18 +120,12 @@

<style name="FirebaseUI.Button" parent="@style/Widget.AppCompat.Button">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">right</item>
<item name="android:layout_height">36dp</item>
<item name="android:layout_margin">8dp</item>
<item name="android:textColor">@color/buttonTextColor</item>
<item name="android:textAllCaps">true</item>
<item name="android:radius">3dp</item>
<item name="android:background">@drawable/rounded_button</item>
<item name="android:textColor">?attr/android:textColorPrimary</item>
</style>

<style name="FirebaseUI.Button.NextButton">
<item name="android:layout_width">88dp</item>
<item name="android:layout_height">36dp</item>
</style>

<style name="FirebaseUI.Button.AlertButton">
Expand All @@ -142,19 +136,19 @@
<item name="android:layout_marginBottom">0dp</item>
<item name="android:gravity">right|center</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@color/buttonColor</item>
</style>

<style name="FirebaseUI.EditText">
<item name="android:textColor">?android:textColor</item>
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">8sp</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:colorActivatedHighlight">@color/authui_colorPrimary</item>
<item name="android:colorFocusedHighlight">@color/authui_colorPrimary</item>
<item name="android:textCursorDrawable">@null</item>
</style>


<style name="FirebaseUI.EditText.PasswordField">
<item name="android:hint">@string/password_hint</item>
<item name="android:inputType">textPassword</item>
Expand All @@ -172,26 +166,24 @@

<style name="FirebaseUI.Text.Link">
<item name="android:textColor">@color/linkColor</item>

</style>

<style name="FirebaseUI.Text.Heading" parent="FirebaseUI.Text.T07">
<item name="android:textColor">@color/headingColor</item>
<item name="android:paddingTop">0dp</item>
<item name="android:paddingBottom">16dp</item>
</style>

<style name="FirebaseUI.Text.BodyText" parent="FirebaseUI.Text.T08">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/bodyTextColor</item>
<item name="android:textColor">?android:textColor</item>
<item name="android:paddingBottom">16dp</item>
</style>

<style name="FirebaseUI.Text.InputLabel" parent="FirebaseUI.Text.T12">
<item name="android:textColor">@color/inputLabelColor</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingBottom">8dp</item>
<style name="FirebaseUI.Text.BodyTextNoColor" parent="FirebaseUI.Text.T08">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingBottom">16dp</item>
</style>

<!-- Authentication method picker styles -->
Expand Down