From 237c6c063dd5557de342a5e12ed97baefd4791d8 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 14 Sep 2023 15:43:03 +0200 Subject: [PATCH] update: [ANDROAPP-5467] Conflicts resolved --- common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt | 2 -- .../kotlin/org/hisp/dhis/common/screens/Components.kt | 4 +--- 2 files changed, 1 insertion(+), 5 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 bebeff14d..f6818c0c8 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt @@ -22,8 +22,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import org.hisp.dhis.common.screens.BottomSheetHeaderScreen -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 import org.hisp.dhis.common.screens.CheckboxScreen 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 index dfd4e984c..f14bd2dc2 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/Components.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/Components.kt @@ -26,7 +26,5 @@ enum class Components(val label: String) { INPUT("Input"), BUTTON_BLOCK("Button block"), ICON_CARDS("Icon Cards"), - INPUT_LONG_TEXT("Input Long Text"), - INPUT_POSITIVE_INTEGER_OR_ZERO("Input Positive Integer Or Zero"), - AGE_FIELD("Age Field"), + AGE_FIELD("Input Age Field"), }