Fix InputAge crash on language change

dhis2 · Jun 25, 2024 · efa512e · efa512e
1 parent fa3728a
commit efa512e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 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
@@ -18,25 +18,33 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
  *
  * @param orientation: Controls how the radio buttons will be displayed, HORIZONTAL for rows or
  * VERTICAL for columns.
- * @param optionSelected: controls which item is selected.
+ * @param optionSelected: controls which [TimeUnitValues] is selected.
  * @param enabled: manages the enabled state
- * @param onClick: is a callback to notify which item has changed into the block.
+ * @param onClick: is a callback to notify when [TimeUnitValues] is changed.
  * @param modifier: optional modifier.
  */
 @Composable
 internal fun TimeUnitSelector(
     orientation: Orientation,
-    optionSelected: String,
+    optionSelected: TimeUnitValues,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
-    onClick: (RadioButtonData) -> Unit,
+    onClick: (TimeUnitValues) -> Unit,
 ) {
     val backgroundColor = if (enabled) {
         SurfaceColor.Surface
     } else {
         SurfaceColor.DisabledSurface
     }
 
+    val options = TimeUnitValues.entries.map {
+        RadioButtonData(it.name, optionSelected == it, enabled, provideStringResource(it.value))
+    }
+
+    var selectedOption by remember {
+        mutableStateOf(options.find { it.selected } ?: options[0])
+    }
+
     RowComponentContainer(
         modifier = modifier
             .background(color = backgroundColor, Shape.SmallBottom)
@@ -45,18 +53,10 @@ internal fun TimeUnitSelector(
                 end = Spacing.Spacing8,
             ),
     ) {
-        val options = TimeUnitValues.values().map {
-            RadioButtonData(it.value, optionSelected == it.value, enabled, provideStringResource(it.value))
-        }
-        val selectedItem = options.find {
-            it.selected
-        }
-        var currentItem by remember {
-            mutableStateOf(selectedItem ?: options[0])
-        }
-        RadioButtonBlock(orientation, options, currentItem) {
-            currentItem = it
-            onClick.invoke(it)
+        RadioButtonBlock(orientation, options, selectedOption) {
+            selectedOption = it
+            val selectedTimeUnit = TimeUnitValues.entries.first { it.name == selectedOption.uid }
+            onClick.invoke(selectedTimeUnit)
         }
     }
 }

diff --git a/...gnsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputAge.kt b/...gnsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputAge.kt
@@ -207,12 +207,9 @@ fun InputAge(
                     modifier = Modifier.fillMaxWidth()
                         .testTag("INPUT_AGE_TIME_UNIT_SELECTOR"),
                     orientation = Orientation.HORIZONTAL,
-                    optionSelected = YEARS.value,
+                    optionSelected = YEARS,
                     enabled = uiModel.state != InputShellState.DISABLED,
-                    onClick = { itemData ->
-                        val timeUnit = TimeUnitValues.entries
-                            .first { it.value.contains(itemData.textInput!!, ignoreCase = true) }
-
+                    onClick = { timeUnit ->
                         uiModel.onValueChanged.invoke(uiModel.inputType.copy(unit = timeUnit))
                     },
                 )