fix merge with main

dhis2 · Dec 22, 2023 · 98ecf5a · 98ecf5a
1 parent 96eff50
commit 98ecf5a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 11 deletions.
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputDropDownScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputDropDownScreen.kt
@@ -8,7 +8,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import org.hisp.dhis.common.screens.previews.lorem
 import org.hisp.dhis.mobile.ui.designsystem.component.ColumnComponentContainer
 import org.hisp.dhis.mobile.ui.designsystem.component.DropdownItem
 import org.hisp.dhis.mobile.ui.designsystem.component.InputDropDown

diff --git a/...tem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDown.kt b/...tem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDown.kt
@@ -32,12 +32,12 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import org.hisp.dhis.mobile.ui.designsystem.theme.DHIS2SCustomTextStyles
 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing.Spacing16
 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing.Spacing8
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
-import androidx.compose.ui.text.style.TextOverflow
 import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor
 
 private const val MAX_DROPDOWN_ITEMS = 6

diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt
@@ -4,7 +4,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Typography
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight

diff --git a/.../desktopTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicInputImageTest.kt b/.../desktopTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicInputImageTest.kt
@@ -37,7 +37,6 @@ class BasicInputImageTest {
                 },
                 onAddButtonClicked = {
                 },
-                onImageClick = {},
             )
         }
         rule.onNodeWithTag("INPUT_IMAGE").assertExists()
@@ -61,7 +60,6 @@ class BasicInputImageTest {
                 },
                 onAddButtonClicked = {
                 },
-                onImageClick = {},
             )
         }
         rule.onNodeWithTag("INPUT_IMAGE").assertExists()
@@ -85,7 +83,6 @@ class BasicInputImageTest {
                 },
                 onAddButtonClicked = {
                 },
-                onImageClick = {},
             )
         }
         rule.onNodeWithTag("INPUT_IMAGE").assertExists()
@@ -108,7 +105,6 @@ class BasicInputImageTest {
                 },
                 onAddButtonClicked = {
                 },
-                onImageClick = {},
             )
         }
         rule.onNodeWithTag("INPUT_IMAGE").assertExists()
@@ -212,7 +208,6 @@ class BasicInputImageTest {
                 },
                 onAddButtonClicked = {
                 },
-                onImageClick = {},
             )
         }
         rule.onNodeWithTag("INPUT_IMAGE").assertExists()
@@ -237,7 +232,6 @@ class BasicInputImageTest {
                 },
                 onAddButtonClicked = {
                 },
-                onImageClick = {},
             )
         }
         rule.onNodeWithTag("INPUT_IMAGE").assertExists()

diff --git a/...rc/desktopTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDownTest.kt b/...rc/desktopTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDownTest.kt
@@ -5,7 +5,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.test.assertCountEquals
-import androidx.compose.ui.test.assertHasNoClickAction
 import androidx.compose.ui.test.assertIsEnabled
 import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.assertTextEquals
@@ -145,7 +144,6 @@ class InputDropDownTest {
         }
         rule.onNodeWithTag("INPUT_DROPDOWN").assertExists()
         rule.onNodeWithTag("INPUT_DROPDOWN_LEGEND").assertExists()
-        rule.onNodeWithTag("INPUT_DROPDOWN_LEGEND").assertHasNoClickAction()
     }
 
     @Test