Editing folders in android (#526)

leandroBorgesFerreira · Leandro Ferreira · web-flow · commit 170aeca26f97 · 2025-11-15T22:50:38.000-03:00
Co-authored-by: Leandro Ferreira &lt;email@email.com&gt;
diff --git a/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/ui/screen/menu/MobileChooseNoteScreen.kt b/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/ui/screen/menu/MobileChooseNoteScreen.kt
@@ -130,6 +130,18 @@ internal fun MobileChooseNoteScreen(
                 onCancel = chooseNoteViewModel::cancelDeletion,
             )
         }
+
+        val folderEdit =
+            chooseNoteViewModel.editFolderState.collectAsState().value
+
+        if (folderEdit != null) {
+            EditFileScreen(
+                folderEdit = folderEdit,
+                onDismissRequest = chooseNoteViewModel::stopEditingFolder,
+                deleteFolder = chooseNoteViewModel::deleteFolder,
+                editFolder = chooseNoteViewModel::updateFolder
+            )
+        }
     }
 }
 
diff --git a/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/ChooseNoteKmpViewModel.kt b/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/ChooseNoteKmpViewModel.kt
@@ -207,6 +207,22 @@ internal class ChooseNoteKmpViewModel(
     private val _showAddMenuState = MutableStateFlow(false)
     override val showAddMenuState: StateFlow<Boolean> = _showAddMenuState
 
+    override val editFolderState: StateFlow<Folder?> by lazy {
+        combine(
+            folderController.editingFolderState,
+            menuItemsPerFolderId,
+        ) { selectedFolder, menuItems ->
+            if (selectedFolder != null) {
+                menuItems[selectedFolder.parentId]
+                    ?.find { menuItem ->
+                        menuItem.id == selectedFolder.id
+                    } as? Folder
+            } else {
+                null
+            }
+        }.stateIn(viewModelScope, SharingStarted.Lazily, null)
+    }
+
     init {
         folderController.initCoroutine(viewModelScope)
 
diff --git a/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/ChooseNoteViewModel.kt b/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/ChooseNoteViewModel.kt
@@ -3,6 +3,7 @@ package io.writeopia.notemenu.viewmodel
 import io.writeopia.core.configuration.models.NotesArrangement
 import io.writeopia.notemenu.ui.dto.NotesUi
 import io.writeopia.onboarding.OnboardingState
+import io.writeopia.sdk.models.document.Folder
 import io.writeopia.sdk.models.document.MenuItem
 import io.writeopia.sdk.models.files.ExternalFile
 import io.writeopia.sdk.models.sorting.OrderBy
@@ -39,6 +40,8 @@ interface ChooseNoteViewModel : FolderController {
 
     val showAddMenuState: StateFlow<Boolean>
 
+    val editFolderState: StateFlow<Folder?>
+
     //    fun requestDocuments(force: Boolean)
     fun handleMenuItemTap(id: String): Boolean
 
diff --git a/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/FolderStateController.kt b/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/FolderStateController.kt
@@ -43,7 +43,6 @@ class FolderStateController private constructor(
     }
 
     override fun editFolder(folder: MenuItemUi.FolderUi) {
-        println("editing folder: $folder. this: $this")
         _editingFolder.value = folder
     }
 

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,18 @@ internal fun MobileChooseNoteScreen(`
`130`	`130`	`onCancel = chooseNoteViewModel::cancelDeletion,`
`131`	`131`	`)`
`132`	`132`	`}`
	`133`	`+`
	`134`	`+ val folderEdit =`
	`135`	`+ chooseNoteViewModel.editFolderState.collectAsState().value`
	`136`	`+`
	`137`	`+ if (folderEdit != null) {`
	`138`	`+ EditFileScreen(`
	`139`	`+ folderEdit = folderEdit,`
	`140`	`+ onDismissRequest = chooseNoteViewModel::stopEditingFolder,`
	`141`	`+ deleteFolder = chooseNoteViewModel::deleteFolder,`
	`142`	`+ editFolder = chooseNoteViewModel::updateFolder`
	`143`	`+ )`
	`144`	`+ }`
`133`	`145`	`}`
`134`	`146`	`}`
`135`	`147`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ class FolderStateController private constructor(`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`override fun editFolder(folder: MenuItemUi.FolderUi) {`
`46`		`- println("editing folder: $folder. this: $this")`
`47`	`46`	`_editingFolder.value = folder`
`48`	`47`	`}`
`49`	`48`