Merge pull request #1727 from DimensionDev/feature/repost_color

update android repost color

Author: Tlaster

compose-ui/src/androidMain/kotlin/dev/dimension/flare/ui/theme/PlatformColorScheme.android.kt

@@ -8,6 +8,9 @@ internal actual object PlatformColorScheme {
     actual val primary: Color
         @Composable
         get() = MaterialTheme.colorScheme.primary
+    actual val retweetColor: Color
+        @Composable
+        get() = Color(0xff00ba7c)
     actual val primaryContainer: Color
         @Composable
         get() = MaterialTheme.colorScheme.primaryContainer

compose-ui/src/commonMain/composeResources/values/strings.xml

@@ -114,8 +114,8 @@
     <string name="reaction_remove">Remove reaction</string>
     <string name="reply">Reply</string>
     <string name="report">Report</string>
-    <string name="retweet">Retweet</string>
-    <string name="retweet_remove">Remove retweet</string>
+    <string name="retweet">Repost</string>
+    <string name="retweet_remove">Remove repost</string>
     <string name="share">Share</string>
     <string name="fx_share">Share via FxEmbed</string>
     <string name="comment">Comment</string>

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt

@@ -933,7 +933,7 @@ private fun ActionMenu.Item.Color.toComposeColor(): Color =
     when (this) {
         ActionMenu.Item.Color.Red -> PlatformTheme.colorScheme.error
         ActionMenu.Item.Color.ContentColor -> PlatformContentColor.current
-        ActionMenu.Item.Color.PrimaryColor -> PlatformTheme.colorScheme.primary
+        ActionMenu.Item.Color.PrimaryColor -> PlatformTheme.colorScheme.retweetColor
     }
 
 private fun ActionMenu.Item.Icon.toImageVector(): ImageVector =

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/theme/PlatformColorScheme.kt

@@ -7,6 +7,9 @@ internal expect object PlatformColorScheme {
     @get:Composable
     val primary: Color
 
+    @get:Composable
+    val retweetColor: Color
+
     @get:Composable
     val primaryContainer: Color
 

compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/theme/PlatformColorScheme.ios.kt

@@ -10,6 +10,10 @@ internal actual object PlatformColorScheme {
     actual val primary: Color
         @Composable
         get() = CupertinoTheme.colorScheme.accent
+
+    actual val retweetColor: Color
+        @Composable
+        get() = CupertinoTheme.colorScheme.accent
     actual val primaryContainer: Color
         @Composable
         get() = CupertinoTheme.colorScheme.accent

compose-ui/src/jvmMain/kotlin/dev/dimension/flare/ui/theme/PlatformColorScheme.jvm.kt

@@ -8,6 +8,10 @@ internal actual object PlatformColorScheme {
     actual val primary: Color
         @Composable
         get() = FluentTheme.colors.fillAccent.default
+
+    actual val retweetColor: Color
+        @Composable
+        get() = FluentTheme.colors.fillAccent.default
     actual val primaryContainer: Color
         @Composable
         get() = FluentTheme.colors.fillAccent.secondary

desktopApp/src/main/composeResources/values/strings.xml

@@ -71,8 +71,8 @@
     <string name="reaction_remove">Remove reaction</string>
     <string name="reply">Reply</string>
     <string name="report">Report</string>
-    <string name="retweet">Retweet</string>
-    <string name="retweet_remove">Remove retweet</string>
+    <string name="retweet">Repost</string>
+    <string name="retweet_remove">Remove repost</string>
     <string name="status_loadmore_error_retry">Retry</string>
     <string name="status_detail_comment">Comment</string>
     <string name="status_detail_repost">Repost</string>