Open entry deletion dialog for new entries as well

Faltenreich · Mar 24, 2024 · 5367034 · 5367034
1 parent 7de1f59
commit 5367034
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/shared/src/commonMain/kotlin/com/faltenreich/diaguard/entry/delete/EntryDeleteState.kt b/shared/src/commonMain/kotlin/com/faltenreich/diaguard/entry/delete/EntryDeleteState.kt
@@ -3,5 +3,5 @@ package com.faltenreich.diaguard.entry.delete
 import com.faltenreich.diaguard.entry.Entry
 
 data class EntryDeleteState(
-    val entry: Entry,
+    val entry: Entry?,
 )
diff --git a/shared/src/commonMain/kotlin/com/faltenreich/diaguard/entry/delete/EntryDeleteViewModel.kt b/shared/src/commonMain/kotlin/com/faltenreich/diaguard/entry/delete/EntryDeleteViewModel.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
 class EntryDeleteViewModel(
-    private val entry: Entry,
+    private val entry: Entry?,
     private val closeModal: CloseModalUseCase = inject(),
     private val deleteEntry: DeleteEntryUseCase = inject(),
 ) : ViewModel<EntryDeleteState, EntryDeleteIntent>() {
@@ -19,7 +19,7 @@ class EntryDeleteViewModel(
         when (intent) {
             is EntryDeleteIntent.Close -> closeModal()
             is EntryDeleteIntent.Confirm -> {
-                deleteEntry(entry)
+                entry?.let(deleteEntry::invoke)
                 closeModal()
             }
         }

diff --git a/shared/src/commonMain/kotlin/com/faltenreich/diaguard/entry/form/EntryFormViewModel.kt b/shared/src/commonMain/kotlin/com/faltenreich/diaguard/entry/form/EntryFormViewModel.kt
@@ -188,8 +188,7 @@ class EntryFormViewModel(
     }
 
     private fun deleteIfNeeded() {
-        val entry = editing ?: return
-        showModal(EntryDeleteModal(entry = entry))
+        showModal(EntryDeleteModal(entry = editing))
         // TODO: navigateBack()
     }
 

diff --git a/shared/src/commonMain/kotlin/com/faltenreich/diaguard/navigation/modal/EntryDeleteModal.kt b/shared/src/commonMain/kotlin/com/faltenreich/diaguard/navigation/modal/EntryDeleteModal.kt
@@ -6,7 +6,7 @@ import com.faltenreich.diaguard.entry.delete.EntryDeleteDialog
 import com.faltenreich.diaguard.shared.di.inject
 import org.koin.core.parameter.parametersOf
 
-data class EntryDeleteModal(private val entry: Entry) : Modal {
+data class EntryDeleteModal(private val entry: Entry?) : Modal {
 
     @Composable
     override fun Content() {