fixed : drawer folder reload logic

LawnchairLauncher · Feb 18, 2025 · 964d86e · 964d86e
1 parent 0142d05
commit 964d86e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 34 deletions.
diff --git a/lawnchair/src/app/lawnchair/data/folder/model/FolderViewModel.kt b/lawnchair/src/app/lawnchair/data/folder/model/FolderViewModel.kt
@@ -35,32 +35,28 @@ class FolderViewModel(
 
     init {
         refreshFolders()
-        viewModelScope.launch {
-            // TODO: move back to preferences
-            // reloadHelper.reloadGrid()
-        }
     }
 
-    fun refreshFolders() {
+    fun refreshFolders(isReloadGrid: Boolean = false) {
         viewModelScope.launch {
             mutex.withLock {
                 loadFolders()
             }
         }
+        if (isReloadGrid) reloadHelper.reloadGrid()
     }
 
     fun setFolderInfo(folderInfoId: Int, hasId: Boolean) {
         viewModelScope.launch {
             _folderInfo.value = repository.getFolderInfo(folderInfoId, hasId)
         }
-        refreshFolders()
     }
 
     fun updateFolderInfo(folderInfo: FolderInfo, hide: Boolean) {
         viewModelScope.launch {
             repository.updateFolderInfo(folderInfo, hide)
         }
-        refreshFolders()
+        refreshFolders(true)
     }
 
     fun saveFolder(folderInfo: FolderInfo) {
@@ -74,14 +70,14 @@ class FolderViewModel(
         viewModelScope.launch {
             repository.updateFolderWithItems(id, title, appInfo)
         }
-        refreshFolders()
+        refreshFolders(true)
     }
 
     fun deleteFolder(id: Int) {
         viewModelScope.launch {
             repository.deleteFolderInfo(id)
         }
-        refreshFolders()
+        refreshFolders(true)
     }
 
     private suspend fun loadFolders() {

diff --git a/lawnchair/src/app/lawnchair/data/folder/service/FolderService.kt b/lawnchair/src/app/lawnchair/data/folder/service/FolderService.kt
@@ -76,15 +76,6 @@ class FolderService(val context: Context) : SafeCloseable {
         return null
     }
 
-    suspend fun getItems(id: Int): Set<String> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            folderDao.getItems(id).mapNotNull { it.componentKey }.toSet()
-        } catch (e: Exception) {
-            Log.e("FolderService", "Failed to get all items", e)
-            setOf()
-        }
-    }
-
     suspend fun getAllFolders(): List<FolderInfo> = withContext(Dispatchers.Main) {
         try {
             val folderEntities = folderDao.getAllFolders().firstOrNull() ?: emptyList()

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerFoldersPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerFoldersPreference.kt
@@ -89,32 +89,19 @@ fun AppDrawerFoldersPreference(
                 title = label
             }
             viewModel.saveFolder(newInfo)
-            viewModel.refreshFolders()
         },
         onEditFolderItems = {
             viewModel.setFolderInfo(it, false)
             navController.navigate("${Routes.APP_LIST_TO_FOLDER}/$it")
         },
-        onCreateAndEditFolderItems = { folderInfo, label ->
-            // TODO implement proper method
-            val newInfo = folderInfo.apply {
-                title = label
-            }
-            viewModel.saveFolder(newInfo)
-            viewModel.setFolderInfo(newInfo.id, false)
-            navController.navigate("${Routes.APP_LIST_TO_FOLDER}/${newInfo.id}")
-            viewModel.refreshFolders()
-        },
         onRenameFolder = { folderInfo, it ->
             folderInfo.apply {
                 title = it
                 viewModel.updateFolderInfo(this, false)
             }
-            viewModel.refreshFolders()
         },
         onDeleteFolder = {
             viewModel.deleteFolder(it.id)
-            viewModel.refreshFolders()
         },
         onRefreshList = {
             viewModel.refreshFolders()
@@ -127,7 +114,6 @@ fun AppDrawerFoldersPreference(
     folders: List<FolderInfo>,
     onCreateFolder: (FolderInfo, String) -> Unit,
     onEditFolderItems: (Int) -> Unit,
-    onCreateAndEditFolderItems: (FolderInfo, String) -> Unit,
     onRenameFolder: (FolderInfo, String) -> Unit,
     onDeleteFolder: (FolderInfo) -> Unit,
     onRefreshList: () -> Unit,

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectAppsForDrawerFolder.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectAppsForDrawerFolder.kt
@@ -107,7 +107,6 @@ fun SelectAppsForDrawerFolder(
                             folderInfo?.title.toString(),
                             newSet.toList(),
                         )
-                        viewModel.refreshFolders()
                     },
                     filterUniqueItems = filterNonUniqueItems,
                     onToggleFilterUniqueItems = {
@@ -154,7 +153,6 @@ fun SelectAppsForDrawerFolder(
                                                 folderInfo?.title.toString(),
                                                 newSet.filterIsInstance<AppInfo>().toList(),
                                             )
-                                            viewModel.refreshFolders()
                                         },
                                     )
                                 },