Merge pull request #161 from niscy-eudiw/bugfix/small_fix

Refactor: Updated spacing in WrapModalBottomSheet
eu-digital-identity-wallet · Jul 29, 2024 · 685a1bd · 685a1bd
2 parents 36714e5 + b9d8a03
commit 685a1bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
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
@@ -444,7 +444,10 @@ class DashboardViewModel(
 
                     is DashboardInteractorRetryIssuingDeferredDocumentsPartialState.Result -> {
                         val successDocs = response.successfullyIssuedDeferredDocuments
-                        if (successDocs.isNotEmpty()) {
+                        if (successDocs.isNotEmpty()
+                            && !viewState.value.isBottomSheetOpen
+                            && viewState.value.sheetContent is DashboardBottomSheetContent.DeferredDocumentsReady
+                        ) {
                             showBottomSheet(
                                 sheetContent = DashboardBottomSheetContent.DeferredDocumentsReady(
                                     successfullyIssuedDeferredDocuments = successDocs,

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
@@ -47,10 +47,11 @@ import eu.europa.ec.uilogic.component.AppIcons
 import eu.europa.ec.uilogic.component.IconData
 import eu.europa.ec.uilogic.component.preview.PreviewTheme
 import eu.europa.ec.uilogic.component.preview.ThemeModePreviews
-import eu.europa.ec.uilogic.component.utils.SIZE_MEDIUM
 import eu.europa.ec.uilogic.component.utils.SIZE_SMALL
 import eu.europa.ec.uilogic.component.utils.SPACING_EXTRA_LARGE
 import eu.europa.ec.uilogic.component.utils.SPACING_LARGE
+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
 
@@ -209,7 +210,7 @@ fun OptionsList(
     optionItems: List<OptionListItemUi>,
 ) {
     LazyColumn(
-        verticalArrangement = Arrangement.spacedBy(SIZE_SMALL.dp)
+        verticalArrangement = Arrangement.spacedBy(SPACING_SMALL.dp)
     ) {
         items(optionItems) { item ->
             OptionListItem(
@@ -236,8 +237,8 @@ fun OptionListItem(
                 onItemSelected.invoke()
             }
             .padding(
-                horizontal = SIZE_SMALL.dp,
-                vertical = SIZE_MEDIUM.dp
+                horizontal = SPACING_SMALL.dp,
+                vertical = SPACING_MEDIUM.dp
             ),
         horizontalArrangement = Arrangement.Start,
         verticalAlignment = Alignment.CenterVertically