Merge pull request #275 from PermanentOrg/feature/VSP-950-File-names-…

…sequence File names sequence
PermanentOrg · Apr 23, 2024 · d28e286 · d28e286
2 parents b0257d3 + e7b52d8
commit d28e286
Show file tree

Hide file tree

Showing 5 changed files with 561 additions and 24 deletions.
diff --git a/app/src/main/java/org/permanent/permanent/ui/bulkEditMetadata/compose/EditFileNamesScreen.kt b/app/src/main/java/org/permanent/permanent/ui/bulkEditMetadata/compose/EditFileNamesScreen.kt
@@ -66,7 +66,8 @@ fun EditFileNamesScreen(
         snackbarHost = {
             SnackbarHost(hostState = snackbarHostState)
         }
-    ) {it
+    ) {
+        it
         Column() {
             BottomSheetHeader(
                 painterResource(id = R.drawable.ic_edit_name),
@@ -149,25 +150,32 @@ fun EditFileNamesScreen(
                         cancel = cancel
                     )
 
-                    EditFilesOptions.SEQUENCE -> PrependContent()
+                    EditFilesOptions.SEQUENCE -> SequenceFileNamesScreen(
+                        uiState = uiState,
+                        formatDate = viewModel::formatDate,
+                        formatCount = viewModel::formatCount,
+                        applyDateChanges = viewModel::applyChanges,
+                        applyCountChanges = viewModel::applyChanges,
+                        cancel = cancel
+                    )
                 }
             }
-        }
 
-        LaunchedEffect(key1 = uiState.errorMessage) {
-            uiState.errorMessage?.let {
-                scope.launch {
-                    snackbarHostState.showSnackbar(it)
-                    viewModel.updateError(null)
+            LaunchedEffect(key1 = uiState.errorMessage) {
+                uiState.errorMessage?.let {
+                    scope.launch {
+                        snackbarHostState.showSnackbar(it)
+                        viewModel.updateError(null)
+                    }
                 }
             }
-        }
 
-        LaunchedEffect(key1 = uiState.shouldClose, block = {
-            if(uiState.shouldClose) {
-                cancel()
-            }
-        })
+            LaunchedEffect(key1 = uiState.shouldClose, block = {
+                if (uiState.shouldClose) {
+                    cancel()
+                }
+            })
+        }
     }
 }
 
@@ -177,10 +185,4 @@ private enum class EditFilesOptions(val titleID: Int, val resource: Int) {
     SEQUENCE(R.string.sequence, R.drawable.sequence);
 
     fun getLabel(context: Context) = context.getString(titleID)
-}
-
-@Composable
-fun AppendContent() { /* ... */ }
-
-@Composable
-fun PrependContent() { /* ... */ }
+}