diff --git a/src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt b/src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt index 61ea5628..1a1eb585 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt @@ -228,9 +228,9 @@ object Preferences { sealed class Theme(override val valueString: String) : Enumeration { override val values: List - get() = if (Android.sdk(31)) listOf(Dynamic, System, AmoledSystem, Light, Dark, Amoled) - else if (Android.sdk(29)) listOf(System, AmoledSystem, Light, Dark, Amoled) - else listOf(Light, Dark, Amoled) + get() = if (Android.sdk(31)) listOf(Dynamic, System, SystemBlack, Light, Dark, Black) + else if (Android.sdk(29)) listOf(System, SystemBlack, Light, Dark, Black) + else listOf(Light, Dark, Black) abstract fun getResId(configuration: Configuration): Int @@ -241,7 +241,7 @@ object Preferences { } } - object AmoledSystem : Theme("system-amoled") { + object SystemBlack : Theme("system-amoled") { override fun getResId(configuration: Configuration): Int { return if ((configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) != 0) R.style.Theme_Main_Amoled else R.style.Theme_Main_Light @@ -262,7 +262,7 @@ object Preferences { override fun getResId(configuration: Configuration): Int = R.style.Theme_Main_Dark } - object Amoled : Theme("amoled") { + object Black : Theme("amoled") { override fun getResId(configuration: Configuration): Int = R.style.Theme_Main_Amoled } } diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt index 95940aa0..8a4d1c23 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt @@ -87,7 +87,7 @@ class MainActivityX : AppCompatActivity() { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() - is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() + is Preferences.Theme.SystemBlack -> isSystemInDarkTheme() else -> isDarkTheme } ) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt index 8fd2f3d7..efb32d45 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt @@ -72,7 +72,7 @@ class PrefsActivityX : AppCompatActivity() { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() - is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() + is Preferences.Theme.SystemBlack -> isSystemInDarkTheme() else -> isDarkTheme } ) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt index f5213fd9..327b5ad0 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt @@ -137,7 +137,7 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() - is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() + is Preferences.Theme.SystemBlack -> isSystemInDarkTheme() else -> isDarkTheme } ) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt index 59da8cea..5cf6ab0e 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt @@ -78,7 +78,7 @@ class ExploreFragment : MainNavFragmentX() { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() - is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() + is Preferences.Theme.SystemBlack -> isSystemInDarkTheme() else -> isDarkTheme } ) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt index 2de0a6f5..51ca6de0 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt @@ -96,7 +96,7 @@ class InstalledFragment : MainNavFragmentX() { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() - is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() + is Preferences.Theme.SystemBlack -> isSystemInDarkTheme() else -> isDarkTheme } ) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt index aecda848..eba29691 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt @@ -81,7 +81,7 @@ class LatestFragment : MainNavFragmentX() { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() - is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() + is Preferences.Theme.SystemBlack -> isSystemInDarkTheme() else -> isDarkTheme } ) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUserFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUserFragment.kt index 6b186922..2e5105d3 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUserFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUserFragment.kt @@ -29,13 +29,13 @@ class PrefsUserFragment : PrefsNavFragmentX() { addEnumeration(Preferences.Key.Theme, getString(R.string.theme)) { when (it) { is Preferences.Theme.System -> getString(R.string.system) - is Preferences.Theme.AmoledSystem -> getString(R.string.system) + " " + getString( + is Preferences.Theme.SystemBlack -> getString(R.string.system) + " " + getString( R.string.amoled ) is Preferences.Theme.Dynamic -> getString(R.string.dynamic) is Preferences.Theme.Light -> getString(R.string.light) is Preferences.Theme.Dark -> getString(R.string.dark) - is Preferences.Theme.Amoled -> getString(R.string.amoled) + is Preferences.Theme.Black -> getString(R.string.amoled) } } addEnumeration(Preferences.Key.DefaultTab, getString(R.string.default_tab)) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/ExplorePage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/ExplorePage.kt index 57edb09d..84773fe9 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/ExplorePage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/ExplorePage.kt @@ -41,7 +41,7 @@ fun ExplorePage(viewModel: MainNavFragmentViewModelX) { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() - is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() + is Preferences.Theme.SystemBlack -> isSystemInDarkTheme() else -> isDarkTheme } ) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/InstalledPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/InstalledPage.kt index 078643b0..17970d27 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/InstalledPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/InstalledPage.kt @@ -60,7 +60,7 @@ fun InstalledPage(viewModel: MainNavFragmentViewModelX) { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() - is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() + is Preferences.Theme.SystemBlack -> isSystemInDarkTheme() else -> isDarkTheme } ) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/LatestPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/LatestPage.kt index cfefedec..7938c652 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/LatestPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/LatestPage.kt @@ -50,7 +50,7 @@ fun LatestPage(viewModel: MainNavFragmentViewModelX) { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() - is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() + is Preferences.Theme.SystemBlack -> isSystemInDarkTheme() else -> isDarkTheme } ) { diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index d4853f13..8a95950d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -148,6 +148,7 @@ Syncing Syncing %s… System + System (Black) Tap to install. Target Theme