update: [ANDROAPP-5467] padding added

dhis2 · Sep 25, 2023 · 78f606e · 78f606e
1 parent 5e834d0
commit 78f606e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/...em/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AgeFieldHelper.kt b/...em/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AgeFieldHelper.kt
@@ -25,11 +25,11 @@ fun TimeUnitSelector(
 ) {
     RowComponentContainer(
         modifier = Modifier
+            .background(color = SurfaceColor.Surface, Shape.SmallBottom)
             .padding(
                 start = Spacing.Spacing8,
                 end = Spacing.Spacing8,
-            )
-            .background(color = SurfaceColor.Surface, Shape.SmallBottom),
+            ),
     ) {
         val options = TimeUnitValues.values().map {
             RadioButtonData(it.value, optionSelected == it.value, true, provideStringResource(it.value))

diff --git a/...ystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt b/...ystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt
@@ -108,12 +108,9 @@ fun RadioButton(
 fun RadioButtonBlock(
     orientation: Orientation,
     content: List<RadioButtonData>,
-    itemSelected: RadioButtonData,
+    itemSelected: RadioButtonData?,
     onItemChange: (RadioButtonData) -> Unit,
 ) {
-    var currentItem by remember {
-        mutableStateOf(itemSelected)
-    }
     if (orientation == Orientation.HORIZONTAL) {
         FlowRowComponentsContainer(
             null,
@@ -123,12 +120,11 @@ fun RadioButtonBlock(
                     RadioButton(
                         RadioButtonData(
                             radioButtonData.uid,
-                            if (radioButtonData.enabled) radioButtonData == currentItem else radioButtonData.selected,
+                            if (radioButtonData.enabled) radioButtonData == itemSelected else radioButtonData.selected,
                             radioButtonData.enabled,
                             radioButtonData.textInput,
                         ),
                     ) {
-                        currentItem = radioButtonData
                         onItemChange.invoke(radioButtonData)
                     }
                 }
@@ -143,12 +139,11 @@ fun RadioButtonBlock(
                     RadioButton(
                         RadioButtonData(
                             radioButtonData.uid,
-                            if (radioButtonData.enabled) radioButtonData == currentItem else radioButtonData.selected,
+                            if (radioButtonData.enabled) radioButtonData == itemSelected else radioButtonData.selected,
                             radioButtonData.enabled,
                             radioButtonData.textInput,
                         ),
                     ) {
-                        currentItem = radioButtonData
                         onItemChange.invoke(radioButtonData)
                     }
                 }