fix: [ANDROAPP-6744] correct bottom sheet issues and adapt for androi…

…d 35 (#347) * fix: [ANDROAPP-6744] correct bottom sheet issues and adapt for android 35 * fix: [ANDROAPP-6744] update documentation * fix: [ANDROAPP-6744] Add BottomSheetShellDefaults class for default values, add new parameters to all internal components that use th BottomSheetShell. * fix: [ANDROAPP-6744] small modification to legend param order * fix: [ANDROAPP-6744] update documentation * fix: [ANDROAPP-6744] deprecate old component, create uiState class for bottom sheet, update usages * fix: [ANDROAPP-6744] update bottomsheet * fix: [ANDROAPP-6744] extract bottomSheetShellState to it's own class * fix: [ANDROAPP-6744] Add bottom window insets and padding to Input multiselection and modify legend data object
dhis2 · Jan 31, 2025 · ababe0b · ababe0b
1 parent a51d889
commit ababe0b
Show file tree

Hide file tree

Showing 16 changed files with 741 additions and 167 deletions.
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/actionInputs/InputBarCodeScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/actionInputs/InputBarCodeScreen.kt
@@ -26,6 +26,7 @@ import org.hisp.dhis.mobile.ui.designsystem.component.RowComponentContainer
 import org.hisp.dhis.mobile.ui.designsystem.component.SubTitle
 import org.hisp.dhis.mobile.ui.designsystem.component.SupportingTextData
 import org.hisp.dhis.mobile.ui.designsystem.component.SupportingTextState
+import org.hisp.dhis.mobile.ui.designsystem.component.state.BottomSheetShellUIState
 import org.hisp.dhis.mobile.ui.designsystem.resource.provideStringResource
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
@@ -38,20 +39,22 @@ fun InputBarCodeScreen() {
 
             if (showEnabledBarCodeBottomSheet) {
                 BottomSheetShell(
+                    uiState = BottomSheetShellUIState(
+                        title = provideStringResource("qr_code"),
+                    ),
                     modifier = Modifier.testTag("LEGEND_BOTTOM_SHEET"),
-                    title = provideStringResource("qr_code"),
+                    content = {
+                        Row(horizontalArrangement = Arrangement.Center) {
+                            BarcodeBlock(data = inputValue1.text)
+                        }
+                    },
                     icon = {
                         Icon(
                             imageVector = Icons.Outlined.Info,
                             contentDescription = "Button",
                             tint = SurfaceColor.Primary,
                         )
                     },
-                    content = {
-                        Row(horizontalArrangement = Arrangement.Center) {
-                            BarcodeBlock(data = inputValue1.text)
-                        }
-                    },
                     buttonBlock = {
                         ButtonCarousel(
                             carouselButtonList = threeButtonCarousel,

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/actionInputs/InputQRCodeScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/actionInputs/InputQRCodeScreen.kt
@@ -23,6 +23,7 @@ import org.hisp.dhis.mobile.ui.designsystem.component.InputShellState
 import org.hisp.dhis.mobile.ui.designsystem.component.QrCodeBlock
 import org.hisp.dhis.mobile.ui.designsystem.component.SupportingTextData
 import org.hisp.dhis.mobile.ui.designsystem.component.SupportingTextState
+import org.hisp.dhis.mobile.ui.designsystem.component.state.BottomSheetShellUIState
 import org.hisp.dhis.mobile.ui.designsystem.resource.provideStringResource
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
@@ -34,20 +35,22 @@ fun InputQRCodeScreen() {
 
         if (showEnabledQRBottomSheet) {
             BottomSheetShell(
+                uiState = BottomSheetShellUIState(
+                    title = provideStringResource("qr_code"),
+                ),
                 modifier = Modifier.testTag("LEGEND_BOTTOM_SHEET"),
-                title = provideStringResource("qr_code"),
+                content = {
+                    Row(horizontalArrangement = Arrangement.Center) {
+                        QrCodeBlock(data = inputValue1.text)
+                    }
+                },
                 icon = {
                     Icon(
                         imageVector = Icons.Outlined.Info,
                         contentDescription = "Button",
                         tint = SurfaceColor.Primary,
                     )
                 },
-                content = {
-                    Row(horizontalArrangement = Arrangement.Center) {
-                        QrCodeBlock(data = inputValue1.text)
-                    }
-                },
                 buttonBlock = {
                     ButtonCarousel(
                         carouselButtonList = threeButtonCarousel,