From 26215d36414a6243514b33d42ffd134a7c6763ca Mon Sep 17 00:00:00 2001 From: Phillip Hsu Date: Tue, 27 Sep 2016 03:24:58 -0700 Subject: [PATCH] Create black theme --- .../com/philliphsu/clock2/BaseActivity.java | 6 ++++-- app/src/main/res/values-v21/styles.xml | 4 ++++ app/src/main/res/values/colors.xml | 3 +++ app/src/main/res/values/prefs_general.xml | 2 ++ app/src/main/res/values/styles.xml | 17 ++++++++++++++++- 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/philliphsu/clock2/BaseActivity.java b/app/src/main/java/com/philliphsu/clock2/BaseActivity.java index 45271c1..1a86ebc 100644 --- a/app/src/main/java/com/philliphsu/clock2/BaseActivity.java +++ b/app/src/main/java/com/philliphsu/clock2/BaseActivity.java @@ -41,12 +41,14 @@ public abstract class BaseActivity extends AppCompatActivity { PreferenceManager.setDefaultValues(this, R.xml.preferences, false); // ======================================================================================== // TOneverDO: Set theme after setContentView() - // Since the default theme is light, we only need to check against the dark theme. - String themeDark = getString(R.string.theme_dark); + final String themeDark = getString(R.string.theme_dark); + final String themeBlack = getString(R.string.theme_black); String theme = PreferenceManager.getDefaultSharedPreferences(this).getString( getString(R.string.key_theme), null); if (themeDark.equals(theme)) { setTheme(R.style.AppTheme_Dark); + } else if (themeBlack.equals(theme)) { + setTheme(R.style.AppTheme_Black); } // ======================================================================================== setContentView(layoutResId()); diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 5efe5cf..16c39c0 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -27,5 +27,9 @@ @color/colorAccentInverse @color/alert_dialog_background_color_inverse + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d874127..a6b08ab 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,9 +11,12 @@ #FF5252 #303030 + #FF5252 + #1fffffff #0fffffff @color/colorPrimaryFallback @color/colorPrimaryFallbackInverse + #111111 \ No newline at end of file diff --git a/app/src/main/res/values/prefs_general.xml b/app/src/main/res/values/prefs_general.xml index dadb93f..553d6ed 100644 --- a/app/src/main/res/values/prefs_general.xml +++ b/app/src/main/res/values/prefs_general.xml @@ -8,9 +8,11 @@ Light Dark + Black @string/theme_light @string/theme_dark + @string/theme_black last_tab diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 86e360e..fa6f7e6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -34,12 +34,24 @@ @color/colorPrimaryInverse + + + + - +