- Fixes #35: Add button to go to login screen after login error

DesarrolloAntonio · Jun 12, 2024 · d7bf10d · d7bf10d
1 parent 964b9bb
commit d7bf10d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...n/src/main/java/com/desarrollodroide/pagekeeper/ui/bookmarkeditor/BookmarkEditorScreen.kt b/...n/src/main/java/com/desarrollodroide/pagekeeper/ui/bookmarkeditor/BookmarkEditorScreen.kt
@@ -43,12 +43,15 @@ fun BookmarkEditorScreen(
             icon = Icons.Default.Error,
             title = "Error",
             content = bookmarkUiState.error,
+            dismissButton = if (bookmarkViewModel.sessionExpired) "Go to login" else "",
+            confirmButton = "Accept" ,
             openDialog = remember { mutableStateOf(true) },
-            onConfirm = {
+            onDismiss = {
                 if (bookmarkViewModel.sessionExpired){
                     startMainActivity()
                 }
-            }
+            },
+            onConfirm = {}
         )
     }
 

diff --git a/presentation/src/main/java/com/desarrollodroide/pagekeeper/ui/components/Dialogs.kt b/presentation/src/main/java/com/desarrollodroide/pagekeeper/ui/components/Dialogs.kt
@@ -106,6 +106,7 @@ fun ConfirmDialog(
     dismissButton: String = "",
     icon: ImageVector? = null,
     onConfirm: (() -> Unit)? = null,
+    onDismiss: (() -> Unit)? = null,
     openDialog: MutableState<Boolean>,
     properties: DialogProperties = DialogProperties(),
 ) {
@@ -114,6 +115,7 @@ fun ConfirmDialog(
         content = content,
         icon = icon,
         onConfirm = onConfirm,
+        onDismiss = onDismiss,
         confirmButtonText = confirmButton,
         dismissButtonText = dismissButton,
         openDialog = openDialog,