Skip to content

Commit ae2b03a

Browse files
committed
ErrorDialog shows 1 button
1 parent 71d78d0 commit ae2b03a

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

  • shared-compose-ui/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog

shared-compose-ui/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/extDialogHolder.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ import com.softartdev.notedelight.ui.dialog.security.EnterPasswordDialog
2020
import com.softartdev.theme.pref.DialogHolder
2121
import dev.icerock.moko.resources.compose.stringResource
2222

23-
fun DialogHolder.showSaveChanges(saveNoteAndNavBack: () -> Unit, doNotSaveAndNavBack: () -> Unit) = showDialog {
24-
val saveCallback = prepareDismissCallback(doBefore = saveNoteAndNavBack)
25-
val notSaveCallback = prepareDismissCallback(doBefore = doNotSaveAndNavBack)
26-
SaveDialog(saveCallback, notSaveCallback, ::dismissDialog)
27-
}
23+
fun DialogHolder.showSaveChanges(saveNoteAndNavBack: () -> Unit, doNotSaveAndNavBack: () -> Unit) =
24+
showDialog {
25+
val saveCallback = prepareDismissCallback(doBefore = saveNoteAndNavBack)
26+
val notSaveCallback = prepareDismissCallback(doBefore = doNotSaveAndNavBack)
27+
SaveDialog(saveCallback, notSaveCallback, ::dismissDialog)
28+
}
2829

2930
fun DialogHolder.showEditTitle(noteId: Long) = showDialog {
3031
val editTitleViewModel: EditTitleViewModel = getViewModel()
@@ -68,11 +69,11 @@ fun DialogHolder.showError(message: String?) = showDialog {
6869
}
6970

7071
@Composable
71-
fun ErrorDialog(message: String?, dismissDialog: () -> Unit) = ShowDialog(
72-
title = stringResource(MR.strings.error_title),
73-
text = message,
74-
onConfirm = dismissDialog, //TODO show 1 button
75-
onDismiss = dismissDialog
72+
fun ErrorDialog(message: String?, dismissDialog: () -> Unit) = AlertDialog(
73+
title = { Text(text = stringResource(MR.strings.error_title)) },
74+
text = { Text(message.orEmpty()) },
75+
confirmButton = { Button(onClick = dismissDialog) { Text(stringResource(MR.strings.cancel)) } },
76+
onDismissRequest = dismissDialog,
7677
)
7778

7879
@Composable

0 commit comments

Comments
 (0)