fix: [ANDROAPP-6744] Add bottom window insets and padding to Input mu…

…ltiselection and modify legend data object
dhis2 · Jan 30, 2025 · d7476d6 · d7476d6
1 parent 52be2f6
commit d7476d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/...c/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputMultiSelection.kt b/...c/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputMultiSelection.kt
@@ -64,12 +64,14 @@ private const val MAX_CHECKBOXES_ITEMS_TO_SHOW = 50
  * @param doneButtonText: text to be shown for accept button in pop up.
  * @param onClearItemSelection: callback for clear item selection.
  */
-@OptIn(ExperimentalLayoutApi::class)
+@OptIn(ExperimentalLayoutApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun InputMultiSelection(
     items: List<CheckBoxData>,
     title: String,
     state: InputShellState,
+    windowInsets: @Composable () -> WindowInsets = { BottomSheetDefaults.windowInsets },
+    bottomSheetLowerPadding: Dp = Spacing0,
     supportingTextData: List<SupportingTextData>?,
     legendData: LegendData?,
     isRequired: Boolean,
@@ -229,6 +231,8 @@ fun InputMultiSelection(
 
         if (showMultiSelectBottomSheet) {
             MultiSelectBottomSheet(
+                windowInsets = windowInsets,
+                bottomSheetLowerPadding = bottomSheetLowerPadding,
                 items = items,
                 title = title,
                 noResultsFoundString = noResultsFoundString,

diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Legend.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Legend.kt
@@ -57,8 +57,6 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon
 fun Legend(
     legendData: LegendData,
     modifier: Modifier = Modifier,
-    windowInsets: @Composable () -> WindowInsets = { BottomSheetDefaults.windowInsets },
-    bottomSheetLowerPadding: Dp = Spacing0,
 ) {
     var showBottomSheetShell by rememberSaveable { mutableStateOf(false) }
 
@@ -130,13 +128,13 @@ fun Legend(
         BottomSheetShell(
             uiState = BottomSheetShellUIState(
                 title = legendData.title,
-                bottomPadding = bottomSheetLowerPadding,
+                bottomPadding = legendData.bottomSheetLowerPadding,
             ),
             modifier = Modifier.testTag("LEGEND_BOTTOM_SHEET"),
             content = {
                 legendData.popUpLegendDescriptionData?.let { LegendRange(it) }
             },
-            windowInsets = windowInsets,
+            windowInsets = legendData.windowInsets,
             icon = {
                 Icon(
                     imageVector = Icons.Outlined.Info,
@@ -223,8 +221,12 @@ data class LegendDescriptionData(
  * @param popUpLegendDescriptionData list of [LegendDescriptionData] with information for the
  * legend range description pop up.
  */
-data class LegendData(
+data class LegendData
+@OptIn(ExperimentalMaterial3Api::class)
+constructor(
     val color: Color,
     val title: String,
     val popUpLegendDescriptionData: List<LegendDescriptionData>? = null,
+    val windowInsets: @Composable () -> WindowInsets = { BottomSheetDefaults.windowInsets },
+    val bottomSheetLowerPadding: Dp = Spacing0,
 )