avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 19:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update: Rename Black themes

Browse Source
This commit is contained in:
machiav3lli 2022-09-17 16:14:27 +02:00
parent 13a984bd7d
commit c19cb674ac
12 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt
View File

@ -228,9 +228,9 @@ object Preferences {
sealed class Theme(override val valueString: String) : Enumeration<Theme> { sealed class Theme(override val valueString: String) : Enumeration<Theme> {
override val values: List<Theme> override val values: List<Theme>
get() = if (Android.sdk(31)) listOf(Dynamic, System, AmoledSystem, Light, Dark, Amoled) get() = if (Android.sdk(31)) listOf(Dynamic, System, SystemBlack, Light, Dark, Black)
else if (Android.sdk(29)) listOf(System, AmoledSystem, Light, Dark, Amoled) else if (Android.sdk(29)) listOf(System, SystemBlack, Light, Dark, Black)
else listOf(Light, Dark, Amoled) else listOf(Light, Dark, Black)
abstract fun getResId(configuration: Configuration): Int 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 { override fun getResId(configuration: Configuration): Int {
return if ((configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) != 0) return if ((configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) != 0)
R.style.Theme_Main_Amoled else R.style.Theme_Main_Light 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 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 override fun getResId(configuration: Configuration): Int = R.style.Theme_Main_Amoled
} }
} }

2
src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt
View File

@ -87,7 +87,7 @@ class MainActivityX : AppCompatActivity() {
AppTheme( AppTheme(
darkTheme = when (Preferences[Preferences.Key.Theme]) { darkTheme = when (Preferences[Preferences.Key.Theme]) {
is Preferences.Theme.System -> isSystemInDarkTheme() is Preferences.Theme.System -> isSystemInDarkTheme()
is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() is Preferences.Theme.SystemBlack -> isSystemInDarkTheme()
else -> isDarkTheme else -> isDarkTheme
} }
) { ) {

2
src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt
View File

@ -72,7 +72,7 @@ class PrefsActivityX : AppCompatActivity() {
AppTheme( AppTheme(
darkTheme = when (Preferences[Preferences.Key.Theme]) { darkTheme = when (Preferences[Preferences.Key.Theme]) {
is Preferences.Theme.System -> isSystemInDarkTheme() is Preferences.Theme.System -> isSystemInDarkTheme()
is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() is Preferences.Theme.SystemBlack -> isSystemInDarkTheme()
else -> isDarkTheme else -> isDarkTheme
} }
) { ) {

2
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt
View File

@ -137,7 +137,7 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks {
AppTheme( AppTheme(
darkTheme = when (Preferences[Preferences.Key.Theme]) { darkTheme = when (Preferences[Preferences.Key.Theme]) {
is Preferences.Theme.System -> isSystemInDarkTheme() is Preferences.Theme.System -> isSystemInDarkTheme()
is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() is Preferences.Theme.SystemBlack -> isSystemInDarkTheme()
else -> isDarkTheme else -> isDarkTheme
} }
) { ) {

2
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt
View File

@ -78,7 +78,7 @@ class ExploreFragment : MainNavFragmentX() {
AppTheme( AppTheme(
darkTheme = when (Preferences[Preferences.Key.Theme]) { darkTheme = when (Preferences[Preferences.Key.Theme]) {
is Preferences.Theme.System -> isSystemInDarkTheme() is Preferences.Theme.System -> isSystemInDarkTheme()
is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() is Preferences.Theme.SystemBlack -> isSystemInDarkTheme()
else -> isDarkTheme else -> isDarkTheme
} }
) { ) {

2
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt
View File

@ -96,7 +96,7 @@ class InstalledFragment : MainNavFragmentX() {
AppTheme( AppTheme(
darkTheme = when (Preferences[Preferences.Key.Theme]) { darkTheme = when (Preferences[Preferences.Key.Theme]) {
is Preferences.Theme.System -> isSystemInDarkTheme() is Preferences.Theme.System -> isSystemInDarkTheme()
is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() is Preferences.Theme.SystemBlack -> isSystemInDarkTheme()
else -> isDarkTheme else -> isDarkTheme
} }
) { ) {

2
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt
View File

@ -81,7 +81,7 @@ class LatestFragment : MainNavFragmentX() {
AppTheme( AppTheme(
darkTheme = when (Preferences[Preferences.Key.Theme]) { darkTheme = when (Preferences[Preferences.Key.Theme]) {
is Preferences.Theme.System -> isSystemInDarkTheme() is Preferences.Theme.System -> isSystemInDarkTheme()
is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() is Preferences.Theme.SystemBlack -> isSystemInDarkTheme()
else -> isDarkTheme else -> isDarkTheme
} }
) { ) {

4
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUserFragment.kt
View File

@ -29,13 +29,13 @@ class PrefsUserFragment : PrefsNavFragmentX() {
addEnumeration(Preferences.Key.Theme, getString(R.string.theme)) { addEnumeration(Preferences.Key.Theme, getString(R.string.theme)) {
when (it) { when (it) {
is Preferences.Theme.System -> getString(R.string.system) 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 R.string.amoled
) )
is Preferences.Theme.Dynamic -> getString(R.string.dynamic) is Preferences.Theme.Dynamic -> getString(R.string.dynamic)
is Preferences.Theme.Light -> getString(R.string.light) is Preferences.Theme.Light -> getString(R.string.light)
is Preferences.Theme.Dark -> getString(R.string.dark) 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)) { addEnumeration(Preferences.Key.DefaultTab, getString(R.string.default_tab)) {

2
src/main/kotlin/com/machiav3lli/fdroid/ui/pages/ExplorePage.kt
View File

@ -41,7 +41,7 @@ fun ExplorePage(viewModel: MainNavFragmentViewModelX) {
AppTheme( AppTheme(
darkTheme = when (Preferences[Preferences.Key.Theme]) { darkTheme = when (Preferences[Preferences.Key.Theme]) {
is Preferences.Theme.System -> isSystemInDarkTheme() is Preferences.Theme.System -> isSystemInDarkTheme()
is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() is Preferences.Theme.SystemBlack -> isSystemInDarkTheme()
else -> isDarkTheme else -> isDarkTheme
} }
) { ) {

2
src/main/kotlin/com/machiav3lli/fdroid/ui/pages/InstalledPage.kt
View File

@ -60,7 +60,7 @@ fun InstalledPage(viewModel: MainNavFragmentViewModelX) {
AppTheme( AppTheme(
darkTheme = when (Preferences[Preferences.Key.Theme]) { darkTheme = when (Preferences[Preferences.Key.Theme]) {
is Preferences.Theme.System -> isSystemInDarkTheme() is Preferences.Theme.System -> isSystemInDarkTheme()
is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() is Preferences.Theme.SystemBlack -> isSystemInDarkTheme()
else -> isDarkTheme else -> isDarkTheme
} }
) { ) {

2
src/main/kotlin/com/machiav3lli/fdroid/ui/pages/LatestPage.kt
View File

@ -50,7 +50,7 @@ fun LatestPage(viewModel: MainNavFragmentViewModelX) {
AppTheme( AppTheme(
darkTheme = when (Preferences[Preferences.Key.Theme]) { darkTheme = when (Preferences[Preferences.Key.Theme]) {
is Preferences.Theme.System -> isSystemInDarkTheme() is Preferences.Theme.System -> isSystemInDarkTheme()
is Preferences.Theme.AmoledSystem -> isSystemInDarkTheme() is Preferences.Theme.SystemBlack -> isSystemInDarkTheme()
else -> isDarkTheme else -> isDarkTheme
} }
) { ) {

1
src/main/res/values/strings.xml
View File

@ -148,6 +148,7 @@
<string name="syncing">Syncing</string> <string name="syncing">Syncing</string>
<string name="syncing_FORMAT">Syncing %s…</string> <string name="syncing_FORMAT">Syncing %s…</string>
<string name="system">System</string> <string name="system">System</string>
<string name="system_black">System (Black)</string>
<string name="tap_to_install_DESC">Tap to install.</string> <string name="tap_to_install_DESC">Tap to install.</string>
<string name="target">Target</string> <string name="target">Target</string>
<string name="theme">Theme</string> <string name="theme">Theme</string>