Remove more unused legacy preferences
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package de.mm20.launcher2
|
||||
|
||||
import android.app.Application
|
||||
import androidx.appcompat.app.AppCompatDelegate
|
||||
import coil.ImageLoader
|
||||
import coil.ImageLoaderFactory
|
||||
import coil.decode.SvgDecoder
|
||||
@@ -18,7 +17,6 @@ import de.mm20.launcher2.hiddenitems.hiddenItemsModule
|
||||
import de.mm20.launcher2.icons.iconsModule
|
||||
import de.mm20.launcher2.music.musicModule
|
||||
import de.mm20.launcher2.preferences.LauncherPreferences
|
||||
import de.mm20.launcher2.preferences.Themes
|
||||
import de.mm20.launcher2.search.searchModule
|
||||
import de.mm20.launcher2.unitconverter.unitConverterModule
|
||||
import de.mm20.launcher2.websites.websitesModule
|
||||
@@ -47,16 +45,6 @@ class LauncherApplication : Application(), CoroutineScope, ImageLoaderFactory {
|
||||
Debug()
|
||||
LauncherPreferences.initialize(this)
|
||||
|
||||
val theme = LauncherPreferences.instance.theme
|
||||
AppCompatDelegate.setDefaultNightMode(
|
||||
when (theme) {
|
||||
Themes.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO // light
|
||||
Themes.DARK -> AppCompatDelegate.MODE_NIGHT_YES // dark, black
|
||||
Themes.AUTO -> AppCompatDelegate.MODE_NIGHT_AUTO // auto
|
||||
else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM //system
|
||||
}
|
||||
)
|
||||
|
||||
startKoin {
|
||||
androidLogger(if (BuildConfig.DEBUG) Level.ERROR else Level.NONE)
|
||||
androidContext(this@LauncherApplication)
|
||||
|
||||
@@ -8,14 +8,12 @@ import androidx.fragment.app.Fragment
|
||||
import de.mm20.launcher2.fragment.PreferencesMainFragment
|
||||
import de.mm20.launcher2.fragment.PreferencesServicesFragment
|
||||
import de.mm20.launcher2.ui.launcher.LauncherActivity
|
||||
import de.mm20.launcher2.ui.legacy.helper.ThemeHelper
|
||||
|
||||
class SettingsActivity : AppCompatActivity() {
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
ThemeHelper.applyTheme(theme)
|
||||
|
||||
if (savedInstanceState == null) {
|
||||
val fragment = getStartFragment()
|
||||
|
||||
@@ -22,7 +22,6 @@ import de.mm20.launcher2.icons.IconRepository
|
||||
import de.mm20.launcher2.icons.LauncherIcon
|
||||
import de.mm20.launcher2.preferences.IconShape
|
||||
import de.mm20.launcher2.preferences.LauncherPreferences
|
||||
import de.mm20.launcher2.preferences.Themes
|
||||
import de.mm20.launcher2.ui.legacy.view.LauncherIconView
|
||||
import kotlinx.coroutines.launch
|
||||
import org.koin.android.ext.android.inject
|
||||
@@ -31,18 +30,6 @@ class PreferencesAppearanceFragment : PreferenceFragmentCompat() {
|
||||
|
||||
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
||||
addPreferencesFromResource(R.xml.preferences_appearance)
|
||||
findPreference<Preference>("theme")?.setOnPreferenceChangeListener { _, newValue ->
|
||||
val theme = Themes.byValue(newValue as String)
|
||||
@Suppress("DEPRECATION") // Still using MODE_NIGHT_AUTO
|
||||
AppCompatDelegate.setDefaultNightMode(when (theme) {
|
||||
Themes.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
|
||||
Themes.DARK -> AppCompatDelegate.MODE_NIGHT_YES
|
||||
Themes.AUTO -> AppCompatDelegate.MODE_NIGHT_AUTO
|
||||
else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
|
||||
})
|
||||
requireActivity().recreate()
|
||||
true
|
||||
}
|
||||
|
||||
findPreference<Preference>("card_background")?.setOnPreferenceChangeListener { _, newValue ->
|
||||
requireActivity().recreate()
|
||||
|
||||
Reference in New Issue
Block a user