Merge pull request #294 from dhis2/ANDROAPP-6309-mobile-ui-Adapt-curr…

…ent-list-card-for-relationships-and-maps fix: [ANDROAPP-6390]: showcase app horizontal list card screen improvements
dhis2 · Sep 4, 2024 · 4ecde28 · 4ecde28
2 parents 944950f + 6944cc5
commit 4ecde28
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/cards/ListCardScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/cards/ListCardScreen.kt
@@ -49,37 +49,37 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor
 
 @Composable
 fun ListCardScreen(horizontal: Boolean) {
-    if (horizontal) {
-        LazyRow(
-            modifier = Modifier.heightIn(0.dp, 500.dp),
-            horizontalArrangement = spacedBy(4.dp),
-            verticalAlignment = Alignment.Top,
-            contentPadding = PaddingValues(vertical = 4.dp, horizontal = 16.dp),
-        ) {
-            items(count = 4) { index ->
-                ListCard(
-                    listCardState = rememberListCardState(
-                        title = ListCardTitleModel(text = "Palak Khanna, F, 61"),
-                        lastUpdated = "5 hours",
-                        additionalInfoColumnState = rememberAdditionalInfoColumnState(
-                            additionalInfoList = largeItemList,
-                            syncProgressItem = syncProgressItem(),
-                            scrollableContent = true,
+    ColumnScreenContainer(title = if (horizontal) Cards.LIST_CARD_HORIZONTAL.label else Cards.LIST_CARD.label) {
+        if (horizontal) {
+            LazyRow(
+                modifier = Modifier.heightIn(0.dp, 500.dp),
+                horizontalArrangement = spacedBy(4.dp),
+                verticalAlignment = Alignment.Top,
+                contentPadding = PaddingValues(vertical = 4.dp, horizontal = 16.dp),
+            ) {
+                items(count = 4) { index ->
+                    ListCard(
+                        listCardState = rememberListCardState(
+                            title = ListCardTitleModel(text = "Palak Khanna, F, 61"),
+                            lastUpdated = "5 hours",
+                            additionalInfoColumnState = rememberAdditionalInfoColumnState(
+                                additionalInfoList = largeItemList,
+                                syncProgressItem = syncProgressItem(),
+                                scrollableContent = true,
+                            ),
+                            loading = false,
                         ),
-                        loading = false,
-                    ),
-                    modifier = Modifier.fillParentMaxWidth(),
-                    listAvatar = {
-                        Avatar(
-                            style = AvatarStyleData.Text("$index"),
-                        )
-                    },
-                    onCardClick = {},
-                )
+                        modifier = Modifier.fillParentMaxWidth(),
+                        listAvatar = {
+                            Avatar(
+                                style = AvatarStyleData.Text("$index"),
+                            )
+                        },
+                        onCardClick = {},
+                    )
+                }
             }
-        }
-    } else {
-        ColumnScreenContainer(title = Cards.LIST_CARD.label) {
+        } else {
             var showLoading1 by remember {
                 mutableStateOf(false)
             }