Merge pull request #169 from niscy-eudiw/refactor/use_existing_class_…

…for_success_deferred_modal_options Refactor: Updated WrapModalBottomSheet to use ModalOptionUi.
eu-digital-identity-wallet · Aug 9, 2024 · ce65b95 · ce65b95
2 parents d30aedf + b3ebf95
commit ce65b95
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 46 deletions.
diff --git a/...board-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/dashboard/DashboardScreen.kt b/...board-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/dashboard/DashboardScreen.kt
@@ -439,6 +439,7 @@ private fun DashboardSheetContent(
                     id = R.string.dashboard_bottom_sheet_deferred_documents_ready_subtitle
                 ),
                 options = sheetContent.options,
+                onEventSent = onEventSent,
             )
         }
     }

diff --git a/...rd-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/dashboard/DashboardViewModel.kt b/...rd-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/dashboard/DashboardViewModel.kt
@@ -42,7 +42,6 @@ import eu.europa.ec.resourceslogic.provider.ResourceProvider
 import eu.europa.ec.uilogic.component.AppIcons
 import eu.europa.ec.uilogic.component.ModalOptionUi
 import eu.europa.ec.uilogic.component.content.ContentErrorConfig
-import eu.europa.ec.uilogic.component.wrap.OptionListItemUi
 import eu.europa.ec.uilogic.config.ConfigNavigation
 import eu.europa.ec.uilogic.config.NavigationType
 import eu.europa.ec.uilogic.mvi.MviViewModel
@@ -169,7 +168,7 @@ sealed class DashboardBottomSheetContent {
     data class DeferredDocumentPressed(val documentUi: DocumentUi) : DashboardBottomSheetContent()
     data class DeferredDocumentsReady(
         val successfullyIssuedDeferredDocuments: List<DeferredDocumentData>,
-        val options: List<OptionListItemUi>,
+        val options: List<ModalOptionUi<Event>>,
     ) : DashboardBottomSheetContent()
 }
 
@@ -513,17 +512,14 @@ class DashboardViewModel(
         }
     }
 
-    private fun getBottomSheetOptions(deferredDocumentsData: List<DeferredDocumentData>): List<OptionListItemUi> {
+    private fun getBottomSheetOptions(deferredDocumentsData: List<DeferredDocumentData>): List<ModalOptionUi<Event>> {
         return deferredDocumentsData.map {
-            OptionListItemUi(
-                text = it.docName,
-                onClick = {
-                    setEvent(
-                        Event.BottomSheet.DeferredDocument.OptionListItemForSuccessfullyIssuingDeferredDocumentSelected(
-                            documentId = it.documentId
-                        )
-                    )
-                }
+            ModalOptionUi(
+                title = it.docName,
+                icon = AppIcons.KeyboardArrowRight,
+                event = Event.BottomSheet.DeferredDocument.OptionListItemForSuccessfullyIssuingDeferredDocumentSelected(
+                    documentId = it.documentId
+                )
             )
         }
     }

diff --git a/ui-logic/src/main/java/eu/europa/ec/uilogic/component/wrap/WrapModalBottomSheet.kt b/ui-logic/src/main/java/eu/europa/ec/uilogic/component/wrap/WrapModalBottomSheet.kt
@@ -43,8 +43,7 @@ import eu.europa.ec.resourceslogic.theme.values.backgroundDefault
 import eu.europa.ec.resourceslogic.theme.values.backgroundPaper
 import eu.europa.ec.resourceslogic.theme.values.textPrimaryDark
 import eu.europa.ec.resourceslogic.theme.values.textSecondaryDark
-import eu.europa.ec.uilogic.component.AppIcons
-import eu.europa.ec.uilogic.component.IconData
+import eu.europa.ec.uilogic.component.ModalOptionUi
 import eu.europa.ec.uilogic.component.preview.PreviewTheme
 import eu.europa.ec.uilogic.component.preview.ThemeModePreviews
 import eu.europa.ec.uilogic.component.utils.SIZE_SMALL
@@ -54,12 +53,7 @@ import eu.europa.ec.uilogic.component.utils.SPACING_MEDIUM
 import eu.europa.ec.uilogic.component.utils.SPACING_SMALL
 import eu.europa.ec.uilogic.component.utils.VSpacer
 import eu.europa.ec.uilogic.extension.throttledClickable
-
-data class OptionListItemUi(
-    val text: String,
-    val icon: IconData = AppIcons.KeyboardArrowRight,
-    val onClick: () -> Unit
-)
+import eu.europa.ec.uilogic.mvi.ViewEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -174,10 +168,11 @@ fun DialogBottomSheet(
 }
 
 @Composable
-fun BottomSheetWithOptionsList(
+fun <T : ViewEvent> BottomSheetWithOptionsList(
     title: String,
     message: String,
-    options: List<OptionListItemUi>,
+    options: List<ModalOptionUi<T>>,
+    onEventSent: (T) -> Unit
 ) {
     if (options.isNotEmpty()) {
         GenericBaseSheetContent(
@@ -198,6 +193,7 @@ fun BottomSheetWithOptionsList(
                 ) {
                     OptionsList(
                         optionItems = options,
+                        itemSelected = onEventSent
                     )
                 }
             }
@@ -206,35 +202,34 @@ fun BottomSheetWithOptionsList(
 }
 
 @Composable
-fun OptionsList(
-    optionItems: List<OptionListItemUi>,
+fun <T : ViewEvent> OptionsList(
+    optionItems: List<ModalOptionUi<T>>,
+    itemSelected: (T) -> Unit
 ) {
     LazyColumn(
         verticalArrangement = Arrangement.spacedBy(SPACING_SMALL.dp)
     ) {
         items(optionItems) { item ->
             OptionListItem(
                 item = item,
-                onItemSelected = {
-                    item.onClick()
-                },
+                itemSelected = itemSelected
             )
         }
     }
 }
 
 @Composable
-fun OptionListItem(
-    item: OptionListItemUi,
-    onItemSelected: () -> Unit,
+fun <T : ViewEvent> OptionListItem(
+    item: ModalOptionUi<T>,
+    itemSelected: (T) -> Unit
 ) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(SIZE_SMALL.dp))
             .background(MaterialTheme.colorScheme.backgroundDefault)
             .throttledClickable {
-                onItemSelected.invoke()
+                itemSelected(item.event)
             }
             .padding(
                 horizontal = SPACING_SMALL.dp,
@@ -245,7 +240,7 @@ fun OptionListItem(
     ) {
         Text(
             modifier = Modifier.weight(1f),
-            text = item.text,
+            text = item.title,
             style = MaterialTheme.typography.bodyMedium
         )
         WrapIcon(
@@ -276,20 +271,8 @@ private fun BottomSheetWithOptionsListPreview() {
         BottomSheetWithOptionsList(
             title = "Title",
             message = "Message",
-            options = listOf(
-                OptionListItemUi(
-                    text = "Small Name",
-                    onClick = {}
-                ),
-                OptionListItemUi(
-                    text = "MediumMediumMediumMedium Name",
-                    onClick = {}
-                ),
-                OptionListItemUi(
-                    text = "LargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLargeLarge Name",
-                    onClick = {}
-                ),
-            ),
+            options = listOf<ModalOptionUi<ViewEvent>>(),
+            onEventSent = {}
         )
     }
 }