From 312734f1c1dad09bffd00df60fb5fa269c199c4e Mon Sep 17 00:00:00 2001
From: Mike Barnes <mike@bremensaki.com>
Date: Sat, 3 Jan 2026 13:19:25 +1100
Subject: [PATCH] Updated theme colours, more consistency with regular UI

---
 app/build.gradle                                          | 4 ++--
 .../notifications/StatusNotificationViewHolder.kt         | 6 +++---
 app/src/main/res/values/colors.xml                        | 1 +
 app/src/main/res/values/theme_colors.xml                  | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 64df04b21..48b927768 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         namespace "com.keylesspalace.tusky"
         minSdk 24
         targetSdk 35
-        versionCode 94
-        versionName "28.0-CW0"
+        versionCode 95
+        versionName "28.0-CW1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt b/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
index 862d824f5..804b25659 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
@@ -235,11 +235,11 @@ internal class StatusNotificationViewHolder(
         val icon: Drawable?
         when (type) {
             Notification.Type.Favourite -> {
-                icon = getIconWithColor(context, R.drawable.ic_star_24dp, R.color.tusky_orange_light)
+                icon = getIconWithColor(context, R.drawable.ic_star_24dp, R.color.chinwag_gold)
                 format = context.getString(R.string.notification_favourite_format)
             }
             Notification.Type.Reblog -> {
-                icon = getIconWithColor(context, R.drawable.ic_repeat_24dp, R.color.tusky_orange)
+                icon = getIconWithColor(context, R.drawable.ic_repeat_24dp, R.color.chinwag_green)
                 format = context.getString(R.string.notification_reblog_format)
             }
             Notification.Type.Status -> {
@@ -251,7 +251,7 @@ internal class StatusNotificationViewHolder(
                 format = context.getString(R.string.notification_update_format)
             }
             else -> {
-                icon = getIconWithColor(context, R.drawable.ic_star_24dp, R.color.tusky_orange_light)
+                icon = getIconWithColor(context, R.drawable.ic_star_24dp, R.color.chinwag_gold)
                 format = context.getString(R.string.notification_favourite_format)
             }
         }
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d2e3d4cef..9f6ae9554 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -53,6 +53,7 @@
     <color name="chinwag_green">#388e3c</color>
     <color name="chinwag_green_light">#508f53</color>
     <color name="transparent_chinwag_green">#8c388e3c</color>
+    <color name="chinwag_gold">#e4e270</color>
 
     <color name="chinwag_grey_dark">#cecec1</color>
     <color name="chinwag_grey_medium">#f0f0ec</color>
diff --git a/app/src/main/res/values/theme_colors.xml b/app/src/main/res/values/theme_colors.xml
index 4fd6ddfc6..d824b72f7 100644
--- a/app/src/main/res/values/theme_colors.xml
+++ b/app/src/main/res/values/theme_colors.xml
@@ -2,7 +2,7 @@
 <resources>
     <color name="colorPrimary">@color/chinwag_green</color>
     <color name="colorSecondary">@color/chinwag_green</color>
-    <color name="colorSurface">@color/chinwag_grey_light</color>
+    <color name="colorSurface">@color/chinwag_grey_medium</color>
     <color name="colorPrimaryDark">@color/chinwag_green_light</color>
 
     <color name="colorOnPrimary">@color/white</color>
@@ -19,10 +19,10 @@
 
     <color name="iconColor">@color/tusky_grey_50</color>
 
-    <color name="colorBackgroundAccent">@color/tusky_grey_70</color>
-    <color name="colorBackgroundHighlight">@color/tusky_grey_50</color>
+    <color name="colorBackgroundAccent">@color/transparent_chinwag_green</color>
+    <color name="colorBackgroundHighlight">@color/chinwag_green_light</color>
     <color name="dividerColor">@color/chinwag_grey_dark</color>
-    <color name="dividerColorOther">@color/tusky_grey_90</color>
+    <color name="dividerColorOther">@color/chinwag_gold</color>
 
     <color name="favoriteButtonActiveColor">@color/tusky_orange_light</color>