Merge branch 'main' into ANDROAPP-5575-mobile-ui-Create-InputFileReso…

…urce-component
dhis2 · Oct 10, 2023 · 88262e2 · 88262e2
2 parents f29c39b + e7ad9c1
commit 88262e2
Show file tree

Hide file tree

Showing 85 changed files with 1,363 additions and 62 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -16,6 +16,8 @@ kotlin {
                 implementation(compose.foundation)
                 implementation(compose.ui)
                 implementation(compose.material3)
+                @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
+                implementation(compose.components.resources)
                 implementation(project(":designsystem"))
             }
         }
@@ -49,7 +51,8 @@ android {
     namespace = "org.hisp.dhis.mobile.ui.common"
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    sourceSets["main"].res.srcDirs("src/androidMain/res")
+    sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/resources")
+    sourceSets["main"].resources.srcDirs("src/commonMain/resources")
 
     defaultConfig {
         minSdk = (findProperty("android.minSdk") as String).toInt()

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt
@@ -34,6 +34,7 @@ import org.hisp.dhis.common.screens.Components
 import org.hisp.dhis.common.screens.FormShellsScreen
 import org.hisp.dhis.common.screens.FormsComponentsScreen
 import org.hisp.dhis.common.screens.IconButtonScreen
+import org.hisp.dhis.common.screens.ImageBlockScreen
 import org.hisp.dhis.common.screens.InputAgeScreen
 import org.hisp.dhis.common.screens.InputCheckBoxScreen
 import org.hisp.dhis.common.screens.InputEmailScreen
@@ -45,6 +46,7 @@ import org.hisp.dhis.common.screens.InputLongTextScreen
 import org.hisp.dhis.common.screens.InputMatrixScreen
 import org.hisp.dhis.common.screens.InputNegativeIntegerScreen
 import org.hisp.dhis.common.screens.InputNumberScreen
+import org.hisp.dhis.common.screens.InputOrgUnitScreen
 import org.hisp.dhis.common.screens.InputPercentageScreen
 import org.hisp.dhis.common.screens.InputPhoneNumberScreen
 import org.hisp.dhis.common.screens.InputPositiveIntegerOrZeroScreen
@@ -171,6 +173,8 @@ fun Main() {
             Components.INPUT_EMAIL -> InputEmailScreen()
             Components.CAROUSEL_BUTTONS -> ButtonCarouselScreen()
             Components.INPUT_FILE_RESOURCE -> InputFileResourceScreen()
+            Components.INPUT_ORG_UNIT -> InputOrgUnitScreen()
+            Components.IMAGE_BLOCK -> ImageBlockScreen()
         }
     }
 }
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/Components.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/Components.kt
@@ -46,4 +46,6 @@ enum class Components(val label: String) {
     INPUT_EMAIL("Input Email"),
     CAROUSEL_BUTTONS("Carousel buttons"),
     INPUT_FILE_RESOURCE("Input File Resource"),
+    INPUT_ORG_UNIT("Input Org. Unit"),
+    IMAGE_BLOCK("Image Block"),
 }
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/ImageBlockScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/ImageBlockScreen.kt
@@ -0,0 +1,23 @@
+package org.hisp.dhis.common.screens
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.graphics.painter.Painter
+import org.hisp.dhis.mobile.ui.designsystem.component.ImageBlock
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.painterResource
+
+@Composable
+fun ImageBlockScreen() {
+    val sampleImage = provideSampleImage()
+    ImageBlock(
+        load = { sampleImage },
+        painterFor = { remember { it } },
+        onClick = {},
+    )
+}
+
+@OptIn(ExperimentalResourceApi::class)
+@Composable
+private fun provideSampleImage(): Painter =
+    painterResource("drawable/sample.png")
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputAgeScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputAgeScreen.kt
@@ -5,7 +5,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import org.hisp.dhis.mobile.ui.designsystem.component.AgeInputType
 import org.hisp.dhis.mobile.ui.designsystem.component.ColumnComponentContainer
+import org.hisp.dhis.mobile.ui.designsystem.component.InputAge
+import org.hisp.dhis.mobile.ui.designsystem.component.InputShellState
 import org.hisp.dhis.mobile.ui.designsystem.component.Orientation
 import org.hisp.dhis.mobile.ui.designsystem.component.RadioButtonData
 import org.hisp.dhis.mobile.ui.designsystem.component.SubTitle
@@ -14,13 +17,94 @@ import org.hisp.dhis.mobile.ui.designsystem.component.TimeUnitValues
 
 @Composable
 fun InputAgeScreen() {
-    ColumnComponentContainer("Age Field components") {
+    ColumnComponentContainer {
         SubTitle("Horizontal Age Field Helper")
         var selectedFieldHorizontal by remember {
             mutableStateOf(RadioButtonData("0", selected = true, enabled = true, textInput = TimeUnitValues.YEARS.value))
         }
         TimeUnitSelector(Orientation.HORIZONTAL, TimeUnitValues.YEARS.value) {
             selectedFieldHorizontal = it
         }
+
+        SubTitle("Input Age Component - Idle")
+        var inputType by remember { mutableStateOf<AgeInputType>(AgeInputType.None) }
+
+        InputAge(
+            title = "Label",
+            inputType = inputType,
+            onCalendarActionClicked = {
+                // no-op
+            },
+            onValueChanged = { newInputType ->
+                inputType = newInputType
+            },
+        )
+
+        SubTitle("Input Age Component - Idle Disabled")
+        InputAge(
+            title = "Label",
+            inputType = AgeInputType.None,
+            state = InputShellState.DISABLED,
+            onCalendarActionClicked = {
+                // no-op
+            },
+            onValueChanged = { newInputType ->
+                inputType = newInputType
+            },
+        )
+
+        SubTitle("Input Age Component - Date Of Birth")
+        InputAge(
+            title = "Label",
+            inputType = AgeInputType.DateOfBirth("01011985"),
+            state = InputShellState.DISABLED,
+            onCalendarActionClicked = {
+                // no-op
+            },
+            onValueChanged = { newInputType ->
+                inputType = newInputType
+            },
+        )
+
+        SubTitle("Input Age Component - Date Of Birth Required Error")
+        InputAge(
+            title = "Label",
+            inputType = AgeInputType.DateOfBirth("010"),
+            state = InputShellState.ERROR,
+            isRequired = true,
+            onCalendarActionClicked = {
+                // no-op
+            },
+            onValueChanged = {
+                // no-op
+            },
+        )
+
+        SubTitle("Input Age Component - Age Disabled")
+        InputAge(
+            title = "Label",
+            inputType = AgeInputType.Age(value = "56", unit = TimeUnitValues.YEARS),
+            state = InputShellState.DISABLED,
+            onCalendarActionClicked = {
+                // no-op
+            },
+            onValueChanged = { newInputType ->
+                inputType = newInputType
+            },
+        )
+
+        SubTitle("Input Age Component - Age Required Error")
+        InputAge(
+            title = "Label",
+            inputType = AgeInputType.Age(value = "56", unit = TimeUnitValues.YEARS),
+            state = InputShellState.ERROR,
+            isRequired = true,
+            onCalendarActionClicked = {
+                // no-op
+            },
+            onValueChanged = {
+                // no-op
+            },
+        )
     }
 }
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))
-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 @@