From d8f79b92f93389b2c4f8cd091b78cfbc717e7349 Mon Sep 17 00:00:00 2001
From: Thomas Andres Gomez <andres.gomez.thomas@gmail.com>
Date: Sat, 7 Oct 2023 18:43:41 +0200
Subject: [PATCH] Update the ThrowCard border design.

---
 .../rplexicon/ui/screens/rolls/RollOverlay.kt  | 12 +++++-------
 .../ui/screens/rolls/composable/ThrowsCard.kt  | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/RollOverlay.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/RollOverlay.kt
index b70b2ef..690fd2d 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/RollOverlay.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/RollOverlay.kt
@@ -12,7 +12,6 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.togetherWith
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -268,13 +267,12 @@ private fun RollOverlayContent(
                                 )
 
                                 else -> ThrowsCard(
-                                    modifier = Modifier
-                                        .fillMaxWidth()
-                                        .padding(all = 16.dp)
-                                        .padding(bottom = 32.dp)
-                                        .clickable(onClick = onCard),
+                                    modifier = Modifier.padding(
+                                        bottom = if (enableDrawer.value) 32.dp else 0.dp
+                                    ),
                                     throws = it,
                                     showDetail = showDetail,
+                                    onClick = onCard,
                                 )
                             }
                         }
@@ -363,7 +361,7 @@ private class RollOverlayPreviewProvider : PreviewParameterProvider<RollOverlayP
                     title = "PERCEPTION CHECK",
                     highlight = "CHECK",
                     dice = R.drawable.ic_d20_24,
-                    roll = "$20 + 2 + 2",
+                    roll = "20 + 2 + 2",
                     result = "20",
                     isCriticalSuccess = true,
                     details = listOf(
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/composable/ThrowsCard.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/composable/ThrowsCard.kt
index 084f420..14c833f 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/composable/ThrowsCard.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/composable/ThrowsCard.kt
@@ -8,7 +8,7 @@ import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
-import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.CutCornerShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -46,6 +47,7 @@ import androidx.compose.ui.unit.dp
 import com.pixelized.rplexicon.R
 import com.pixelized.rplexicon.ui.theme.LexiconTheme
 import com.pixelized.rplexicon.utilitary.extentions.annotatedSpan
+import com.pixelized.rplexicon.utilitary.extentions.ddBorder
 import com.pixelized.rplexicon.utilitary.extentions.highlightRegex
 import java.util.UUID
 
@@ -83,6 +85,7 @@ fun ThrowsCard(
     modifier: Modifier = Modifier,
     throws: ThrowsCardUio,
     showDetail: State<Boolean>,
+    onClick: () -> Unit,
 ) {
     val density = LocalDensity.current
     val isDarkMode = isSystemInDarkTheme()
@@ -95,14 +98,14 @@ fun ThrowsCard(
         val measurer = textMeasurer.measure(text = "00", style = typography.displayMedium)
         with(density) { measurer.size.width.toDp() }
     }
+    val inner = remember { RoundedCornerShape(size = 8.dp) }
 
     Surface(
-        modifier = modifier,
-        shape = RoundedCornerShape(size = 16.dp),
-        border = BorderStroke(
-            width = 1.dp,
-            color = MaterialTheme.colorScheme.onSurface.copy(0.25f)
-        ),
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(all = 16.dp)
+            .clickable(onClick = onClick)
+            .ddBorder(inner = inner, outline = remember { CutCornerShape(size = 16.dp) }),
         tonalElevation = if (isDarkMode) 4.dp else 0.dp,
     ) {
         Column(
@@ -269,6 +272,7 @@ fun RollToastPreview(
             modifier = Modifier.fillMaxWidth(),
             throws = preview,
             showDetail = showDetail,
+            onClick = { },
         )
     }
 }