From db1132f422b9d368f0e7eea158acd95603da598b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Tue, 7 May 2024 14:02:27 +0200
Subject: [PATCH] Change messageStarColor to iconStarColor and move it to
 legacy design system

---
 app/ui/legacy/src/main/res/drawable/ic_star.xml            | 2 +-
 app/ui/legacy/src/main/res/drawable/ic_star_no_padding.xml | 2 +-
 app/ui/legacy/src/main/res/values/attrs.xml                | 1 -
 app/ui/legacy/src/main/res/values/themes.xml               | 6 ++++--
 core/ui/legacy/designsystem/src/main/res/values/attrs.xml  | 6 ++++++
 5 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 core/ui/legacy/designsystem/src/main/res/values/attrs.xml

diff --git a/app/ui/legacy/src/main/res/drawable/ic_star.xml b/app/ui/legacy/src/main/res/drawable/ic_star.xml
index 9b3f2e1ae..e02915df4 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_star.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_star.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/messageStarColor"
+    android:tint="?attr/iconStarColor"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/ui/legacy/src/main/res/drawable/ic_star_no_padding.xml b/app/ui/legacy/src/main/res/drawable/ic_star_no_padding.xml
index 1d9481f51..f19c31f7b 100644
--- a/app/ui/legacy/src/main/res/drawable/ic_star_no_padding.xml
+++ b/app/ui/legacy/src/main/res/drawable/ic_star_no_padding.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="20dp"
     android:height="19dp"
-    android:tint="?attr/messageStarColor"
+    android:tint="?attr/iconStarColor"
     android:viewportWidth="20"
     android:viewportHeight="19">
     <path
diff --git a/app/ui/legacy/src/main/res/values/attrs.xml b/app/ui/legacy/src/main/res/values/attrs.xml
index ce664228c..da8115609 100644
--- a/app/ui/legacy/src/main/res/values/attrs.xml
+++ b/app/ui/legacy/src/main/res/values/attrs.xml
@@ -30,7 +30,6 @@
         <attr name="messageListSwipeDeleteBackgroundColor" format="reference|color"/>
         <attr name="messageListSwipeSpamBackgroundColor" format="reference|color"/>
         <attr name="messageListSwipeMoveBackgroundColor" format="reference|color"/>
-        <attr name="messageStarColor" format="color"/>
         <attr name="messageDetailsDividerColor" format="reference|color"/>
         <attr name="composerBackgroundColor" format="color"/>
         <attr name="contactPictureFallbackDefaultBackgroundColor" format="reference|color"/>
diff --git a/app/ui/legacy/src/main/res/values/themes.xml b/app/ui/legacy/src/main/res/values/themes.xml
index 2b216d577..a74892b5c 100644
--- a/app/ui/legacy/src/main/res/values/themes.xml
+++ b/app/ui/legacy/src/main/res/values/themes.xml
@@ -66,6 +66,8 @@
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 
+        <item name="iconStarColor">#fbbc04</item>
+
         // TODO: Remove iconSettingsImportStatus as soon icons are migrated to icon module
         <item name="iconSettingsImportStatus">@drawable/ic_import_status</item>
 
@@ -99,7 +101,6 @@
         <item name="messageListSwipeSpamBackgroundColor">@color/material_red_700</item>
         <item name="messageListSwipeMoveBackgroundColor">@color/material_purple_500</item>
 
-        <item name="messageStarColor">#fbbc04</item>
         <item name="messageDetailsDividerColor">#ffcccccc</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>
         <item name="contactPictureFallbackBackgroundColors">@array/contact_picture_fallback_background_colors_light</item>
@@ -188,6 +189,8 @@
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 
+        <item name="iconStarColor">#fdd663</item>
+
         // TODO: Remove iconSettingsImportStatus as soon icons are migrated to icon module
         <item name="iconSettingsImportStatus">@drawable/ic_import_status</item>
 
@@ -220,7 +223,6 @@
         <item name="messageListSwipeSpamBackgroundColor">@color/material_red_800</item>
         <item name="messageListSwipeMoveBackgroundColor">@color/material_purple_600</item>
 
-        <item name="messageStarColor">#fdd663</item>
         <item name="messageDetailsDividerColor">#ff555555</item>
         <item name="contactTokenBackgroundColor">#313131</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ff606060</item>
diff --git a/core/ui/legacy/designsystem/src/main/res/values/attrs.xml b/core/ui/legacy/designsystem/src/main/res/values/attrs.xml
new file mode 100644
index 000000000..e5a381ed9
--- /dev/null
+++ b/core/ui/legacy/designsystem/src/main/res/values/attrs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="IconStyles">
+        <attr name="iconStarColor" format="color"/>
+    </declare-styleable>
+</resources>