From bc81fe99903f8e19aff37e5a6ec81dd8ecb7f51a Mon Sep 17 00:00:00 2001 From: = Date: Thu, 14 Sep 2023 15:33:27 +0200 Subject: [PATCH] update:[ANDROAPP-5467] screen renamed to input age screen --- common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt | 4 ++-- .../kotlin/org/hisp/dhis/common/screens/AgeFieldScreen.kt | 2 +- .../dhis/mobile/ui/designsystem/component/AgeFieldHelper.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt index 34eded422..5fc13ace4 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt @@ -21,7 +21,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import org.hisp.dhis.common.screens.AgeFieldScreen import org.hisp.dhis.common.screens.BottomSheetScreen import org.hisp.dhis.common.screens.ButtonBlockScreen import org.hisp.dhis.common.screens.ButtonScreen @@ -30,6 +29,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.InputAgeScreen import org.hisp.dhis.common.screens.InputIntegerScreen import org.hisp.dhis.common.screens.InputLetterScreen import org.hisp.dhis.common.screens.InputLongTextScreen @@ -130,7 +130,7 @@ fun Main() { Components.INPUT_INTEGER -> InputIntegerScreen() Components.INPUT_NUMBER -> InputNumberScreen() Components.INPUT_LETTER -> InputLetterScreen() - Components.AGE_FIELD -> AgeFieldScreen() + Components.AGE_FIELD -> InputAgeScreen() } } } diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/AgeFieldScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/AgeFieldScreen.kt index 005aa95ab..22e337401 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/AgeFieldScreen.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/AgeFieldScreen.kt @@ -13,7 +13,7 @@ import org.hisp.dhis.mobile.ui.designsystem.component.RadioButtonData import org.hisp.dhis.mobile.ui.designsystem.component.SubTitle @Composable -fun AgeFieldScreen() { +fun InputAgeScreen() { ColumnComponentContainer("Age Field components") { SubTitle("Horizontal Age Field Helper") var selectedFieldHorizontal by remember { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AgeFieldHelper.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AgeFieldHelper.kt index 3ce1e9d6a..a0daf2ae4 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AgeFieldHelper.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AgeFieldHelper.kt @@ -47,4 +47,4 @@ enum class AgeFieldHelperValues(val value: String) { YEARS("Years"), MONTHS("Months"), DAYS("Days"), -} \ No newline at end of file +}