Refactor theme dialog into com.jkuester

Author: jkuester

app/src/main/java/com/jkuester/unlauncher/datasource/CorePreferencesCalculations.kt

@@ -4,6 +4,7 @@ import com.jkuester.unlauncher.datastore.proto.AlignmentFormat
 import com.jkuester.unlauncher.datastore.proto.ClockType
 import com.jkuester.unlauncher.datastore.proto.CorePreferences
 import com.jkuester.unlauncher.datastore.proto.SearchBarPosition
+import com.jkuester.unlauncher.datastore.proto.Theme
 import com.jkuester.unlauncher.datastore.proto.TimeFormat
 
 fun toggleActivateKeyboardInDrawer() = { originalPrefs: CorePreferences ->
@@ -33,3 +34,6 @@ fun setAlignmentFormat(alignmentFormat: AlignmentFormat) = { originalPrefs: Core
 fun setTimeFormat(timeFormat: TimeFormat) = { originalPrefs: CorePreferences ->
     originalPrefs.toBuilder().setTimeFormat(timeFormat).build()
 }
+fun setTheme(theme: Theme) = { originalPrefs: CorePreferences ->
+    originalPrefs.toBuilder().setTheme(theme).build()
+}

app/src/main/java/com/jkuester/unlauncher/datasource/CorePreferencesMigrations.kt

@@ -6,10 +6,12 @@ import androidx.datastore.migrations.SharedPreferencesMigration
 import androidx.datastore.migrations.SharedPreferencesView
 import com.jkuester.unlauncher.datastore.proto.ClockType
 import com.jkuester.unlauncher.datastore.proto.CorePreferences
+import com.jkuester.unlauncher.datastore.proto.Theme
 import com.jkuester.unlauncher.datastore.proto.TimeFormat
 
 private const val SHARED_PREF_GROUP_NAME = "settings"
 private const val PREFS_SETTINGS_KEY_TIME_FORMAT = "time_format"
+private const val PREFS_SETTINGS_KEY_THEME = "key_theme"
 
 object AddClockTypeMigration : DataMigration<CorePreferences> {
     override suspend fun shouldMigrate(currentData: CorePreferences) = !currentData.hasClockType()
@@ -24,13 +26,16 @@ object AddShowSearchBarMigration : DataMigration<CorePreferences> {
     override suspend fun cleanUp() {}
 }
 
-fun timeFormatSharedPrefsMigration(context: Context) = SharedPreferencesMigration(
+fun slimLauncherSharedPrefsMigration(context: Context) = SharedPreferencesMigration(
     context,
     SHARED_PREF_GROUP_NAME,
-    setOf(PREFS_SETTINGS_KEY_TIME_FORMAT),
+    setOf(PREFS_SETTINGS_KEY_TIME_FORMAT, PREFS_SETTINGS_KEY_THEME),
     { true },
     { sharedPrefs: SharedPreferencesView, currentData: CorePreferences ->
         val timeFormatPref = sharedPrefs.getInt(PREFS_SETTINGS_KEY_TIME_FORMAT, 0)
-        setTimeFormat(TimeFormat.forNumber(timeFormatPref))(currentData)
+        val themePref = sharedPrefs.getInt(PREFS_SETTINGS_KEY_THEME, 0)
+        currentData
+            .let(setTimeFormat(TimeFormat.forNumber(timeFormatPref)))
+            .let(setTheme(Theme.forNumber(themePref)))
     }
 )

app/src/main/java/com/jkuester/unlauncher/datasource/DataStoreModule.kt

@@ -34,11 +34,11 @@ private val Context.unlauncherAppsStore: DataStore<UnlauncherApps> by dataStore(
     produceMigrations = { context -> listOf(SortAppsMigration, HomeAppToIndexMigration(context)) }
 )
 
-private val Context.corePreferencesStore: DataStore<CorePreferences> by dataStore(
+internal val Context.corePreferencesStore: DataStore<CorePreferences> by dataStore(
     fileName = "core_preferences.proto",
     serializer = DataSerializer(CorePreferences::getDefaultInstance, CorePreferences::parseFrom),
     produceMigrations = { context ->
-        listOf(AddClockTypeMigration, AddShowSearchBarMigration, timeFormatSharedPrefsMigration(context))
+        listOf(AddClockTypeMigration, AddShowSearchBarMigration, slimLauncherSharedPrefsMigration(context))
     }
 )
 

app/src/main/java/com/jkuester/unlauncher/dialog/ThemeDialog.kt

@@ -0,0 +1,35 @@
+package com.jkuester.unlauncher.dialog
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.content.DialogInterface
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import com.jkuester.unlauncher.datasource.DataRepository
+import com.jkuester.unlauncher.datasource.setTheme
+import com.jkuester.unlauncher.datastore.proto.CorePreferences
+import com.jkuester.unlauncher.datastore.proto.Theme
+import com.jkuester.unlauncher.fragment.WithFragmentLifecycle
+import com.sduduzog.slimlauncher.R
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ThemeDialog : DialogFragment() {
+    @Inject @WithFragmentLifecycle
+    lateinit var corePreferencesRepo: DataRepository<CorePreferences>
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = AlertDialog
+        .Builder(context)
+        .setTitle(R.string.choose_theme_dialog_title)
+        .setSingleChoiceItems(
+            R.array.themes_array,
+            corePreferencesRepo.get().theme.number,
+            this::onSelection
+        )
+        .create()
+
+    private fun onSelection(dialogInterface: DialogInterface, i: Int) = dialogInterface
+        .dismiss()
+        .also { corePreferencesRepo.updateAsync(setTheme(Theme.forNumber(i))) }
+}

app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt

@@ -13,11 +13,13 @@ import android.view.View
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.motion.widget.MotionLayout
-import androidx.datastore.core.DataStore
 import androidx.navigation.NavController
 import androidx.navigation.Navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.recyclerview.widget.RecyclerView
+import com.jkuester.unlauncher.WithActivityLifecycle
+import com.jkuester.unlauncher.datasource.DataRepository
+import com.jkuester.unlauncher.datasource.corePreferencesStore
 import com.jkuester.unlauncher.datastore.proto.CorePreferences
 import com.sduduzog.slimlauncher.utils.BaseFragment
 import com.sduduzog.slimlauncher.utils.HomeWatcher
@@ -33,6 +35,8 @@ import dagger.hilt.android.components.ActivityComponent
 import java.lang.reflect.Method
 import javax.inject.Inject
 import kotlin.math.absoluteValue
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 
 @AndroidEntryPoint
 class MainActivity :
@@ -43,9 +47,8 @@ class MainActivity :
 
     @Inject
     lateinit var systemUiManager: SystemUiManager
-
-    @Inject
-    lateinit var corePreferencesStore: DataStore<CorePreferences>
+    @Inject @WithActivityLifecycle
+    lateinit var corePrefRepo: DataRepository<CorePreferences>
 
     @EntryPoint
     @InstallIn(ActivityComponent::class)
@@ -82,7 +85,19 @@ class MainActivity :
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        // Set theme before creating activity
+        var currentTheme = runBlocking { corePreferencesStore.data.first().theme.number }
+        setTheme(resolveTheme(currentTheme))
+
         super.onCreate(savedInstanceState)
+
+        corePrefRepo.observe {
+            if (it.theme.number != currentTheme) {
+                currentTheme = it.theme.number
+                setTheme(resolveTheme(currentTheme))
+                recreate()
+            }
+        }
         setContentView(R.layout.main_activity)
         settings = getSharedPreferences(getString(R.string.prefs_settings), MODE_PRIVATE)
         settings.registerOnSharedPreferenceChangeListener(this)
@@ -121,9 +136,6 @@ class MainActivity :
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, s: String?) {
-        if (s.equals(getString(R.string.prefs_settings_key_theme), true)) {
-            recreate()
-        }
         if (s.equals(getString(R.string.prefs_settings_key_toggle_status_bar), true)) {
             systemUiManager.setSystemUiVisibility()
         }
@@ -137,14 +149,9 @@ class MainActivity :
         wallpaperManager.onApplyThemeResource(theme, resid)
     }
 
-    override fun setTheme(resId: Int) {
-        super.setTheme(getUserSelectedThemeRes())
-    }
-
     @StyleRes
     fun getUserSelectedThemeRes(): Int {
-        settings = getSharedPreferences(getString(R.string.prefs_settings), MODE_PRIVATE)
-        val active = settings.getInt(getString(R.string.prefs_settings_key_theme), 0)
+        val active = runBlocking { corePreferencesStore.data.first().theme.number }
         return resolveTheme(active)
     }
 

app/src/main/java/com/sduduzog/slimlauncher/ui/dialogs/ChangeThemeDialog.kt

@@ -14,11 +14,11 @@ import com.jkuester.unlauncher.datasource.setKeepDeviceWallpaper
 import com.jkuester.unlauncher.datastore.proto.CorePreferences
 import com.jkuester.unlauncher.dialog.AlignmentFormatDialog
 import com.jkuester.unlauncher.dialog.ClockTypeDialog
+import com.jkuester.unlauncher.dialog.ThemeDialog
 import com.jkuester.unlauncher.dialog.TimeFormatDialog
 import com.jkuester.unlauncher.fragment.WithFragmentLifecycle
 import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.databinding.OptionsFragmentBinding
-import com.sduduzog.slimlauncher.ui.dialogs.ChangeThemeDialog
 import com.sduduzog.slimlauncher.utils.BaseFragment
 import com.sduduzog.slimlauncher.utils.createTitleAndSubtitleText
 import com.sduduzog.slimlauncher.utils.isActivityDefaultLauncher
@@ -54,8 +54,7 @@ class OptionsFragment : BaseFragment() {
             true
         }
         optionsFragment.optionsFragmentChangeTheme.setOnClickListener {
-            val changeThemeDialog = ChangeThemeDialog.getThemeChooser()
-            changeThemeDialog.showNow(childFragmentManager, "THEME_CHOOSER")
+            ThemeDialog().showNow(childFragmentManager, null)
         }
         optionsFragment.optionsFragmentChooseTimeFormat.setOnClickListener {
             TimeFormatDialog().showNow(childFragmentManager, null)

app/src/main/java/com/sduduzog/slimlauncher/ui/options/OptionsFragment.kt

@@ -14,6 +14,9 @@ import android.view.WindowInsetsController
 import android.view.WindowManager
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
+import com.jkuester.unlauncher.WithActivityLifecycle
+import com.jkuester.unlauncher.datasource.DataRepository
+import com.jkuester.unlauncher.datastore.proto.CorePreferences
 import com.sduduzog.slimlauncher.R
 import dagger.Module
 import dagger.Provides
@@ -23,7 +26,10 @@ import dagger.hilt.android.qualifiers.ActivityContext
 
 @Module
 @InstallIn(ActivityComponent::class)
-open class SystemUiManager internal constructor(internal val context: Context) {
+open class SystemUiManager internal constructor(
+    internal val context: Context,
+    internal val prefsRepo: DataRepository<CorePreferences>
+) {
     internal val window: Window = (context as Activity).window
     internal val settings: SharedPreferences = context.getSharedPreferences(
         context.getString(R.string.prefs_settings),
@@ -32,22 +38,25 @@ open class SystemUiManager internal constructor(internal val context: Context) {
 
     companion object {
         @Provides
-        fun createInstance(@ActivityContext context: Context): SystemUiManager {
+        fun createInstance(
+            @ActivityContext context: Context,
+            @WithActivityLifecycle prefsRepo: DataRepository<CorePreferences>
+        ): SystemUiManager {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                 (context as Activity).window.attributes.layoutInDisplayCutoutMode =
                     WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
             }
 
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-                return LSystemUiManager(context)
+                return LSystemUiManager(context, prefsRepo)
             }
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-                return MSystemUiManager(context)
+                return MSystemUiManager(context, prefsRepo)
             }
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
-                return OSystemUiManager(context)
+                return OSystemUiManager(context, prefsRepo)
             }
-            return SystemUiManager(context)
+            return SystemUiManager(context, prefsRepo)
         }
     }
 
@@ -96,62 +105,56 @@ open class SystemUiManager internal constructor(internal val context: Context) {
         return primaryColor.data
     }
 
-    internal fun isSystemUiHidden(): Boolean {
-        return settings.getBoolean(
-            context.getString(R.string.prefs_settings_key_toggle_status_bar),
-            false
-        )
-    }
+    internal fun isSystemUiHidden(): Boolean = settings.getBoolean(
+        context.getString(R.string.prefs_settings_key_toggle_status_bar),
+        false
+    )
 
     internal fun isLightModeTheme(): Boolean {
-        val theme = settings.getInt(context.getString(R.string.prefs_settings_key_theme), 0)
+        val theme = prefsRepo.get().theme.number
         val uiMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
         return listOf(
             6,
             3,
             5
-        ).contains(theme) || (theme == 0 && uiMode == Configuration.UI_MODE_NIGHT_NO)
+        ).contains(theme) ||
+            (theme == 0 && uiMode == Configuration.UI_MODE_NIGHT_NO)
     }
 
-    private open class OSystemUiManager(context: Context) : SystemUiManager(context) {
+    private open class OSystemUiManager(context: Context, prefsRepo: DataRepository<CorePreferences>) :
+        SystemUiManager(context, prefsRepo) {
         @RequiresApi(Build.VERSION_CODES.O)
         override fun setSystemUiVisibility() {
             window.decorView.systemUiVisibility =
                 getLightUiBarFlags() or getToggleStatusBarFlags()
         }
 
         @RequiresApi(Build.VERSION_CODES.O)
-        open fun getLightUiBarFlags(): Int {
-            return if (isLightModeTheme()) {
-                View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-            } else {
-                0
-            }
+        open fun getLightUiBarFlags(): Int = if (isLightModeTheme()) {
+            View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+        } else {
+            0
         }
 
-        private fun getToggleStatusBarFlags(): Int {
-            return View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-                if (isSystemUiHidden()) View.SYSTEM_UI_FLAG_FULLSCREEN else 0
-        }
+        private fun getToggleStatusBarFlags(): Int = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+            if (isSystemUiHidden()) View.SYSTEM_UI_FLAG_FULLSCREEN else 0
     }
 
-    private open class MSystemUiManager(context: Context) : OSystemUiManager(context) {
+    private open class MSystemUiManager(context: Context, prefsRepo: DataRepository<CorePreferences>) :
+        OSystemUiManager(context, prefsRepo) {
         @RequiresApi(Build.VERSION_CODES.M)
         override fun setSystemUiColors() {
             window.statusBarColor = getPrimaryColor()
         }
 
         @RequiresApi(Build.VERSION_CODES.M)
-        override fun getLightUiBarFlags(): Int {
-            return if (isLightModeTheme()) View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR else 0
-        }
+        override fun getLightUiBarFlags(): Int = if (isLightModeTheme()) View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR else 0
     }
 
-    private class LSystemUiManager(context: Context) : MSystemUiManager(context) {
+    private class LSystemUiManager(context: Context, prefsRepo: DataRepository<CorePreferences>) :
+        MSystemUiManager(context, prefsRepo) {
         override fun setSystemUiColors() {}
 
-        override fun getLightUiBarFlags(): Int {
-            return 0
-        }
+        override fun getLightUiBarFlags(): Int = 0
     }
 }