lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify theme color application logic

Browse Source
This commit is contained in:
MM20
2021-12-13 17:34:13 +01:00
parent cb72b9180f
commit 9ebac9684b
13 changed files with 35 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/main/java/de/mm20/launcher2/ui/legacy/activity/LauncherActivity.kt
+2 -5
View File
@@ -50,7 +50,6 @@ import de.mm20.launcher2.ktx.dp
import de.mm20.launcher2.ktx.isBrightColor
import de.mm20.launcher2.legacy.helper.ActivityStarter
import de.mm20.launcher2.permissions.PermissionsManager
import de.mm20.launcher2.preferences.ColorSchemes
import de.mm20.launcher2.preferences.LauncherPreferences
import de.mm20.launcher2.search.SearchViewModel
import de.mm20.launcher2.transition.ChangingLayoutTransition
@@ -59,6 +58,7 @@ import de.mm20.launcher2.ui.R
import de.mm20.launcher2.ui.databinding.ActivityLauncherBinding
import de.mm20.launcher2.ui.legacy.component.EditFavoritesView
import de.mm20.launcher2.ui.legacy.component.WidgetView
import de.mm20.launcher2.ui.legacy.helper.ThemeHelper
import de.mm20.launcher2.ui.legacy.search.SearchGridView
import de.mm20.launcher2.ui.legacy.widget.LauncherWidget
import de.mm20.launcher2.weather.WeatherViewModel
@@ -191,11 +191,8 @@ class LauncherActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
val iconRepository: IconRepository by inject()
iconRepository.recreate()
ThemeHelper.applyTheme(theme)
when(LauncherPreferences.instance.colorScheme) {
ColorSchemes.BLACK -> setTheme(R.style.LauncherTheme_BlackWhiteColors)
else -> setTheme(R.style.LauncherTheme_DefaultColors)
}
if (LauncherPreferences.instance.firstRunVersion < 1) {
ActivityCompat.requestPermissions(
this, arrayOf(
ui/src/main/java/de/mm20/launcher2/ui/legacy/helper/ThemeHelper.kt
+16
View File
@@ -0,0 +1,16 @@
package de.mm20.launcher2.ui.legacy.helper
import android.content.res.Resources
import de.mm20.launcher2.preferences.ColorSchemes
import de.mm20.launcher2.preferences.LauncherPreferences
import de.mm20.launcher2.ui.R
object ThemeHelper {
fun applyTheme(theme: Resources.Theme) {
val colorScheme = when(LauncherPreferences.instance.colorScheme) {
ColorSchemes.BLACK -> R.style.BlackWhiteColors
else -> R.style.DefaultColors
}
theme.applyStyle(colorScheme, true)
}
}