From 074f41ca7effaaec017a5d17d3917cc67c72e24d Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Sat, 10 Apr 2021 17:44:42 -0400
Subject: [PATCH] Fixes to unread badge color

---
 .../kanade/tachiyomi/ui/library/LibraryBadge.kt  | 16 ++++++++--------
 app/src/main/res/color/unread_badge.xml          |  4 ----
 .../main/res/drawable/favorite_badge_rounded.xml |  2 +-
 .../main/res/drawable/unread_angled_badge.xml    |  4 ++--
 ...source_global_search_controller_card_item.xml |  2 +-
 .../main/res/layout/unread_download_badge.xml    |  2 +-
 6 files changed, 13 insertions(+), 17 deletions(-)
 delete mode 100644 app/src/main/res/color/unread_badge.xml

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt
index a4e85f304e..62bd52eae1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt
@@ -7,9 +7,9 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.UnreadDownloadBadgeBinding
 import eu.kanade.tachiyomi.util.system.contextCompatColor
 import eu.kanade.tachiyomi.util.system.dpToPx
+import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.view.gone
 import eu.kanade.tachiyomi.util.view.isVisible
-import eu.kanade.tachiyomi.util.view.setTextColorRes
 import eu.kanade.tachiyomi.util.view.updatePaddingRelative
 import eu.kanade.tachiyomi.util.view.visibleIf
 
@@ -26,9 +26,9 @@ class LibraryBadge @JvmOverloads constructor(context: Context, attrs: AttributeS
     fun setUnreadDownload(unread: Int, downloads: Int, showTotalChapters: Boolean) {
         // Update the unread count and its visibility.
 
-        val unreadBadgeBackground = context.contextCompatColor(
-            if (showTotalChapters) R.color.total_badge else R.color.unread_badge
-        )
+        val unreadBadgeBackground = if (showTotalChapters) {
+            context.contextCompatColor(R.color.total_badge)
+        } else context.getResourceColor(R.attr.colorAccent)
 
         with(binding.unreadText) {
             visibleIf(unread > 0 || unread == -1 || showTotalChapters)
@@ -36,12 +36,12 @@ class LibraryBadge @JvmOverloads constructor(context: Context, attrs: AttributeS
                 return@with
             }
             text = if (unread == -1) "0" else unread.toString()
-            setTextColorRes(
+            setTextColor(
                 // hide the badge text when preference is only show badge
                 when {
-                    unread == -1 && !showTotalChapters -> R.color.unread_badge
-                    showTotalChapters -> R.color.total_badge_text
-                    else -> R.color.unread_badge_text
+                    unread == -1 && !showTotalChapters -> context.getResourceColor(R.attr.colorAccent)
+                    showTotalChapters -> context.contextCompatColor(R.color.total_badge_text)
+                    else -> context.contextCompatColor(R.color.unread_badge_text)
                 }
             )
             setBackgroundColor(unreadBadgeBackground)
diff --git a/app/src/main/res/color/unread_badge.xml b/app/src/main/res/color/unread_badge.xml
deleted file mode 100644
index aca8280bd1..0000000000
--- a/app/src/main/res/color/unread_badge.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?colorAccent"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/favorite_badge_rounded.xml b/app/src/main/res/drawable/favorite_badge_rounded.xml
index 2dab341954..ae6f8244db 100644
--- a/app/src/main/res/drawable/favorite_badge_rounded.xml
+++ b/app/src/main/res/drawable/favorite_badge_rounded.xml
@@ -3,5 +3,5 @@
     android:shape="rectangle">
     <corners
         android:bottomRightRadius="10dp" />
-    <solid android:color="@color/unread_badge" />
+    <solid android:color="?colorAccent" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/unread_angled_badge.xml b/app/src/main/res/drawable/unread_angled_badge.xml
index b505c96dd7..26639032e1 100644
--- a/app/src/main/res/drawable/unread_angled_badge.xml
+++ b/app/src/main/res/drawable/unread_angled_badge.xml
@@ -8,8 +8,8 @@
     tools:background="@color/material_red_500">
 
     <path
-        android:fillColor="@color/unread_badge"
+        android:fillColor="?colorAccent"
         android:pathData="M0 20 L100 0 L100 20 Z"
-        android:strokeColor="@color/unread_badge" />
+        android:strokeColor="?colorAccent" />
 
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/source_global_search_controller_card_item.xml b/app/src/main/res/layout/source_global_search_controller_card_item.xml
index eca8d6e553..64bedf620a 100644
--- a/app/src/main/res/layout/source_global_search_controller_card_item.xml
+++ b/app/src/main/res/layout/source_global_search_controller_card_item.xml
@@ -49,7 +49,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:cardCornerRadius="10dp"
-        app:cardBackgroundColor="@color/unread_badge"
+        app:cardBackgroundColor="?colorAccent"
         app:cardElevation="2dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent">
diff --git a/app/src/main/res/layout/unread_download_badge.xml b/app/src/main/res/layout/unread_download_badge.xml
index 1821957584..9b3d5e322b 100644
--- a/app/src/main/res/layout/unread_download_badge.xml
+++ b/app/src/main/res/layout/unread_download_badge.xml
@@ -52,7 +52,7 @@
             style="@style/TextAppearance.Regular.Caption.Light"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/unread_badge"
+            android:background="?colorAccent"
             android:gravity="center"
             android:maxLines="1"
             android:paddingStart="5dp"