UI: Update BasicJourneyCard to be more dynamic to accept UI changes (#97

)
ksharma-xyz · Oct 2, 2024 · ef161b6 · ef161b6
1 parent 001217b
commit ef161b6
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 32 deletions.
diff --git a/...ign-system/src/main/kotlin/xyz/ksharma/krail/design/system/components/BasicJourneyCard.kt b/...ign-system/src/main/kotlin/xyz/ksharma/krail/design/system/components/BasicJourneyCard.kt
@@ -1,16 +1,12 @@
 package xyz.ksharma.krail.design.system.components
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -23,9 +19,7 @@ import xyz.ksharma.krail.design.system.theme.KrailTheme
 internal fun BasicJourneyCard(
     modifier: Modifier = Modifier,
     backgroundColor: Color = KrailTheme.colors.secondaryContainer,
-    headerRow: @Composable RowScope.() -> Unit = {},
-    secondaryRow: @Composable RowScope.() -> Unit = {},
-    iconsRow: @Composable RowScope.() -> Unit = {},
+    content: @Composable ColumnScope.() -> Unit,
 ) {
     Column(modifier = modifier
         .fillMaxWidth()
@@ -34,20 +28,7 @@ internal fun BasicJourneyCard(
         .semantics(mergeDescendants = true) {}
         .padding(horizontal = 16.dp, vertical = 8.dp)
     ) {
-        Row(modifier = Modifier.fillMaxWidth()) {
-            headerRow()
-        }
-        Row(modifier = Modifier.fillMaxWidth()) {
-            secondaryRow()
-        }
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(top = 4.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            iconsRow()
-        }
+        content()
     }
 }
 
@@ -56,9 +37,9 @@ internal fun BasicJourneyCard(
 private fun BasicJourneyCardPreview() {
     KrailTheme {
         BasicJourneyCard(
-            headerRow = { Text(text = "Header") },
-            secondaryRow = { Text(text = "Secondary") },
-            iconsRow = { Text(text = "Icons") }
+            content = {
+                Text("content")
+            },
         )
     }
 }
diff --git a/core/design-system/src/main/kotlin/xyz/ksharma/krail/design/system/components/JourneyCard.kt b/core/design-system/src/main/kotlin/xyz/ksharma/krail/design/system/components/JourneyCard.kt
@@ -2,6 +2,7 @@ package xyz.ksharma.krail.design.system.components
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -23,14 +24,21 @@ fun JourneyCard(
 ) {
     BasicJourneyCard(
         modifier = modifier,
-        headerRow = {
-            departureText()
-        },
-        secondaryRow = {
-            timeText()
-        },
-        iconsRow = {
-            transportModeIconRow()
+        content = {
+            Row(modifier = Modifier.fillMaxWidth()) {
+                departureText()
+            }
+            Row(modifier = Modifier.fillMaxWidth()) {
+                timeText()
+            }
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 4.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                transportModeIconRow()
+            }
         },
     )
 }

diff --git a/...gn-system/src/main/kotlin/xyz/ksharma/krail/design/system/components/JourneyDetailCard.kt b/...gn-system/src/main/kotlin/xyz/ksharma/krail/design/system/components/JourneyDetailCard.kt
@@ -0,0 +1,26 @@
+package xyz.ksharma.krail.design.system.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import xyz.ksharma.krail.design.system.preview.ComponentPreviews
+import xyz.ksharma.krail.design.system.theme.KrailTheme
+
+@Composable
+fun JourneyDetailCard(modifier: Modifier = Modifier) {
+    Column(modifier = modifier) {
+
+    }
+}
+
+// region Previews
+
+@ComponentPreviews
+@Composable
+private fun JourneyDetailCardPreview(modifier: Modifier = Modifier) {
+    KrailTheme {
+        JourneyDetailCard()
+    }
+}
+
+// endregion