diff --git a/app/src/main/java/de/jrpie/android/launcher/preferences/LauncherPreferences$Config.java b/app/src/main/java/de/jrpie/android/launcher/preferences/LauncherPreferences$Config.java index b98a157..54035a3 100644 --- a/app/src/main/java/de/jrpie/android/launcher/preferences/LauncherPreferences$Config.java +++ b/app/src/main/java/de/jrpie/android/launcher/preferences/LauncherPreferences$Config.java @@ -40,6 +40,7 @@ import eu.jonahbauer.android.preference.annotations.serializer.PreferenceSeriali @Preference(name = "color_theme", type = ColorTheme.class, defaultValue = "DEFAULT"), @Preference(name = "background", type = Background.class, defaultValue = "DIM"), @Preference(name = "font", type = Font.class, defaultValue = "HACK"), + @Preference(name = "text_shadow", type = boolean.class, defaultValue = "false"), @Preference(name = "monochrome_icons", type = boolean.class, defaultValue = "false"), }), @PreferenceGroup(name = "clock", prefix = "settings_clock_", suffix = "_key", value = { diff --git a/app/src/main/java/de/jrpie/android/launcher/preferences/Preferences.kt b/app/src/main/java/de/jrpie/android/launcher/preferences/Preferences.kt index 2a3e54e..27c3d2a 100644 --- a/app/src/main/java/de/jrpie/android/launcher/preferences/Preferences.kt +++ b/app/src/main/java/de/jrpie/android/launcher/preferences/Preferences.kt @@ -419,7 +419,7 @@ fun resetPreferences(context: Context) { LauncherPreferences.internal().versionCode(PREFERENCE_VERSION) LauncherPreferences.apps().hidden( - LauncherPreferences.apps().hidden().also { + LauncherPreferences.apps().hidden()?.also { it.add( DetailedAppInfo.fromAppInfo( AppInfo( diff --git a/app/src/main/java/de/jrpie/android/launcher/preferences/theme/ColorTheme.kt b/app/src/main/java/de/jrpie/android/launcher/preferences/theme/ColorTheme.kt index acebc80..28963bc 100644 --- a/app/src/main/java/de/jrpie/android/launcher/preferences/theme/ColorTheme.kt +++ b/app/src/main/java/de/jrpie/android/launcher/preferences/theme/ColorTheme.kt @@ -4,12 +4,17 @@ import android.content.res.Resources import de.jrpie.android.launcher.R @Suppress("unused") -enum class ColorTheme(val id: Int) { - DEFAULT(R.style.colorThemeDefault), - DARK(R.style.colorThemeDark), +enum class ColorTheme(private val id: Int, private val shadowId: Int) { + DEFAULT(R.style.colorThemeDefault, R.style.textShadow), + DARK(R.style.colorThemeDark, R.style.textShadow), + LIGHT(R.style.colorThemeLight, R.style.textShadowLight), ; - fun applyToTheme(theme: Resources.Theme) { + fun applyToTheme(theme: Resources.Theme, shadow: Boolean) { theme.applyStyle(id, true) + + if (shadow) { + theme.applyStyle(shadowId, true) + } } } \ No newline at end of file diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt index 7159e00..5573832 100644 --- a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt @@ -162,6 +162,11 @@ class HomeActivity : UIObject, AppCompatActivity(), val mTheme = modifyTheme(super.getTheme()) mTheme.applyStyle(R.style.backgroundWallpaper, true) LauncherPreferences.clock().font().applyToTheme(mTheme) + LauncherPreferences.theme().colorTheme().applyToTheme( + mTheme, + LauncherPreferences.theme().textShadow() + ) + return mTheme } diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/UIObject.kt b/app/src/main/java/de/jrpie/android/launcher/ui/UIObject.kt index b352d95..8c1af84 100644 --- a/app/src/main/java/de/jrpie/android/launcher/ui/UIObject.kt +++ b/app/src/main/java/de/jrpie/android/launcher/ui/UIObject.kt @@ -5,6 +5,7 @@ import android.content.pm.ActivityInfo import android.content.res.Resources import android.view.Window import android.view.WindowManager +import de.jrpie.android.launcher.R import de.jrpie.android.launcher.preferences.LauncherPreferences /** @@ -53,7 +54,10 @@ interface UIObject { } fun modifyTheme(theme: Resources.Theme): Resources.Theme { - LauncherPreferences.theme().colorTheme().applyToTheme(theme) + LauncherPreferences.theme().colorTheme().applyToTheme( + theme, + LauncherPreferences.theme().textShadow() + ) LauncherPreferences.theme().background().applyToTheme(theme) LauncherPreferences.theme().font().applyToTheme(theme) diff --git a/app/src/main/res/drawable/baseline_menu_24.xml b/app/src/main/res/drawable/baseline_menu_24.xml index 69b6549..da19606 100644 --- a/app/src/main/res/drawable/baseline_menu_24.xml +++ b/app/src/main/res/drawable/baseline_menu_24.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4cdeedf..bd68ce5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -88,7 +88,7 @@ Standard Dunkel - + Hell Hintergrund auswählen Hintergrund ändern diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e5902fe..acea272 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -59,6 +59,7 @@ Normal Oscuro + Luminoso Seleccionar fondo de pantalla Cambiar fondo de pantalla diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c1df5bd..1e4e0aa 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -51,6 +51,7 @@ Défaut Noir + Lumière Choisir un fond d\'écran Changer le fond d\'écran diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e3ab69a..b519f08 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -58,6 +58,7 @@ Padrão Escuro + Luz Mostrar Horário Mostrar Data diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c9b8a2f..1e4d12b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,7 +9,7 @@ #fff #fff - #5555ff + #9999ff #000 diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index fc255ab..16d09c2 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -51,8 +51,9 @@ DEFAULT DARK - + LIGHT + theme.text_shadow theme.background TRANSPARENT diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df43730..158ec0c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -90,8 +90,10 @@ Default Dark - + Light + + Text shadow Background (app list and setting) Transparent diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a9a2302..c62faf2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -34,6 +34,7 @@ @color/darkTheme_background_color @color/darkTheme_text_color + + + + + + + + + + + + diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 2aa8e75..f075e85 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -29,6 +29,12 @@ android:entries="@array/settings_theme_font_items" android:summary="%s" android:defaultValue="HACK"/> + + +