From 3e7c7d77f98be134170de326e1f485b9b864f0be Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 4 Jan 2016 00:40:24 -0500 Subject: [PATCH] Remove holo theme --- .../com/moez/QKSMS/common/FontManager.java | 2 +- .../QKSMS/receiver/NightModeAutoReceiver.java | 4 +- .../java/com/moez/QKSMS/ui/ThemeManager.java | 43 +++++++------------ .../com/moez/QKSMS/ui/base/QKActivity.java | 13 ++---- .../moez/QKSMS/ui/base/QKPopupActivity.java | 8 +--- .../ui/welcome/WelcomeNightFragment.java | 4 +- QKSMS/src/main/res/values-cs/strings.xml | 1 - QKSMS/src/main/res/values-da/strings.xml | 1 - QKSMS/src/main/res/values-de/strings.xml | 1 - QKSMS/src/main/res/values-es/strings.xml | 1 - QKSMS/src/main/res/values-fa/strings.xml | 1 - QKSMS/src/main/res/values-fi/strings.xml | 1 - QKSMS/src/main/res/values-fr/strings.xml | 1 - QKSMS/src/main/res/values-hi/strings.xml | 1 - QKSMS/src/main/res/values-in/strings.xml | 1 - QKSMS/src/main/res/values-it/strings.xml | 1 - QKSMS/src/main/res/values-iw/strings.xml | 1 - QKSMS/src/main/res/values-ja/strings.xml | 1 - QKSMS/src/main/res/values-ko/strings.xml | 1 - QKSMS/src/main/res/values-lt/strings.xml | 1 - QKSMS/src/main/res/values-ne/strings.xml | 1 - QKSMS/src/main/res/values-nl/strings.xml | 1 - QKSMS/src/main/res/values-no/strings.xml | 1 - QKSMS/src/main/res/values-pl/strings.xml | 1 - QKSMS/src/main/res/values-pt-rBR/strings.xml | 1 - QKSMS/src/main/res/values-pt/strings.xml | 1 - QKSMS/src/main/res/values-ro/strings.xml | 1 - QKSMS/src/main/res/values-ru/strings.xml | 1 - QKSMS/src/main/res/values-sk/strings.xml | 1 - QKSMS/src/main/res/values-sr/strings.xml | 1 - QKSMS/src/main/res/values-sv/strings.xml | 1 - QKSMS/src/main/res/values-tl/strings.xml | 1 - QKSMS/src/main/res/values-tr/strings.xml | 1 - QKSMS/src/main/res/values-zh-rCN/strings.xml | 1 - QKSMS/src/main/res/values-zh/strings.xml | 1 - QKSMS/src/main/res/values/donottranslate.xml | 3 +- QKSMS/src/main/res/values/strings.xml | 5 +-- QKSMS/src/main/res/values/themes.xml | 12 ------ .../src/main/res/xml/settings_appearance.xml | 2 +- QKSMS/src/main/res/xml/settings_main.xml | 2 +- QKSMS/src/main/res/xml/settings_simple.xml | 2 +- 41 files changed, 31 insertions(+), 98 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java index 8c8c1fd5..3fba1805 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java @@ -89,7 +89,7 @@ public class FontManager { // Colors and font weight switch (type) { case FontManager.TEXT_TYPE_PRIMARY: - boolean isNight = ThemeManager.getTheme() == ThemeManager.Theme.GREY || + boolean isNight = ThemeManager.getTheme() == ThemeManager.Theme.DARK || ThemeManager.getTheme() == ThemeManager.Theme.BLACK; int id = isNight ? R.color.text_primary_dark : R.color.text_primary_light; return context.getResources().getColorStateList(id); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/NightModeAutoReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/NightModeAutoReceiver.java index f997b60b..c8cc1929 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/NightModeAutoReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/NightModeAutoReceiver.java @@ -41,11 +41,11 @@ public class NightModeAutoReceiver extends BroadcastReceiver { (calendar.get(Calendar.HOUR_OF_DAY) == day.get(Calendar.HOUR_OF_DAY) && calendar.get(Calendar.MINUTE) <= day.get(Calendar.MINUTE))) { Log.i(TAG, "Switching to night mode"); prefs.edit().putString(SettingsFragment.BACKGROUND, ThemeManager.Theme.PREF_GREY).apply(); - ThemeManager.setTheme(ThemeManager.Theme.GREY); + ThemeManager.setTheme(ThemeManager.Theme.DARK); } else { Log.i(TAG, "Switching to day mode"); prefs.edit().putString(SettingsFragment.BACKGROUND, ThemeManager.Theme.PREF_OFFWHITE).apply(); - ThemeManager.setTheme(ThemeManager.Theme.OFFWHITE); + ThemeManager.setTheme(ThemeManager.Theme.LIGHT); } } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index 36741767..0bee3052 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -39,29 +39,25 @@ public class ThemeManager { public static final int TRANSITION_LENGTH = 500; public enum Theme { - WHITE, - OFFWHITE, - GREY, + LIGHT, + DARK, BLACK; - public static final String PREF_WHITE = "white"; - public static final String PREF_OFFWHITE = "offwhite"; + public static final String PREF_OFFWHITE = "light"; public static final String PREF_GREY = "grey"; public static final String PREF_BLACK = "black"; public static Theme fromString(String color) { switch (color) { - case PREF_WHITE: - return WHITE; case PREF_OFFWHITE: - return OFFWHITE; + return LIGHT; case PREF_GREY: - return GREY; + return DARK; case PREF_BLACK: return BLACK; default: Log.w(TAG, "Tried to set theme with invalid string: " + color); - return OFFWHITE; + return LIGHT; } } } @@ -300,13 +296,10 @@ public class ThemeManager { mTheme = theme; switch (theme) { - case WHITE: - mBackgroundColor = mResources.getColor(R.color.white_pure); - break; - case OFFWHITE: + case LIGHT: mBackgroundColor = mResources.getColor(R.color.grey_light_mega_ultra); break; - case GREY: + case DARK: mBackgroundColor = mResources.getColor(R.color.grey_material); break; case BLACK: @@ -315,13 +308,12 @@ public class ThemeManager { } switch (mTheme) { - case WHITE: - case OFFWHITE: + case LIGHT: mTextOnBackgroundPrimary = mResources.getColor(R.color.theme_light_text_primary); mtextOnBackgroundSecondary = mResources.getColor(R.color.theme_light_text_secondary); mRippleBackground = mResources.getDrawable(R.drawable.button_background_transparent); break; - case GREY: + case DARK: case BLACK: mTextOnBackgroundPrimary = mResources.getColor(R.color.theme_dark_text_primary); mtextOnBackgroundSecondary = mResources.getColor(R.color.theme_dark_text_secondary); @@ -459,17 +451,14 @@ public class ThemeManager { } switch (mTheme) { - case WHITE: - return mResources.getColor(R.color.grey_light_mega_ultra); - - case OFFWHITE: - return mResources.getColor(R.color.white_pure); - - case GREY: + case DARK: return mResources.getColor(R.color.grey_dark); - default: + case BLACK: return mResources.getColor(R.color.grey_material); + + default: + return mResources.getColor(R.color.white_pure); } } @@ -490,7 +479,7 @@ public class ThemeManager { } public static boolean isNightMode() { - return mTheme == Theme.GREY || mTheme == Theme.BLACK; + return mTheme == Theme.DARK || mTheme == Theme.BLACK; } public static void showColorPickerDialog(final QKActivity context) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java index 71cc3650..6ec2312e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java @@ -101,12 +101,11 @@ public abstract class QKActivity extends AppCompatActivity { LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { setTheme(getThemeRes()); switch (ThemeManager.getTheme()) { - case WHITE: - case OFFWHITE: + case LIGHT: mToolbar.setPopupTheme(R.style.PopupThemeLight); break; - case GREY: + case DARK: case BLACK: mToolbar.setPopupTheme(R.style.PopupTheme); break; @@ -263,13 +262,7 @@ public abstract class QKActivity extends AppCompatActivity { protected int getThemeRes() { switch (ThemeManager.getTheme()) { - case WHITE: - return R.style.AppThemeWhite; - - case OFFWHITE: - return R.style.AppThemeLight; - - case GREY: + case DARK: return R.style.AppThemeDark; case BLACK: diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKPopupActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKPopupActivity.java index c46ed99c..52c70440 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKPopupActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKPopupActivity.java @@ -41,13 +41,7 @@ public abstract class QKPopupActivity extends QKActivity { @Override protected int getThemeRes() { switch (ThemeManager.getTheme()) { - case WHITE: - return R.style.AppThemeWhiteDialog; - - case OFFWHITE: - return R.style.AppThemeLightDialog; - - case GREY: + case DARK: return R.style.AppThemeDarkDialog; case BLACK: diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeNightFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeNightFragment.java index 648a83dc..210e0c31 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeNightFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeNightFragment.java @@ -63,11 +63,11 @@ public class WelcomeNightFragment extends BaseWelcomeFragment implements BaseWel @Override public void onClick(View v) { if (v.getId() == R.id.welcome_night_hint) { - boolean night = ThemeManager.getTheme() == ThemeManager.Theme.OFFWHITE; + boolean night = ThemeManager.getTheme() == ThemeManager.Theme.LIGHT; int backgroundColor = mContext.getResources().getColor(night ? R.color.grey_light_mega_ultra : R.color.grey_material); int newBackgroundColor = mContext.getResources().getColor(night ? R.color.grey_material : R.color.grey_light_mega_ultra); - ThemeManager.setTheme(night ? ThemeManager.Theme.GREY : ThemeManager.Theme.OFFWHITE); + ThemeManager.setTheme(night ? ThemeManager.Theme.DARK : ThemeManager.Theme.LIGHT); ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), backgroundColor, newBackgroundColor); colorAnimation.setDuration(ThemeManager.TRANSITION_LENGTH); diff --git a/QKSMS/src/main/res/values-cs/strings.xml b/QKSMS/src/main/res/values-cs/strings.xml index f5e3bfda..b6c583dc 100755 --- a/QKSMS/src/main/res/values-cs/strings.xml +++ b/QKSMS/src/main/res/values-cs/strings.xml @@ -469,7 +469,6 @@ Odstranit zprávu - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-da/strings.xml b/QKSMS/src/main/res/values-da/strings.xml index 3cfd69a6..eff03e1a 100755 --- a/QKSMS/src/main/res/values-da/strings.xml +++ b/QKSMS/src/main/res/values-da/strings.xml @@ -468,7 +468,6 @@ Slet besked - Hvid Hvidligt Mørk grå Sort diff --git a/QKSMS/src/main/res/values-de/strings.xml b/QKSMS/src/main/res/values-de/strings.xml index 91009a7d..18b26fb8 100755 --- a/QKSMS/src/main/res/values-de/strings.xml +++ b/QKSMS/src/main/res/values-de/strings.xml @@ -468,7 +468,6 @@ Nachricht löschen - Weiß Grau Dunkelgrau Schwarz diff --git a/QKSMS/src/main/res/values-es/strings.xml b/QKSMS/src/main/res/values-es/strings.xml index 2d547d74..ce74ecca 100755 --- a/QKSMS/src/main/res/values-es/strings.xml +++ b/QKSMS/src/main/res/values-es/strings.xml @@ -468,7 +468,6 @@ Eliminar mensaje - Blanco Off-white Gris oscuro Negro diff --git a/QKSMS/src/main/res/values-fa/strings.xml b/QKSMS/src/main/res/values-fa/strings.xml index 4f0d4060..04288394 100755 --- a/QKSMS/src/main/res/values-fa/strings.xml +++ b/QKSMS/src/main/res/values-fa/strings.xml @@ -467,7 +467,6 @@ Delete message - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-fi/strings.xml b/QKSMS/src/main/res/values-fi/strings.xml index 608e1f43..df601287 100755 --- a/QKSMS/src/main/res/values-fi/strings.xml +++ b/QKSMS/src/main/res/values-fi/strings.xml @@ -468,7 +468,6 @@ Poista viesti - Valkoinen Luonnonvalkoinen Tummanharmaa Musta diff --git a/QKSMS/src/main/res/values-fr/strings.xml b/QKSMS/src/main/res/values-fr/strings.xml index f16e2dda..ec7e43f8 100755 --- a/QKSMS/src/main/res/values-fr/strings.xml +++ b/QKSMS/src/main/res/values-fr/strings.xml @@ -468,7 +468,6 @@ Supprimer le message - Blanc Blanc cassé Gris foncé Noir diff --git a/QKSMS/src/main/res/values-hi/strings.xml b/QKSMS/src/main/res/values-hi/strings.xml index c5789cb9..50d02903 100755 --- a/QKSMS/src/main/res/values-hi/strings.xml +++ b/QKSMS/src/main/res/values-hi/strings.xml @@ -468,7 +468,6 @@ संदेश हटाएं - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-in/strings.xml b/QKSMS/src/main/res/values-in/strings.xml index ef483643..fc562b61 100755 --- a/QKSMS/src/main/res/values-in/strings.xml +++ b/QKSMS/src/main/res/values-in/strings.xml @@ -467,7 +467,6 @@ Hapus pesan - Putih Off-white Abu-abu gelap Hitam diff --git a/QKSMS/src/main/res/values-it/strings.xml b/QKSMS/src/main/res/values-it/strings.xml index 75d9c548..b93c34a7 100755 --- a/QKSMS/src/main/res/values-it/strings.xml +++ b/QKSMS/src/main/res/values-it/strings.xml @@ -468,7 +468,6 @@ Elimina il messaggio - Bianco Bianco sporco Grigio scuro Nero diff --git a/QKSMS/src/main/res/values-iw/strings.xml b/QKSMS/src/main/res/values-iw/strings.xml index b2fd6f18..f933002f 100755 --- a/QKSMS/src/main/res/values-iw/strings.xml +++ b/QKSMS/src/main/res/values-iw/strings.xml @@ -473,7 +473,6 @@ מחק הודעה - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-ja/strings.xml b/QKSMS/src/main/res/values-ja/strings.xml index e3249f36..e6fd4a53 100755 --- a/QKSMS/src/main/res/values-ja/strings.xml +++ b/QKSMS/src/main/res/values-ja/strings.xml @@ -467,7 +467,6 @@ メッセージを削除 - 白 オフホワイト ダークグレー 黒 diff --git a/QKSMS/src/main/res/values-ko/strings.xml b/QKSMS/src/main/res/values-ko/strings.xml index 01a55917..89dfa5b2 100755 --- a/QKSMS/src/main/res/values-ko/strings.xml +++ b/QKSMS/src/main/res/values-ko/strings.xml @@ -467,7 +467,6 @@ 메시지 삭제 - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-lt/strings.xml b/QKSMS/src/main/res/values-lt/strings.xml index ab92324b..956ed58f 100755 --- a/QKSMS/src/main/res/values-lt/strings.xml +++ b/QKSMS/src/main/res/values-lt/strings.xml @@ -469,7 +469,6 @@ Ištrinti žinutę - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-ne/strings.xml b/QKSMS/src/main/res/values-ne/strings.xml index 283a5645..a49d7d15 100755 --- a/QKSMS/src/main/res/values-ne/strings.xml +++ b/QKSMS/src/main/res/values-ne/strings.xml @@ -468,7 +468,6 @@ Delete message - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-nl/strings.xml b/QKSMS/src/main/res/values-nl/strings.xml index a2d84333..63efa371 100755 --- a/QKSMS/src/main/res/values-nl/strings.xml +++ b/QKSMS/src/main/res/values-nl/strings.xml @@ -468,7 +468,6 @@ Bericht verwijderen - Wit Gebroken wit Donkergrijs Zwart diff --git a/QKSMS/src/main/res/values-no/strings.xml b/QKSMS/src/main/res/values-no/strings.xml index 97ed060a..4b541cef 100755 --- a/QKSMS/src/main/res/values-no/strings.xml +++ b/QKSMS/src/main/res/values-no/strings.xml @@ -468,7 +468,6 @@ Slett melding - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-pl/strings.xml b/QKSMS/src/main/res/values-pl/strings.xml index 9bf012e5..e93ffad2 100755 --- a/QKSMS/src/main/res/values-pl/strings.xml +++ b/QKSMS/src/main/res/values-pl/strings.xml @@ -469,7 +469,6 @@ Usuń wiadomość - Biały Złamana biel Ciemnoszary Czarny diff --git a/QKSMS/src/main/res/values-pt-rBR/strings.xml b/QKSMS/src/main/res/values-pt-rBR/strings.xml index a29f4040..03aa2e5f 100755 --- a/QKSMS/src/main/res/values-pt-rBR/strings.xml +++ b/QKSMS/src/main/res/values-pt-rBR/strings.xml @@ -470,7 +470,6 @@ Plural form: Conversas serão excluídas. Excluir mensagem - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-pt/strings.xml b/QKSMS/src/main/res/values-pt/strings.xml index f1f0f6c6..a0ca8b3e 100755 --- a/QKSMS/src/main/res/values-pt/strings.xml +++ b/QKSMS/src/main/res/values-pt/strings.xml @@ -468,7 +468,6 @@ Apagar mensagem - Branco Branco (off) Cinzento Preto diff --git a/QKSMS/src/main/res/values-ro/strings.xml b/QKSMS/src/main/res/values-ro/strings.xml index 7f6d11c8..cd1c260a 100755 --- a/QKSMS/src/main/res/values-ro/strings.xml +++ b/QKSMS/src/main/res/values-ro/strings.xml @@ -469,7 +469,6 @@ Ştergeţi mesajul - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-ru/strings.xml b/QKSMS/src/main/res/values-ru/strings.xml index c8749897..74fcfdc9 100755 --- a/QKSMS/src/main/res/values-ru/strings.xml +++ b/QKSMS/src/main/res/values-ru/strings.xml @@ -470,7 +470,6 @@ Удалить сообщение - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-sk/strings.xml b/QKSMS/src/main/res/values-sk/strings.xml index 717d1fd6..a0b4ca6d 100755 --- a/QKSMS/src/main/res/values-sk/strings.xml +++ b/QKSMS/src/main/res/values-sk/strings.xml @@ -469,7 +469,6 @@ Odstrániť správu - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-sr/strings.xml b/QKSMS/src/main/res/values-sr/strings.xml index 26fd07d9..7a473743 100755 --- a/QKSMS/src/main/res/values-sr/strings.xml +++ b/QKSMS/src/main/res/values-sr/strings.xml @@ -469,7 +469,6 @@ Избриши поруку - Бела Беличаста Тамно-сива Црна diff --git a/QKSMS/src/main/res/values-sv/strings.xml b/QKSMS/src/main/res/values-sv/strings.xml index acea66ab..8360201b 100755 --- a/QKSMS/src/main/res/values-sv/strings.xml +++ b/QKSMS/src/main/res/values-sv/strings.xml @@ -468,7 +468,6 @@ Ta bort meddelande - Vit Av-vit Mörkgrå Svart diff --git a/QKSMS/src/main/res/values-tl/strings.xml b/QKSMS/src/main/res/values-tl/strings.xml index 219067c6..8602bda2 100755 --- a/QKSMS/src/main/res/values-tl/strings.xml +++ b/QKSMS/src/main/res/values-tl/strings.xml @@ -468,7 +468,6 @@ Burahin ang mensahe - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values-tr/strings.xml b/QKSMS/src/main/res/values-tr/strings.xml index c0fb0903..d09b67dc 100755 --- a/QKSMS/src/main/res/values-tr/strings.xml +++ b/QKSMS/src/main/res/values-tr/strings.xml @@ -468,7 +468,6 @@ Mesajı sil - Beyaz Kirli beyaz Koyu gri Siyah diff --git a/QKSMS/src/main/res/values-zh-rCN/strings.xml b/QKSMS/src/main/res/values-zh-rCN/strings.xml index 34068b0d..06f91862 100755 --- a/QKSMS/src/main/res/values-zh-rCN/strings.xml +++ b/QKSMS/src/main/res/values-zh-rCN/strings.xml @@ -467,7 +467,6 @@ 删除信息 - 白 Off-white Dark grey 黑 diff --git a/QKSMS/src/main/res/values-zh/strings.xml b/QKSMS/src/main/res/values-zh/strings.xml index e558804e..08d84576 100755 --- a/QKSMS/src/main/res/values-zh/strings.xml +++ b/QKSMS/src/main/res/values-zh/strings.xml @@ -470,7 +470,6 @@ 刪除訊息 - White Off-white Dark grey Black diff --git a/QKSMS/src/main/res/values/donottranslate.xml b/QKSMS/src/main/res/values/donottranslate.xml index 4513ca98..a19ddf6d 100644 --- a/QKSMS/src/main/res/values/donottranslate.xml +++ b/QKSMS/src/main/res/values/donottranslate.xml @@ -4,8 +4,7 @@ QKSMS - white - offwhite + light grey black diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 1c50db8a..483a0920 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -744,9 +744,8 @@ - White - Off-white - Dark grey + Material Light + Material Dark Black diff --git a/QKSMS/src/main/res/values/themes.xml b/QKSMS/src/main/res/values/themes.xml index 3f92a3f5..01c003cd 100644 --- a/QKSMS/src/main/res/values/themes.xml +++ b/QKSMS/src/main/res/values/themes.xml @@ -1,18 +1,6 @@ - - - - - -