World trait rating colors for all, but geysers only warnings

StefanOltmann · Oct 13, 2024 · 0e8202b · 0e8202b
1 parent 4b332d8
commit 0e8202b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/app/src/commonMain/kotlin/model/Rating.kt b/app/src/commonMain/kotlin/model/Rating.kt
@@ -20,7 +20,6 @@
 package model
 
 import androidx.compose.ui.graphics.Color
-import ui.theme.anthracite
 
 enum class Rating(
     val value: Int,
@@ -39,7 +38,7 @@ enum class Rating(
 
     NEUTRAL(
         value = 0,
-        color = anthracite
+        color = Color.Transparent
     ),
 
     BAD(

diff --git a/app/src/commonMain/kotlin/ui/AsteroidDisplay.kt b/app/src/commonMain/kotlin/ui/AsteroidDisplay.kt
@@ -136,10 +136,12 @@ fun AsteroidView(
                             contentAlignment = Alignment.Center,
                             modifier = Modifier
                                 .background(
-                                    if (worldTrait.rating.isNegative())
-                                        worldTrait.rating.color.copy(alpha = 0.3f)
-                                    else
-                                        anthraticeTransparentBackgroundColor,
+                                    anthraticeTransparentBackgroundColor,
+                                    minimalRoundedCornerShape
+                                )
+                                .border(
+                                    2.dp,
+                                    worldTrait.rating.color,
                                     minimalRoundedCornerShape
                                 )
                                 .size(24.dp)

diff --git a/app/src/commonMain/kotlin/ui/WolrdTraitDetail.kt b/app/src/commonMain/kotlin/ui/WolrdTraitDetail.kt
@@ -34,7 +34,6 @@ import org.jetbrains.compose.resources.painterResource
 import ui.theme.cardColorBackground
 import ui.theme.defaultRoundedCornerShape
 import ui.theme.doubleSpacing
-import ui.theme.lightGrayTransparentBorderColor
 
 @Composable
 fun WorlTraitDetail(
@@ -48,15 +47,12 @@ fun WorlTraitDetail(
                 horizontal = doubleSpacing
             )
             .background(
-                if (worldTrait.rating.isNegative())
-                    worldTrait.rating.color.copy(alpha = 0.3f)
-                else
                 cardColorBackground,
                 defaultRoundedCornerShape
             )
             .border(
-                0.dp,
-                lightGrayTransparentBorderColor,
+                2.dp,
+                worldTrait.rating.color,
                 defaultRoundedCornerShape
             )
             .fillMaxWidth()