From 1d251492b08ca17852e4a8bb5b0a9638443da9b2 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Thu, 15 Dec 2022 23:18:14 +0100 Subject: Add support for Material You tinted theme --- .../antennapod/core/preferences/ThemeSwitcher.java | 26 ++-- core/src/main/res/drawable-hdpi/navigation_up.png | Bin 318 -> 0 bytes .../main/res/drawable-hdpi/navigation_up_dark.png | Bin 309 -> 0 bytes core/src/main/res/drawable-mdpi/navigation_up.png | Bin 279 -> 0 bytes .../main/res/drawable-mdpi/navigation_up_dark.png | Bin 267 -> 0 bytes .../res/drawable-v21/drawer_item_background.xml | 4 +- core/src/main/res/drawable-xhdpi/navigation_up.png | Bin 409 -> 0 bytes .../main/res/drawable-xhdpi/navigation_up_dark.png | Bin 408 -> 0 bytes .../main/res/drawable/drawer_item_background.xml | 4 +- .../res/drawable/progress_bar_horizontal_dark.xml | 2 +- .../res/drawable/progress_bar_horizontal_light.xml | 2 +- core/src/main/res/values-v21/styles.xml | 2 +- core/src/main/res/values-v23/styles.xml | 2 +- core/src/main/res/values-v27/styles.xml | 2 +- core/src/main/res/values/attrs.xml | 6 - core/src/main/res/values/colors.xml | 11 -- core/src/main/res/values/styles.xml | 164 ++++++++++++--------- 17 files changed, 122 insertions(+), 103 deletions(-) delete mode 100755 core/src/main/res/drawable-hdpi/navigation_up.png delete mode 100755 core/src/main/res/drawable-hdpi/navigation_up_dark.png delete mode 100755 core/src/main/res/drawable-mdpi/navigation_up.png delete mode 100755 core/src/main/res/drawable-mdpi/navigation_up_dark.png delete mode 100755 core/src/main/res/drawable-xhdpi/navigation_up.png delete mode 100755 core/src/main/res/drawable-xhdpi/navigation_up_dark.png (limited to 'core/src') diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java index 631d0a84f..b7e4934f5 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java @@ -9,40 +9,48 @@ import de.danoeh.antennapod.storage.preferences.UserPreferences; public abstract class ThemeSwitcher { @StyleRes public static int getTheme(Context context) { + boolean dynamic = UserPreferences.getIsThemeColorTinted(); switch (readThemeValue(context)) { case DARK: - return R.style.Theme_AntennaPod_Dark; + return dynamic ? R.style.Theme_AntennaPod_Dynamic_Dark : R.style.Theme_AntennaPod_Dark; case BLACK: - return R.style.Theme_AntennaPod_TrueBlack; + return dynamic ? R.style.Theme_AntennaPod_Dynamic_TrueBlack : R.style.Theme_AntennaPod_TrueBlack; case LIGHT: // fall-through default: - return R.style.Theme_AntennaPod_Light; + return dynamic ? R.style.Theme_AntennaPod_Dynamic_Light : R.style.Theme_AntennaPod_Light; } } @StyleRes public static int getNoTitleTheme(Context context) { + boolean dynamic = UserPreferences.getIsThemeColorTinted(); switch (readThemeValue(context)) { case DARK: - return R.style.Theme_AntennaPod_Dark_NoTitle; + return dynamic ? R.style.Theme_AntennaPod_Dynamic_Dark_NoTitle : R.style.Theme_AntennaPod_Dark_NoTitle; case BLACK: - return R.style.Theme_AntennaPod_TrueBlack_NoTitle; + return dynamic ? R.style.Theme_AntennaPod_Dynamic_TrueBlack_NoTitle + : R.style.Theme_AntennaPod_TrueBlack_NoTitle; case LIGHT: // fall-through default: - return R.style.Theme_AntennaPod_Light_NoTitle; + return dynamic ? R.style.Theme_AntennaPod_Dynamic_Light_NoTitle + : R.style.Theme_AntennaPod_Light_NoTitle; } } @StyleRes public static int getTranslucentTheme(Context context) { + boolean dynamic = UserPreferences.getIsThemeColorTinted(); switch (readThemeValue(context)) { case DARK: - return R.style.Theme_AntennaPod_Dark_Translucent; + return dynamic ? R.style.Theme_AntennaPod_Dynamic_Dark_Translucent + : R.style.Theme_AntennaPod_Dark_Translucent; case BLACK: - return R.style.Theme_AntennaPod_TrueBlack_Translucent; + return dynamic ? R.style.Theme_AntennaPod_Dynamic_TrueBlack_Translucent + : R.style.Theme_AntennaPod_TrueBlack_Translucent; case LIGHT: // fall-through default: - return R.style.Theme_AntennaPod_Light_Translucent; + return dynamic ? R.style.Theme_AntennaPod_Dynamic_Light_Translucent + : R.style.Theme_AntennaPod_Light_Translucent; } } diff --git a/core/src/main/res/drawable-hdpi/navigation_up.png b/core/src/main/res/drawable-hdpi/navigation_up.png deleted file mode 100755 index 370092e7e..000000000 Binary files a/core/src/main/res/drawable-hdpi/navigation_up.png and /dev/null differ diff --git a/core/src/main/res/drawable-hdpi/navigation_up_dark.png b/core/src/main/res/drawable-hdpi/navigation_up_dark.png deleted file mode 100755 index 2b520c553..000000000 Binary files a/core/src/main/res/drawable-hdpi/navigation_up_dark.png and /dev/null differ diff --git a/core/src/main/res/drawable-mdpi/navigation_up.png b/core/src/main/res/drawable-mdpi/navigation_up.png deleted file mode 100755 index 520e11da6..000000000 Binary files a/core/src/main/res/drawable-mdpi/navigation_up.png and /dev/null differ diff --git a/core/src/main/res/drawable-mdpi/navigation_up_dark.png b/core/src/main/res/drawable-mdpi/navigation_up_dark.png deleted file mode 100755 index e53627915..000000000 Binary files a/core/src/main/res/drawable-mdpi/navigation_up_dark.png and /dev/null differ diff --git a/core/src/main/res/drawable-v21/drawer_item_background.xml b/core/src/main/res/drawable-v21/drawer_item_background.xml index 1992158cc..40727bf50 100644 --- a/core/src/main/res/drawable-v21/drawer_item_background.xml +++ b/core/src/main/res/drawable-v21/drawer_item_background.xml @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/core/src/main/res/drawable-xhdpi/navigation_up.png b/core/src/main/res/drawable-xhdpi/navigation_up.png deleted file mode 100755 index 0f954094e..000000000 Binary files a/core/src/main/res/drawable-xhdpi/navigation_up.png and /dev/null differ diff --git a/core/src/main/res/drawable-xhdpi/navigation_up_dark.png b/core/src/main/res/drawable-xhdpi/navigation_up_dark.png deleted file mode 100755 index 539222b2f..000000000 Binary files a/core/src/main/res/drawable-xhdpi/navigation_up_dark.png and /dev/null differ diff --git a/core/src/main/res/drawable/drawer_item_background.xml b/core/src/main/res/drawable/drawer_item_background.xml index a0ec893a8..1eb0d4e11 100644 --- a/core/src/main/res/drawable/drawer_item_background.xml +++ b/core/src/main/res/drawable/drawer_item_background.xml @@ -2,13 +2,13 @@ - + - + diff --git a/core/src/main/res/drawable/progress_bar_horizontal_dark.xml b/core/src/main/res/drawable/progress_bar_horizontal_dark.xml index 7a09fa73f..b575c2f80 100644 --- a/core/src/main/res/drawable/progress_bar_horizontal_dark.xml +++ b/core/src/main/res/drawable/progress_bar_horizontal_dark.xml @@ -8,7 +8,7 @@ - + diff --git a/core/src/main/res/drawable/progress_bar_horizontal_light.xml b/core/src/main/res/drawable/progress_bar_horizontal_light.xml index b982f522f..b2e18c988 100644 --- a/core/src/main/res/drawable/progress_bar_horizontal_light.xml +++ b/core/src/main/res/drawable/progress_bar_horizontal_light.xml @@ -8,7 +8,7 @@ - + diff --git a/core/src/main/res/values-v21/styles.xml b/core/src/main/res/values-v21/styles.xml index fd2e0b640..eb3a3d03e 100644 --- a/core/src/main/res/values-v21/styles.xml +++ b/core/src/main/res/values-v21/styles.xml @@ -1,6 +1,6 @@ - - - + + - - + + - + + + + + + + + + + + + - - - - - - -