Remove more unused legacy preferences

app/src/main/java/de/mm20/launcher2/LauncherApplication.kt

@@ -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)

app/src/main/java/de/mm20/launcher2/activity/SettingsActivity.kt

@@ -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()

app/src/main/java/de/mm20/launcher2/fragment/PreferencesAppearanceFragment.kt

@@ -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()

applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt

@@ -225,7 +225,6 @@ internal class AppRepositoryImpl(
     }
 
     private fun getActivityByComponentName(componentName: ComponentName?): Application? {
-        if (!LauncherPreferences.instance.searchActivities) return null
         componentName ?: return null
         val intent = Intent().setComponent(componentName)
         val lai = launcherApps.resolveActivity(intent, Process.myUserHandle())

preferences/src/main/java/de/mm20/launcher2/preferences/LauncherPreferences.kt

@@ -47,27 +47,16 @@ class LauncherPreferences(val context: Application, version: Int = 3) {
     }
 
 
-    var theme by EnumPreference("theme", default = Themes.SYSTEM)
-    var lightStatusBar by BooleanPreference("light_status_bar", default = false)
-    var lightNavBar by BooleanPreference("light_nav_bar", default = false)
     var dimWallpaper by BooleanPreference("dim_wallpaper", default = false)
     var appStartAnim by EnumPreference("app_start_anim", default = AppStartAnimation.M)
 
-    var searchFiles by BooleanPreference("search_files", default = true)
-    var searchWikipediaMobileData by BooleanPreference("search_wikipedia_mobile_data", default = true)
-    var searchActivities by BooleanPreference("search_activities", default = true)
     var searchCalendars by BooleanPreference("search_calendars", default = true)
     var searchContacts by BooleanPreference("search_contacts", default = true)
 
-    var profileBadges by BooleanPreference("profile_badges", default = true)
-
     var themedIcons by BooleanPreference("themed_icons", default = false)
     var legacyIconBg by StringPreference("legacy_icon_bg", default = "1")
-    var searchStyle by EnumPreference("search_style", default = SearchStyles.NO_BG)
     var iconShape by EnumPreference("icon_shape", default = IconShape.PLATFORM_DEFAULT)
-    var firstRunVersion by IntPreference("first_run_version", default = 0)
 
-    var colorScheme by EnumPreference("card_background", default = ColorSchemes.DEFAULT)
     var cardOpacity by IntPreference("card_opacity", default = 0xFF)
     var cardStrokeWidth by IntPreference("card_stroke_width", default = 0)
     var cardRadius by IntPreference("card_radius", default = 8)
@@ -82,25 +71,6 @@ class LauncherPreferences(val context: Application, version: Int = 3) {
     }
 }
 
-enum class Themes(override val value: String) : PreferenceEnum {
-    SYSTEM("2"),
-    LIGHT("0"),
-    DARK("1"),
-    AUTO("3");
-
-    companion object {
-        fun byValue(value: String): Themes {
-            return values().first { it.value == value }
-        }
-    }
-}
-
-enum class SearchStyles(override val value: String) : PreferenceEnum {
-    NO_BG("0"),
-    SOLID("1"),
-    HIDDEN("2"),
-}
-
 enum class IconShape(override val value: String) : PreferenceEnum {
     CIRCLE("0"),
     SQUARE("1"),
@@ -113,16 +83,6 @@ enum class IconShape(override val value: String) : PreferenceEnum {
     PLATFORM_DEFAULT("8")
 }
 
-enum class ColorSchemes(override val value: String) : PreferenceEnum {
-    DEFAULT("0"),
-    BLACK("2");
-    companion object {
-        fun byValue(value: String): ColorSchemes {
-            return values().first { it.value == value }
-        }
-    }
-}
-
 enum class AppStartAnimation(override val value: String): PreferenceEnum {
     DEFAULT("5"),
     M("2"),

ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivity.kt

@@ -13,8 +13,6 @@ import com.afollestad.materialdialogs.callbacks.onDismiss
 import com.afollestad.materialdialogs.customview.customView
 import de.mm20.launcher2.icons.DynamicIconController
 import de.mm20.launcher2.icons.IconRepository
-import de.mm20.launcher2.ktx.dp
-import de.mm20.launcher2.ktx.isAtLeastApiLevel
 import de.mm20.launcher2.legacy.helper.ActivityStarter
 import de.mm20.launcher2.preferences.LauncherPreferences
 import de.mm20.launcher2.ui.R
@@ -22,9 +20,6 @@ import de.mm20.launcher2.ui.base.BaseActivity
 import de.mm20.launcher2.ui.databinding.ActivityLauncherBinding
 import de.mm20.launcher2.ui.launcher.modals.EditFavoritesView
 import de.mm20.launcher2.ui.launcher.modals.HiddenItemsView
-import de.mm20.launcher2.ui.legacy.helper.ThemeHelper
-import de.mm20.launcher2.widgets.Widget
-import de.mm20.launcher2.widgets.WidgetViewModel
 import kotlinx.coroutines.*
 import org.koin.android.ext.android.inject
 import java.util.*

ui/src/main/java/de/mm20/launcher2/ui/legacy/helper/ThemeHelper.kt

@@ -1,16 +0,0 @@
-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)
-    }
-}