✨ added added stack shade to Deck composable

schachi5000 · Nov 3, 2023 · 102bd32 · 102bd32
1 parent 8caaafe
commit 102bd32
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 17 deletions.
diff --git a/shared/src/commonMain/kotlin/net/schacher/mcc/shared/datasource/http/KtorCardDataSource.kt b/shared/src/commonMain/kotlin/net/schacher/mcc/shared/datasource/http/KtorCardDataSource.kt
@@ -20,7 +20,7 @@ import kotlin.coroutines.coroutineContext
 // TODO convert to class and hide behind interface
 object KtorCardDataSource {
 
-    private const val BASE_URL = "https://de.marvelcdb.com"
+    private const val BASE_URL = "https://de.marvelcdb.com/api/public"
 
     private val httpClient = HttpClient {
         install(ContentNegotiation) {
@@ -39,11 +39,11 @@ object KtorCardDataSource {
     }
 
     suspend fun getAllCardPacks() = httpClient
-        .get("$BASE_URL/api/public/packs")
+        .get("$BASE_URL/packs")
         .body<List<Pack>>()
 
     suspend fun getCardPack(packCode: String) = httpClient
-        .get("$BASE_URL/api/public/cards/$packCode")
+        .get("$BASE_URL/cards/$packCode")
         .body<List<Card>>()
 
     suspend fun getAllCards() = getAllCardPacks()
@@ -59,11 +59,11 @@ object KtorCardDataSource {
         .flatten()
 
     suspend fun getCard(cardCode: String) = httpClient
-        .get("$BASE_URL/api/public/card/$cardCode")
+        .get("$BASE_URL/card/$cardCode")
         .body<Card>()
 
     suspend fun getFeaturedDecksByDate(date: String, cardProvider: (String) -> Card?) = httpClient
-        .get("$BASE_URL/api/public/decklists/by_date/$date")
+        .get("$BASE_URL/decklists/by_date/$date")
         .body<List<DeckDto>>()
         .map {
             Deck(
@@ -77,7 +77,7 @@ object KtorCardDataSource {
         }
 
     suspend fun getPublicDeckById(deckId: Int, cardProvider: (String) -> Card?) = httpClient
-        .get("$BASE_URL/api/public/deck/$deckId")
+        .get("$BASE_URL/deck/$deckId")
         .body<DeckDto>()
         .let {
             Deck(

diff --git a/shared/src/commonMain/kotlin/net/schacher/mcc/shared/design/compose/Deck.kt b/shared/src/commonMain/kotlin/net/schacher/mcc/shared/design/compose/Deck.kt
@@ -3,6 +3,7 @@ package net.schacher.mcc.shared.design.compose
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -12,23 +13,58 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import net.schacher.mcc.shared.model.Deck
 
 @Composable
 fun Deck(deck: Deck) {
-    Row(
-        modifier = Modifier.wrapContentHeight()
-            .fillMaxWidth()
-            .height(128.dp)
-            .clip(RoundedCornerShape(8.dp))
-            .background(MaterialTheme.colors.surface)
-    ) {
-        Card(card = deck.heroCard)
+    Column {
+        DeckStack(modifier = Modifier.fillMaxWidth())
+        Spacer(Modifier.height(1.dp))
+        Row(
+            modifier = Modifier.wrapContentHeight()
+                .fillMaxWidth()
+                .height(128.dp)
+                .clip(RoundedCornerShape(8.dp))
+                .background(MaterialTheme.colors.surface)
+        ) {
+            Card(card = deck.heroCard)
 
-        Column(modifier = Modifier.padding(8.dp)) {
-            Text(text = deck.name)
+            Column(modifier = Modifier.padding(8.dp)) {
+                Text(
+                    text = deck.name,
+                    maxLines = 1,
+                    fontWeight = FontWeight.SemiBold
+                )
+            }
         }
     }
-}
+}
+
+@Composable
+private fun DeckStack(modifier: Modifier = Modifier) {
+    Column(modifier) {
+        Row(
+            Modifier.height(5.dp)
+                .padding(horizontal = 16.dp)
+                .alpha(0.3f)
+                .background(MaterialTheme.colors.onSurface, StackShape())
+                .fillMaxWidth()
+        ) { }
+        Spacer(Modifier.height(1.dp))
+        Row(
+            Modifier.height(5.dp)
+                .padding(horizontal = 8.dp)
+                .alpha(0.2f)
+                .background(MaterialTheme.colors.onSurface, StackShape())
+                .fillMaxWidth()
+        ) { }
+    }
+}
+
+private fun StackShape() = RoundedCornerShape(
+    topStart = 8.dp, topEnd = 8.dp
+)