Create tag on clicking fab in form dialog

Faltenreich · Dec 7, 2023 · 522bb7b · 522bb7b
1 parent e316e64
commit 522bb7b
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 14 deletions.
diff --git a/...commonMain/kotlin/com/faltenreich/diaguard/navigation/bottom/BottomAppBarStyleProvider.kt b/...commonMain/kotlin/com/faltenreich/diaguard/navigation/bottom/BottomAppBarStyleProvider.kt
@@ -41,6 +41,7 @@ import com.faltenreich.diaguard.shared.localization.getString
 import com.faltenreich.diaguard.shared.view.DatePickerBottomAppBarItem
 import com.faltenreich.diaguard.shared.view.FloatingActionButton
 import com.faltenreich.diaguard.shared.view.SearchField
+import com.faltenreich.diaguard.tag.list.TagListIntent
 import com.faltenreich.diaguard.tag.list.TagListViewModel
 import com.faltenreich.diaguard.timeline.TimelineViewModel
 import dev.icerock.moko.resources.compose.painterResource
@@ -178,7 +179,7 @@ fun Screen.bottomAppBarStyle(): BottomAppBarStyle {
         is TagListScreen -> BottomAppBarStyle.Visible(
             floatingActionButton = {
                 val viewModel = getViewModel<TagListViewModel>()
-                FloatingActionButton(onClick = { viewModel.showFormDialog() }) {
+                FloatingActionButton(onClick = { viewModel.handleIntent(TagListIntent.OpenForm) }) {
                     Icon(
                         painter = painterResource(MR.images.ic_add),
                         contentDescription = getString(MR.strings.tag_new),

diff --git a/shared/src/commonMain/kotlin/com/faltenreich/diaguard/tag/TagModule.kt b/shared/src/commonMain/kotlin/com/faltenreich/diaguard/tag/TagModule.kt
@@ -1,5 +1,6 @@
 package com.faltenreich.diaguard.tag
 
+import com.faltenreich.diaguard.tag.form.CreateTagUseCase
 import com.faltenreich.diaguard.tag.list.GetTagsUseCase
 import com.faltenreich.diaguard.tag.list.TagListViewModel
 import org.koin.core.module.dsl.singleOf
@@ -9,6 +10,7 @@ fun tagModule() = module {
     singleOf(::TagRepository)
 
     singleOf(::GetTagsUseCase)
+    singleOf(::CreateTagUseCase)
 
     singleOf(::TagListViewModel)
 }
diff --git a/shared/src/commonMain/kotlin/com/faltenreich/diaguard/tag/form/CreateTagUseCase.kt b/shared/src/commonMain/kotlin/com/faltenreich/diaguard/tag/form/CreateTagUseCase.kt
@@ -0,0 +1,19 @@
+package com.faltenreich.diaguard.tag.form
+
+import com.faltenreich.diaguard.shared.datetime.DateTimeFactory
+import com.faltenreich.diaguard.tag.TagRepository
+
+class CreateTagUseCase(
+    private val repository: TagRepository,
+    private val dateTimeFactory: DateTimeFactory,
+) {
+
+    operator fun invoke(name: String) {
+        val now = dateTimeFactory.now()
+        repository.create(
+            createdAt = now,
+            updatedAt = now,
+            name = name,
+        )
+    }
+}
diff --git a/shared/src/commonMain/kotlin/com/faltenreich/diaguard/tag/list/TagList.kt b/shared/src/commonMain/kotlin/com/faltenreich/diaguard/tag/list/TagList.kt
@@ -25,10 +25,10 @@ fun TagList(
             }
             if (viewState.showFormDialog) {
                 TagFormDialog(
-                    onDismissRequest = viewModel::hideFormDialog,
+                    onDismissRequest = { viewModel.handleIntent(TagListIntent.CloseForm) },
                     onConfirmRequest = { name ->
-                        viewModel.createTag(name)
-                        viewModel.hideFormDialog()
+                        viewModel.handleIntent(TagListIntent.Submit(name))
+                        viewModel.handleIntent(TagListIntent.CloseForm)
                     }
                 )
             }

diff --git a/shared/src/commonMain/kotlin/com/faltenreich/diaguard/tag/list/TagListIntent.kt b/shared/src/commonMain/kotlin/com/faltenreich/diaguard/tag/list/TagListIntent.kt
@@ -0,0 +1,10 @@
+package com.faltenreich.diaguard.tag.list
+
+sealed interface TagListIntent {
+
+    data object OpenForm : TagListIntent
+
+    data object CloseForm : TagListIntent
+
+    data class Submit(val name: String) : TagListIntent
+}
diff --git a/shared/src/commonMain/kotlin/com/faltenreich/diaguard/tag/list/TagListViewModel.kt b/shared/src/commonMain/kotlin/com/faltenreich/diaguard/tag/list/TagListViewModel.kt
@@ -2,13 +2,15 @@ package com.faltenreich.diaguard.tag.list
 
 import com.faltenreich.diaguard.shared.architecture.ViewModel
 import com.faltenreich.diaguard.shared.di.inject
+import com.faltenreich.diaguard.tag.form.CreateTagUseCase
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
 
 class TagListViewModel(
     getTags: GetTagsUseCase = inject(),
+    private val createTag: CreateTagUseCase = inject(),
 ) : ViewModel() {
 
     private val tags = getTags()
@@ -24,15 +26,11 @@ class TagListViewModel(
         initialValue = TagListViewState.Loading,
     )
 
-    fun showFormDialog() {
-        showFormDialog.value = true
-    }
-
-    fun hideFormDialog() {
-        showFormDialog.value = false
-    }
-
-    fun createTag(name: String) {
-
+    fun handleIntent(intent: TagListIntent) {
+        when (intent) {
+            is TagListIntent.OpenForm -> showFormDialog.value = true
+            is TagListIntent.CloseForm -> showFormDialog.value = false
+            is TagListIntent.Submit -> createTag(intent.name)
+        }
     }
 }