From f2faa7e8b7f27c7f7f182117fc8b83d02e0e8122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Fri, 12 May 2023 22:45:24 +0200
Subject: [PATCH] Fix button color in high priority admin message (#2202)

---
 .../ui/modules/dashboard/adapters/DashboardAdapter.kt       | 5 +++--
 app/src/main/res/values-night-v31/styles.xml                | 4 +++-
 app/src/main/res/values-night/styles.xml                    | 4 +++-
 app/src/main/res/values-v31/styles.xml                      | 4 +++-
 app/src/main/res/values/attrs.xml                           | 2 ++
 app/src/main/res/values/colors.xml                          | 6 ++++--
 app/src/main/res/values/styles.xml                          | 4 +++-
 7 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
index 2c06e45fd..4ad4e9d67 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
@@ -738,8 +738,8 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
         val context = adminMessageViewHolder.binding.root.context
         val (backgroundColor, textColor) = when (item.priority) {
             "HIGH" -> {
-                context.getThemeAttrColor(R.attr.colorPrimary) to
-                    context.getThemeAttrColor(R.attr.colorOnPrimary)
+                context.getThemeAttrColor(R.attr.colorMessageHigh) to
+                    context.getThemeAttrColor(R.attr.colorOnMessageHigh)
             }
             "MEDIUM" -> {
                 context.getThemeAttrColor(R.attr.colorMessageMedium) to Color.BLACK
@@ -754,6 +754,7 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             dashboardAdminMessageItemDescription.setTextColor(textColor)
             dashboardAdminMessageItemIcon.setColorFilter(textColor)
             dashboardAdminMessageItemDismiss.isVisible = item.isDismissible
+            dashboardAdminMessageItemDismiss.setTextColor(textColor)
             dashboardAdminMessageItemDismiss.setOnClickListener {
                 onAdminMessageDismissClickListener(item)
             }
diff --git a/app/src/main/res/values-night-v31/styles.xml b/app/src/main/res/values-night-v31/styles.xml
index 067a43533..6e6c4d79c 100644
--- a/app/src/main/res/values-night-v31/styles.xml
+++ b/app/src/main/res/values-night-v31/styles.xml
@@ -35,7 +35,9 @@
         <item name="colorError">@color/colorErrorLight</item>
         <item name="colorDivider">@color/colorDividerInverse</item>
         <item name="colorSwipeRefresh">@color/material_dynamic_secondary20</item>
-        <item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
+        <item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
+        <item name="colorMessageHigh">@color/dashboard_message_high_dark</item>
+        <item name="colorOnMessageHigh">@android:color/black</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">@color/material_dynamic_neutral90</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 7d2f0cfed..5d9aa22a6 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -24,7 +24,9 @@
         <item name="colorError">@color/colorErrorLight</item>
         <item name="colorDivider">@color/colorDividerInverse</item>
         <item name="colorSwipeRefresh">@color/colorSwipeRefreshDark</item>
-        <item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
+        <item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
+        <item name="colorMessageHigh">@color/dashboard_message_high_dark</item>
+        <item name="colorOnMessageHigh">@android:color/black</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:navigationBarColor">@color/colorNavigationBarDark</item>
diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml
index cffb284ec..bb47b22ed 100644
--- a/app/src/main/res/values-v31/styles.xml
+++ b/app/src/main/res/values-v31/styles.xml
@@ -37,7 +37,9 @@
         <item name="colorError">@color/colorError</item>
         <item name="colorDivider">@color/colorDivider</item>
         <item name="colorSwipeRefresh">@color/material_dynamic_secondary90</item>
-        <item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
+        <item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
+        <item name="colorMessageHigh">@color/dashboard_message_high_light</item>
+        <item name="colorOnMessageHigh">@android:color/white</item>
         <item name="android:textColor">@color/material_dynamic_neutral10</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 8986f3576..aa58fa09e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,4 +5,6 @@
     <attr name="colorTimetableCanceled" format="color" />
     <attr name="colorTimetableChange" format="color" />
     <attr name="colorMessageMedium" format="color" />
+    <attr name="colorMessageHigh" format="color" />
+    <attr name="colorOnMessageHigh" format="color" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ac1b1c196..87057c61d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -39,8 +39,10 @@
     <color name="colorStatusBarDark">#342826</color>
     <color name="colorStatusBarBlack">#181010</color>
 
-    <color name="dashboard_message_medium_light">#FFD980</color>
-    <color name="dashboard_message_medium_dark">#ffd54f</color>
+    <color name="dashboard_message_medium_light">#ffd54f</color>
+    <color name="dashboard_message_medium_dark">#FFD980</color>
+    <color name="dashboard_message_high_light">#B91B21</color>
+    <color name="dashboard_message_high_dark">#e57373</color>
 
     <color name="timetable_canceled_light">#d32f2f</color>
     <color name="timetable_canceled_dark">#e57373</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9d1f07458..603e22abc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,7 +22,9 @@
         <item name="colorError">@color/colorError</item>
         <item name="colorDivider">@color/colorDivider</item>
         <item name="colorSwipeRefresh">@color/colorSwipeRefresh</item>
-        <item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
+        <item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
+        <item name="colorMessageHigh">@color/dashboard_message_high_light</item>
+        <item name="colorOnMessageHigh">@android:color/white</item>
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:statusBarColor">@android:color/black</item>
         <item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>