Consistent theming for stars

MateriiApps · Sep 17, 2024 · d4fd6ce · d4fd6ce
1 parent 735178c
commit d4fd6ce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/...c/commonMain/kotlin/com/materiiapps/gloom/ui/screen/explore/component/TrendingRepoItem.kt b/...c/commonMain/kotlin/com/materiiapps/gloom/ui/screen/explore/component/TrendingRepoItem.kt
@@ -110,8 +110,8 @@ fun TrendingRepoItem(
                             if (shouldStar) onStarClick() else onUnstarClick()
                         },
                         colors = IconButtonDefaults.filledTonalIconToggleButtonColors(
-                            checkedContentColor = MaterialTheme.gloomColorScheme.statusYellow,
-                            checkedContainerColor = MaterialTheme.gloomColorScheme.statusYellow.copy(alpha = 0.2f)
+                            checkedContentColor = MaterialTheme.gloomColorScheme.star,
+                            checkedContainerColor = MaterialTheme.gloomColorScheme.star.copy(alpha = 0.2f)
                         ),
                         enabled = starToggleEnabled
                     ) {

diff --git a/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/FeedRepoCard.kt b/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screen/home/component/FeedRepoCard.kt
@@ -41,6 +41,7 @@ import com.materiiapps.gloom.api.dto.user.User
 import com.materiiapps.gloom.gql.fragment.FeedRepository
 import com.materiiapps.gloom.ui.component.Avatar
 import com.materiiapps.gloom.ui.screen.repo.RepoScreen
+import com.materiiapps.gloom.ui.theme.gloomColorScheme
 import com.materiiapps.gloom.ui.util.NumberFormatter
 import com.materiiapps.gloom.ui.util.navigate
 import com.materiiapps.gloom.ui.util.parsedColor
@@ -59,7 +60,11 @@ fun FeedRepoCard(
     val nav = LocalNavigator.currentOrThrow
     val viewerHasStarred = starData?.first ?: repo.viewerHasStarred
     val starCount = starData?.second ?: repo.stargazerCount
-    val (starColor, starIcon) = if (viewerHasStarred) Color(0xFFF1E05A) to Icons.Filled.Star else LocalContentColor.current to Icons.Outlined.StarBorder
+    val (starColor, starIcon) = if (viewerHasStarred) {
+        MaterialTheme.gloomColorScheme.star to Icons.Filled.Star
+    } else {
+        LocalContentColor.current to Icons.Outlined.StarBorder
+    }
 
     ElevatedCard(
         onClick = { nav.navigate(RepoScreen(repo.owner.login, repo.name)) },

diff --git a/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/theme/GloomColorScheme.kt b/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/theme/GloomColorScheme.kt
@@ -21,6 +21,7 @@ class GloomColorScheme(
     statusRed: Color,
     statusGrey: Color,
     statusYellow: Color,
+    star: Color,
     warning: Color,
     onWarning: Color,
     warningContainer: Color,
@@ -42,6 +43,9 @@ class GloomColorScheme(
     var statusYellow by mutableStateOf(statusYellow, structuralEqualityPolicy())
         internal set
 
+    var star by mutableStateOf(star, structuralEqualityPolicy())
+        internal set
+
     var warning by mutableStateOf(warning, structuralEqualityPolicy())
         internal set
 

diff --git a/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/theme/Themes.kt b/ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/theme/Themes.kt
@@ -8,6 +8,7 @@ fun darkGloomColorScheme() = GloomColorScheme(
     statusRed = PinkRed,
     statusGrey = Grey,
     statusYellow = Yellow,
+    star = Yellow,
     warning = YellowAlt1,
     onWarning = DarkBrown,
     warningContainer = DarkBronze,
@@ -20,6 +21,7 @@ fun lightGloomColorScheme() = GloomColorScheme(
     statusRed = Red,
     statusGrey = LightGrey,
     statusYellow = Gold,
+    star = Gold,
     warning = BronzeYellow,
     onWarning = Color.White,
     warningContainer = Shandy,