Resolved merge conflicts

hadiyarajesh · Oct 16, 2022 · b21c960 · b21c960
1 parent 46fc61b
commit b21c960
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/folders/NoteFolderScreen.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/folders/NoteFolderScreen.kt
@@ -41,7 +41,7 @@ fun NoteFolderScreen(
 ) {
     val scope = rememberCoroutineScope()
     val context = LocalContext.current
-    val folders = remember { folderViewModel.getFolders(NoteFolder) }.collectAsLazyPagingItems()
+    val folders = remember { folderViewModel.getFolders() }.collectAsLazyPagingItems()
 
     val data = listOf(
         Folder(

diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/folders/NoteFolderViewModel.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/folders/NoteFolderViewModel.kt
@@ -28,9 +28,7 @@ class NoteFolderViewModel @Inject constructor(
         )
     }
 
-    fun getFolders(
-        folderType: FolderType
-    ): Flow<PagingData<NoteFolder>> {
-        return folderRepository.getAllFolders(folderType).cachedIn(viewModelScope)
+    fun getFolders(): Flow<PagingData<NoteFolder>> {
+        return folderRepository.getAllNoteFolders().cachedIn(viewModelScope)
     }
 }