ANDROAPP-5613-Make state not nullable (#92)

* add supporting text as input phone number param, make state not nullable for input shell and basic text input * make state not nullable for input components * fix test
dhis2 · Oct 7, 2023 · b32d251 · b32d251
1 parent 13a7ec9
commit b32d251
Show file tree

Hide file tree

Showing 61 changed files with 193 additions and 45 deletions.
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/FormShellsScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/FormShellsScreen.kt
@@ -38,6 +38,7 @@ fun FormShellsScreen() {
                     inputValue1 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -52,7 +53,7 @@ fun FormShellsScreen() {
                     inputValue2 = it
                 }
             },
-
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -124,6 +125,7 @@ fun FormShellsScreen() {
                     inputValue7 = it
                 }
             },
+            state = InputShellState.ERROR,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -159,6 +161,7 @@ fun FormShellsScreen() {
                     inputValue9 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -178,6 +181,8 @@ fun FormShellsScreen() {
                     inputValue10 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
+
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -263,6 +268,7 @@ fun FormShellsScreen() {
                     inputValue14 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
 
         var inputValue15 by rememberSaveable { mutableStateOf("Input") }
@@ -275,6 +281,7 @@ fun FormShellsScreen() {
                     inputValue15 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -296,6 +303,7 @@ fun FormShellsScreen() {
                     inputValue16 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
     }
 }
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputCheckBoxScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputCheckBoxScreen.kt
@@ -68,6 +68,7 @@ fun InputCheckBoxScreen() {
                 checkBoxDataItemsVertical[index] = checkBoxData.copy(checked = !checkBoxData.checked)
             },
             onClearSelection = { checkBoxDataItemsVertical.replaceAll { it.copy(checked = false) } },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
         InputCheckBox(
@@ -99,6 +100,7 @@ fun InputCheckBoxScreen() {
                 checkBoxDataItemsHorizontal[index] = checkBoxData.copy(checked = !checkBoxData.checked)
             },
             onClearSelection = { checkBoxDataItemsHorizontal.replaceAll { it.copy(checked = false) } },
+            state = InputShellState.UNFOCUSED,
         )
     }
 }
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputEmailScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputEmailScreen.kt
@@ -35,6 +35,7 @@ fun InputEmailScreen() {
                 }
             },
             onEmailActionCLicked = {},
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -51,6 +52,7 @@ fun InputEmailScreen() {
                 }
             },
             onEmailActionCLicked = {},
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputIntegerScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputIntegerScreen.kt
@@ -33,6 +33,7 @@ fun InputIntegerScreen() {
                     inputValue1 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputLetterScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputLetterScreen.kt
@@ -33,6 +33,7 @@ fun InputLetterScreen() {
                     inputValue1 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputLinkScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputLinkScreen.kt
@@ -35,6 +35,7 @@ fun InputLinkScreen() {
                 }
             },
             onLinkActionCLicked = {},
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -51,6 +52,7 @@ fun InputLinkScreen() {
                 }
             },
             onLinkActionCLicked = {},
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -67,6 +69,7 @@ fun InputLinkScreen() {
                 }
             },
             onLinkActionCLicked = {},
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputLongTextScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputLongTextScreen.kt
@@ -38,6 +38,7 @@ fun InputLongTextScreen() {
                     inputValue1 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputMatrixScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputMatrixScreen.kt
@@ -70,6 +70,7 @@ fun InputMatrixScreen() {
                     newSelectedItem
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
 
         InputMatrix(

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputNegativeIntegerScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputNegativeIntegerScreen.kt
@@ -33,6 +33,7 @@ fun InputNegativeIntegerScreen() {
                     inputValue1 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputNumberScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputNumberScreen.kt
@@ -34,6 +34,7 @@ fun InputNumberScreen() {
                 }
             },
             notation = RegExValidations.BRITISH_DECIMAL_NOTATION,
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -49,6 +50,7 @@ fun InputNumberScreen() {
                 }
             },
             notation = RegExValidations.EUROPEAN_DECIMAL_NOTATION,
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputPercentageScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputPercentageScreen.kt
@@ -31,6 +31,7 @@ fun InputPercentageScreen() {
                     inputValue1 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputPhoneNumberScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputPhoneNumberScreen.kt
@@ -34,6 +34,7 @@ fun InputPhoneNumberScreen() {
                 // no-op
             },
             onFocusChanged = {},
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 

diff --git a/...on/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputPositiveIntegerOrZeroScreen.kt b/...on/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputPositiveIntegerOrZeroScreen.kt
@@ -33,6 +33,7 @@ fun InputPositiveIntegerOrZeroScreen() {
                     inputValue1 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputPositiveIntegerScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputPositiveIntegerScreen.kt
@@ -33,6 +33,7 @@ fun InputPositiveIntegerScreen() {
                     inputValue1 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
         SubTitle("Basic Input Integer with error", textColor = TextColor.OnSurfaceVariant)

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputRadioButtonScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputRadioButtonScreen.kt
@@ -76,6 +76,7 @@ fun InputRadioButtonScreen() {
             onItemChange = {
                 selectedItemVertical = it
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
         InputRadioButton(
@@ -106,6 +107,7 @@ fun InputRadioButtonScreen() {
             onItemChange = {
                 selectedItemHorizontal = it
             },
+            state = InputShellState.UNFOCUSED,
         )
     }
 }
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputSequentialScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputSequentialScreen.kt
@@ -70,6 +70,7 @@ fun InputSequentialScreen() {
                     newSelectedItem
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
 
         InputSequential(

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputTextScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputTextScreen.kt
@@ -31,6 +31,7 @@ fun InputTextScreen() {
                     inputValue1 = it
                 }
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
         SubTitle("Input text with error ")

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputYesNoFieldScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputYesNoFieldScreen.kt
@@ -37,6 +37,7 @@ fun InputYesNoFieldScreen() {
             onItemChange = {
                 selectedItem = it
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
         InputYesNoField(
@@ -45,6 +46,7 @@ fun InputYesNoFieldScreen() {
             onItemChange = {
                 selectedItem1 = it
             },
+            state = InputShellState.UNFOCUSED,
         )
         Spacer(Modifier.size(Spacing.Spacing18))
         InputYesNoField(

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputYesOnlyCheckBoxScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputYesOnlyCheckBoxScreen.kt
@@ -28,20 +28,22 @@ fun InputYesOnlyCheckBoxScreen() {
         var checkboxData2 by rememberSaveable {
             mutableStateOf(CheckBoxData(uid = "0", checked = false, enabled = true, textInput = "Label"))
         }
-        var checkboxData3 by rememberSaveable {
+        val checkboxData3 by rememberSaveable {
             mutableStateOf(CheckBoxData(uid = "0", checked = false, enabled = true, textInput = "Label"))
         }
-        var checkboxData4 by rememberSaveable {
+        val checkboxData4 by rememberSaveable {
             mutableStateOf(CheckBoxData(uid = "0", checked = true, enabled = true, textInput = "Label"))
         }
         InputYesOnlyCheckBox(
             checkBoxData = checkboxData,
+            state = InputShellState.UNFOCUSED,
         ) {
             checkboxData = checkboxData.copy(checked = !checkboxData.checked)
         }
         Spacer(Modifier.size(Spacing.Spacing18))
         InputYesOnlyCheckBox(
             checkBoxData = checkboxData1,
+            state = InputShellState.UNFOCUSED,
         ) {
             checkboxData1 = checkboxData1.copy(checked = !checkboxData.checked)
         }

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputYesOnlySwitchScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputYesOnlySwitchScreen.kt
@@ -26,13 +26,15 @@ fun InputYesOnlySwitchScreen() {
         InputYesOnlySwitch(
             title = "Label",
             isChecked = isSelected,
+            state = InputShellState.UNFOCUSED,
         ) {
             isSelected = !isSelected
         }
         Spacer(Modifier.size(Spacing.Spacing18))
         InputYesOnlySwitch(
             title = "Label",
             isChecked = isSelected1,
+            state = InputShellState.UNFOCUSED,
         ) {
             isSelected1 = !isSelected1
         }

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/SectionScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/SectionScreen.kt
@@ -13,6 +13,7 @@ import org.hisp.dhis.common.screens.previews.lorem
 import org.hisp.dhis.common.screens.previews.lorem_medium
 import org.hisp.dhis.common.screens.previews.lorem_short
 import org.hisp.dhis.mobile.ui.designsystem.component.ColumnComponentContainer
+import org.hisp.dhis.mobile.ui.designsystem.component.InputShellState
 import org.hisp.dhis.mobile.ui.designsystem.component.InputText
 import org.hisp.dhis.mobile.ui.designsystem.component.Section
 import org.hisp.dhis.mobile.ui.designsystem.component.SectionState
@@ -162,15 +163,18 @@ private fun TestingFields() {
         title = "Label",
         inputText = inputValue1,
         onValueChanged = { inputValue1 = it ?: "" },
+        state = InputShellState.UNFOCUSED,
     )
     InputText(
         title = "Label",
         inputText = inputValue2,
         onValueChanged = { inputValue2 = it ?: "" },
+        state = InputShellState.UNFOCUSED,
     )
     InputText(
         title = "Label",
         inputText = inputValue3,
         onValueChanged = { inputValue3 = it ?: "" },
+        state = InputShellState.UNFOCUSED,
     )
 }
diff --git a/...em/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicTextInput.kt b/...em/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicTextInput.kt
@@ -41,7 +41,7 @@ import java.util.Locale
 @Composable
 internal fun BasicTextInput(
     title: String,
-    state: InputShellState = InputShellState.UNFOCUSED,
+    state: InputShellState,
     supportingText: List<SupportingTextData>? = null,
     legendData: LegendData? = null,
     inputText: String? = null,

diff --git a/...tem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputCheckBox.kt b/...tem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputCheckBox.kt
@@ -32,7 +32,7 @@ fun InputCheckBox(
     checkBoxData: List<CheckBoxData>,
     modifier: Modifier = Modifier,
     orientation: Orientation = Orientation.VERTICAL,
-    state: InputShellState = InputShellState.UNFOCUSED,
+    state: InputShellState,
     supportingText: List<SupportingTextData>? = null,
     legendData: LegendData? = null,
     isRequired: Boolean = false,

diff --git a/...system/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputEmail.kt b/...system/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputEmail.kt
@@ -31,7 +31,7 @@ import org.hisp.dhis.mobile.ui.designsystem.component.internal.RegExValidations
 @Composable
 fun InputEmail(
     title: String,
-    state: InputShellState = InputShellState.UNFOCUSED,
+    state: InputShellState,
     supportingText: List<SupportingTextData>? = null,
     legendData: LegendData? = null,
     inputText: String? = null,

diff --git a/...stem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputInteger.kt b/...stem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputInteger.kt
@@ -27,7 +27,7 @@ import org.hisp.dhis.mobile.ui.designsystem.component.internal.RegExValidations
 @Composable
 fun InputInteger(
     title: String,
-    state: InputShellState = InputShellState.UNFOCUSED,
+    state: InputShellState,
     supportingText: List<SupportingTextData>? = null,
     legendData: LegendData? = null,
     inputText: String? = null,

diff --git a/...ystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputLetter.kt b/...ystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputLetter.kt
@@ -29,7 +29,7 @@ import org.hisp.dhis.mobile.ui.designsystem.component.internal.RegExValidations
 @Composable
 fun InputLetter(
     title: String,
-    state: InputShellState = InputShellState.UNFOCUSED,
+    state: InputShellState,
     supportingText: List<SupportingTextData>? = null,
     legendData: LegendData? = null,
     inputText: String? = null,

diff --git a/...nsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputLink.kt b/...nsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputLink.kt
@@ -31,7 +31,7 @@ import org.hisp.dhis.mobile.ui.designsystem.component.internal.RegExValidations
 @Composable
 fun InputLink(
     title: String,
-    state: InputShellState = InputShellState.UNFOCUSED,
+    state: InputShellState,
     supportingText: List<SupportingTextData>? = null,
     legendData: LegendData? = null,
     inputText: String? = null,

diff --git a/...tem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputLongText.kt b/...tem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputLongText.kt
@@ -30,7 +30,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
 @Composable
 fun InputLongText(
     title: String,
-    state: InputShellState = InputShellState.UNFOCUSED,
+    state: InputShellState,
     supportingText: List<SupportingTextData>? = null,
     legendData: LegendData? = null,
     inputText: String? = null,
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ fun InputIntegerScreen() { @@
                         inputValue1 = it
                     }
                 },
+                state = InputShellState.UNFOCUSED,
             )
             Spacer(Modifier.size(Spacing.Spacing18))
@@ Expand Down @@