Move QuickButtonPrefs files to new package

jkuester · Jan 25, 2025 · 0ce0399 · 0ce0399
1 parent 592dc54
commit 0ce0399
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 39 deletions.
diff --git a/app/src/main/java/com/jkuester/unlauncher/datasource/DataStoreModule.kt b/app/src/main/java/com/jkuester/unlauncher/datasource/DataStoreModule.kt
@@ -3,15 +3,15 @@ package com.jkuester.unlauncher.datasource
 import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.dataStore
+import com.jkuester.unlauncher.datasource.quickbuttonprefs.QuickButtonPreferencesMigrations
+import com.jkuester.unlauncher.datasource.quickbuttonprefs.QuickButtonPreferencesSerializer
 import com.jkuester.unlauncher.datastore.CorePreferences
 import com.jkuester.unlauncher.datastore.QuickButtonPreferences
 import com.jkuester.unlauncher.datastore.UnlauncherApps
 import com.sduduzog.slimlauncher.datasource.apps.UnlauncherAppsMigrations
 import com.sduduzog.slimlauncher.datasource.apps.UnlauncherAppsSerializer
 import com.sduduzog.slimlauncher.datasource.coreprefs.CorePreferencesMigrations
 import com.sduduzog.slimlauncher.datasource.coreprefs.CorePreferencesSerializer
-import com.sduduzog.slimlauncher.datasource.quickbuttonprefs.QuickButtonPreferencesMigrations
-import com.sduduzog.slimlauncher.datasource.quickbuttonprefs.QuickButtonPreferencesSerializer
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

diff --git a/...prefs/QuickButtonPreferencesMigrations.kt → ...prefs/QuickButtonPreferencesMigrations.kt b/...prefs/QuickButtonPreferencesMigrations.kt → ...prefs/QuickButtonPreferencesMigrations.kt
@@ -1,4 +1,4 @@
-package com.sduduzog.slimlauncher.datasource.quickbuttonprefs
+package com.jkuester.unlauncher.datasource.quickbuttonprefs
 
 import android.content.Context
 import androidx.datastore.core.DataMigration
