From b0948cf0a79e4d5aa7688603f3ccd0086a351a22 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Thu, 29 Apr 2021 00:08:29 -0400
Subject: [PATCH] Adjustments to download button colors

---
 .../tachiyomi/ui/download/DownloadButton.kt      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt
index 6d6f94f280..0ed2894bc0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt
@@ -21,11 +21,8 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut
 
     private val activeColor = ColorUtils.blendARGB(
         context.getResourceColor(R.attr.colorAccent),
-        ContextCompat.getColor(
-            context,
-            R.color.download
-        ),
-        0.3f
+        context.getResourceColor(android.R.attr.textColorPrimaryInverse),
+        0.05f
     )
     private val progressBGColor = ContextCompat.getColor(
         context,
@@ -35,8 +32,12 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut
         context,
         R.color.material_on_surface_disabled
     )
-    private val downloadedColor = context.getResourceColor(R.attr.colorAccent)
-    private val downloadedTextColor = context.getResourceColor(R.attr.colorOnAccent)
+    private val downloadedColor = ColorUtils.blendARGB(
+        context.getResourceColor(R.attr.colorAccent),
+        context.getResourceColor(android.R.attr.textColorPrimary),
+        0.3f
+    )
+    private val downloadedTextColor = context.getResourceColor(android.R.attr.textColorPrimaryInverse)
     private val errorColor = ContextCompat.getColor(
         context,
         R.color.material_red_500
@@ -154,6 +155,7 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut
                     binding.downloadBorder.drawable.setTint(downloadedColor)
                 } else {
                     binding.downloadBorder.setImageDrawable(filledCircle)
+                    binding.downloadBorder.drawable.setTint(downloadedColor)
                     binding.downloadIcon.drawable.setTint(downloadedTextColor)
                 }
             }