@@ -46,15 +46,14 @@ class QuickButtonPreferencesMigrations {
                 prefBuilder.build()
             },
             object : DataMigration<QuickButtonPreferences> {
-                override suspend fun shouldMigrate(currentData: QuickButtonPreferences): Boolean {
-                    return !QuickButtonPreferencesRepository.RES_BY_ICON.keys.containsAll(
+                override suspend fun shouldMigrate(currentData: QuickButtonPreferences): Boolean =
+                    !QuickButtonPreferencesRepository.RES_BY_ICON.keys.containsAll(
                         listOf(
                             currentData.leftButton.iconId,
                             currentData.centerButton.iconId,
                             currentData.rightButton.iconId
                         )
                     )
-                }
 
                 override suspend fun migrate(
                     currentData: QuickButtonPreferences

diff --git a/...prefs/QuickButtonPreferencesRepository.kt → ...prefs/QuickButtonPreferencesRepository.kt b/...prefs/QuickButtonPreferencesRepository.kt → ...prefs/QuickButtonPreferencesRepository.kt
@@ -1,4 +1,4 @@
-package com.sduduzog.slimlauncher.datasource.quickbuttonprefs
+package com.jkuester.unlauncher.datasource.quickbuttonprefs
 
 import android.app.Activity
 import android.util.Log
@@ -58,39 +58,30 @@ class QuickButtonPreferencesRepository @Inject constructor(
         quickButtonPreferencesFlow.first()
     }
 
-    fun updateLeftIconId(iconId: Int) {
+    fun updateAsync(transform: suspend (t: QuickButtonPreferences) -> QuickButtonPreferences) {
         lifecycleScope.launch {
-            quickButtonPreferencesStore.updateData { currentPreferences ->
-                currentPreferences.toBuilder()
-                    .setLeftButton(
-                        currentPreferences.leftButton.toBuilder().setIconId(iconId).build()
-                    )
-                    .build()
-            }
+            quickButtonPreferencesStore.updateData(transform)
         }
     }
 
-    fun updateCenterIconId(iconId: Int) {
-        lifecycleScope.launch {
-            quickButtonPreferencesStore.updateData { currentPreferences ->
-                currentPreferences.toBuilder()
-                    .setCenterButton(
-                        currentPreferences.centerButton.toBuilder().setIconId(iconId).build()
-                    )
-                    .build()
-            }
-        }
+    fun updateLeftIconId(iconId: Int) = this.updateAsync { currentPreferences ->
+        currentPreferences
+            .toBuilder()
+            .setLeftButton(currentPreferences.leftButton.toBuilder().setIconId(iconId).build())
+            .build()
     }
 
-    fun updateRightIconId(iconId: Int) {
-        lifecycleScope.launch {
-            quickButtonPreferencesStore.updateData { currentPreferences ->
-                currentPreferences.toBuilder()
-                    .setRightButton(
-                        currentPreferences.rightButton.toBuilder().setIconId(iconId).build()
-                    )
-                    .build()
-            }
-        }
+    fun updateCenterIconId(iconId: Int) = this.updateAsync { currentPreferences ->
+        currentPreferences
+            .toBuilder()
+            .setCenterButton(currentPreferences.centerButton.toBuilder().setIconId(iconId).build())
+            .build()
+    }
+
+    fun updateRightIconId(iconId: Int) = this.updateAsync { currentPreferences ->
+        currentPreferences
+            .toBuilder()
+            .setRightButton(currentPreferences.rightButton.toBuilder().setIconId(iconId).build())
+            .build()
     }
 }
diff --git a/...prefs/QuickButtonPreferencesSerializer.kt → ...prefs/QuickButtonPreferencesSerializer.kt b/...prefs/QuickButtonPreferencesSerializer.kt → ...prefs/QuickButtonPreferencesSerializer.kt
@@ -1,4 +1,4 @@
-package com.sduduzog.slimlauncher.datasource.quickbuttonprefs
+package com.jkuester.unlauncher.datasource.quickbuttonprefs
 
 import androidx.datastore.core.CorruptionException
 import androidx.datastore.core.Serializer

diff --git a/app/src/main/java/com/sduduzog/slimlauncher/ui/dialogs/ChooseQuickButtonDialog.kt b/app/src/main/java/com/sduduzog/slimlauncher/ui/dialogs/ChooseQuickButtonDialog.kt
@@ -5,8 +5,8 @@ import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
+import com.jkuester.unlauncher.datasource.quickbuttonprefs.QuickButtonPreferencesRepository
 import com.sduduzog.slimlauncher.R
-import com.sduduzog.slimlauncher.datasource.quickbuttonprefs.QuickButtonPreferencesRepository
 
 class ChooseQuickButtonDialog(
     private val repo: QuickButtonPreferencesRepository,

diff --git a/app/src/main/java/com/sduduzog/slimlauncher/ui/main/HomeFragment.kt b/app/src/main/java/com/sduduzog/slimlauncher/ui/main/HomeFragment.kt
@@ -34,6 +34,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.jkuester.unlauncher.datasource.quickbuttonprefs.QuickButtonPreferencesRepository
 import com.jkuester.unlauncher.datastore.ClockType
 import com.jkuester.unlauncher.datastore.SearchBarPosition
 import com.jkuester.unlauncher.datastore.UnlauncherApp
@@ -45,7 +46,6 @@ import com.sduduzog.slimlauncher.databinding.HomeFragmentContentBinding
 import com.sduduzog.slimlauncher.databinding.HomeFragmentDefaultBinding
 import com.sduduzog.slimlauncher.datasource.apps.UnlauncherAppsRepository
 import com.sduduzog.slimlauncher.datasource.coreprefs.CorePreferencesRepository
-import com.sduduzog.slimlauncher.datasource.quickbuttonprefs.QuickButtonPreferencesRepository
 import com.sduduzog.slimlauncher.models.HomeApp
 import com.sduduzog.slimlauncher.models.MainViewModel
 import com.sduduzog.slimlauncher.ui.dialogs.RenameAppDisplayNameDialog

diff --git a/app/src/main/java/com/sduduzog/slimlauncher/ui/options/CustomizeQuickButtonsFragment.kt b/app/src/main/java/com/sduduzog/slimlauncher/ui/options/CustomizeQuickButtonsFragment.kt
@@ -4,9 +4,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.jkuester.unlauncher.datasource.quickbuttonprefs.QuickButtonPreferencesRepository
 import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.databinding.CustomizeQuickButtonsFragmentBinding
-import com.sduduzog.slimlauncher.datasource.quickbuttonprefs.QuickButtonPreferencesRepository
 import com.sduduzog.slimlauncher.ui.dialogs.ChooseQuickButtonDialog
 import com.sduduzog.slimlauncher.utils.BaseFragment
 import dagger.hilt.android.AndroidEntryPoint