From b9bf495ed6953518a7c0506abcc0fee902ac3253 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Fri, 9 Apr 2021 15:49:08 -0400
Subject: [PATCH] Using colorAccent attr instead of color in some places

---
 .../java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt  | 4 ++--
 .../eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt     | 9 ++++-----
 .../kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt   | 7 ++-----
 .../java/eu/kanade/tachiyomi/ui/main/MainActivity.kt     | 2 +-
 .../tachiyomi/ui/setting/search/SettingsSearchHolder.kt  | 4 ++--
 app/src/main/res/color/tabs_selector_alt.xml             | 4 ++--
 app/src/main/res/drawable/button_text_state.xml          | 4 ++--
 app/src/main/res/drawable/oval_ripple.xml                | 6 +++---
 app/src/main/res/layout/manga_category_dialog.xml        | 4 ++--
 app/src/main/res/layout/manga_header_item.xml            | 4 ++--
 app/src/main/res/layout/menu_sheet_item.xml              | 3 ++-
 app/src/main/res/layout/pref_account_login.xml           | 4 ++--
 app/src/main/res/layout/rounded_category_hopper.xml      | 2 +-
 app/src/main/res/layout/set_categories_sheet.xml         | 4 ++--
 app/src/main/res/layout/track_search_dialog.xml          | 4 ++--
 app/src/main/res/layout/webview_activity.xml             | 2 +-
 app/src/main/res/values/attrs.xml                        | 3 ++-
 app/src/main/res/values/themes.xml                       | 5 +++--
 18 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt
index f6a16fbe5f..868c1fb752 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt
@@ -4,7 +4,6 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
 import androidx.work.Constraints
 import androidx.work.CoroutineWorker
 import androidx.work.ExistingPeriodicWorkPolicy
@@ -14,6 +13,7 @@ import androidx.work.WorkManager
 import androidx.work.WorkerParameters
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.notification.Notifications
+import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.system.notificationManager
 import kotlinx.coroutines.coroutineScope
 import java.util.concurrent.TimeUnit
@@ -38,7 +38,7 @@ class UpdaterJob(private val context: Context, workerParams: WorkerParameters) :
                 setContentTitle(context.getString(R.string.app_name))
                 setContentText(context.getString(R.string.update_available))
                 setSmallIcon(android.R.drawable.stat_sys_download_done)
-                color = ContextCompat.getColor(context, R.color.colorAccent)
+                color = context.getResourceColor(R.attr.colorAccent)
                 // Download action
                 addAction(
                     android.R.drawable.stat_sys_download_done,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt
index 46b24eb6a3..109ac4cbd5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt
@@ -26,7 +26,6 @@ import eu.kanade.tachiyomi.util.view.invisible
 import eu.kanade.tachiyomi.util.view.isVisible
 import eu.kanade.tachiyomi.util.view.setBottomEdge
 import eu.kanade.tachiyomi.util.view.setEdgeToEdge
-import eu.kanade.tachiyomi.util.view.setTextColorRes
 import eu.kanade.tachiyomi.util.view.updateLayoutParams
 import eu.kanade.tachiyomi.util.view.visible
 import eu.kanade.tachiyomi.util.view.visibleIf
@@ -88,9 +87,9 @@ open class MaterialMenuSheet(
                 }
                 if (item.id == selectedId) {
                     currentIndex = index
-                    setTextColorRes(R.color.colorAccent)
+                    setTextColor(context.getResourceColor(R.attr.colorAccent))
                     compoundDrawableTintList =
-                        ColorStateList.valueOf(context.getColor(R.color.colorAccent))
+                        ColorStateList.valueOf(context.getResourceColor(R.attr.colorAccent))
                 }
                 updateLayoutParams<ViewGroup.MarginLayoutParams> {
                     height = 48.dpToPx
@@ -156,9 +155,9 @@ open class MaterialMenuSheet(
         val layout = binding.menuLayout.findViewById<ViewGroup>(id) ?: return
         val textView = layout.getChildAt(0) as? TextView
         val imageView = layout.getChildAt(1) as? ImageView
-        textView?.setTextColorRes(R.color.colorAccent)
+        textView?.setTextColor(context.getResourceColor(R.attr.colorAccent))
         textView?.compoundDrawableTintList =
-            ColorStateList.valueOf(context.getColor(R.color.colorAccent))
+            ColorStateList.valueOf(context.getResourceColor(R.attr.colorAccent))
         imageView?.visible()
         imageView?.setImageResource(drawableRes)
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt
index a42b4becb2..711aa6fdba 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt
@@ -263,11 +263,8 @@ class LibraryHeaderHolder(val view: View, private val adapter: LibraryCategoryAd
         )
         val tintedDrawable = drawable?.mutate()
         tintedDrawable?.setTint(
-            ContextCompat.getColor(
-                contentView.context,
-                if (allSelected) R.color.colorAccent
-                else R.color.gray_button
-            )
+            if (allSelected) contentView.context.getResourceColor(R.attr.colorAccent)
+            else ContextCompat.getColor(contentView.context, R.color.gray_button)
         )
         binding.checkbox.setImageDrawable(tintedDrawable)
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index dd1b6d385b..82531cd8be 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -401,7 +401,7 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
                     recentsItem,
                     getString(R.string.manage_whats_downloading),
                     getString(R.string.visit_recents_for_download_queue)
-                ).outerCircleColor(R.color.colorAccent).outerCircleAlpha(0.95f).titleTextSize(20)
+                ).outerCircleColor(getResourceColor(R.attr.colorAccent)).outerCircleAlpha(0.95f).titleTextSize(20)
                     .titleTextColor(android.R.color.white).descriptionTextSize(16)
                     .descriptionTextColor(R.color.md_white_1000_76)
                     .icon(contextCompatDrawable(R.drawable.ic_recent_read_32dp))
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHolder.kt
index 5d64608a7a..b5449ecd04 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHolder.kt
@@ -1,12 +1,12 @@
 package eu.kanade.tachiyomi.ui.setting.search
 
 import android.view.View
-import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.SettingsSearchControllerCardBinding
 import eu.kanade.tachiyomi.util.lang.highlightText
+import eu.kanade.tachiyomi.util.system.getResourceColor
 import kotlin.reflect.full.createInstance
 
 /**
@@ -37,7 +37,7 @@ class SettingsSearchHolder(view: View, val adapter: SettingsSearchAdapter) :
      * @param item item of card.
      */
     fun bind(item: SettingsSearchItem) {
-        val color = ColorUtils.setAlphaComponent(ContextCompat.getColor(itemView.context, R.color.colorAccent), 75)
+        val color = ColorUtils.setAlphaComponent(itemView.context.getResourceColor(R.attr.colorAccent), 75)
         binding.searchResultPrefTitle.text = item.settingsSearchResult.title.highlightText(item.searchResult, color)
         binding.searchResultPrefSummary.text = item.settingsSearchResult.summary.highlightText(item.searchResult, color)
         binding.searchResultPrefBreadcrumb.text = item.settingsSearchResult.breadcrumb.highlightText(item.searchResult, color)
diff --git a/app/src/main/res/color/tabs_selector_alt.xml b/app/src/main/res/color/tabs_selector_alt.xml
index 2c58c7ee23..0346c464e3 100644
--- a/app/src/main/res/color/tabs_selector_alt.xml
+++ b/app/src/main/res/color/tabs_selector_alt.xml
@@ -5,7 +5,7 @@
   Ensures visibility on top of the background color.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorAccentText" android:state_selected="true"/>
-    <item android:color="@color/colorAccent" android:state_pressed="true"/>
+    <item android:color="?colorAccentText" android:state_selected="true"/>
+    <item android:color="?colorAccent" android:state_pressed="true"/>
     <item android:alpha="0.60" android:color="?attr/actionBarTintColor"/>
 </selector>
diff --git a/app/src/main/res/drawable/button_text_state.xml b/app/src/main/res/drawable/button_text_state.xml
index 481da7dfde..d476414a3a 100644
--- a/app/src/main/res/drawable/button_text_state.xml
+++ b/app/src/main/res/drawable/button_text_state.xml
@@ -15,8 +15,8 @@
             <padding android:left="8dp" android:right="8dp" />
         </shape>
     </item>
-    <item android:color="@color/colorAccent">
-        <shape android:shape="rectangle" android:color="@color/colorAccent">
+    <item android:color="?colorAccent">
+        <shape android:shape="rectangle" android:color="?colorAccent">
             <corners android:radius="2dp" />
             <solid android:color="@android:color/transparent" />
             <stroke android:color="?attr/colorAccent" android:width="1dp"/>
diff --git a/app/src/main/res/drawable/oval_ripple.xml b/app/src/main/res/drawable/oval_ripple.xml
index 4f48db0d13..83003bbb21 100644
--- a/app/src/main/res/drawable/oval_ripple.xml
+++ b/app/src/main/res/drawable/oval_ripple.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/colorAccent">
+    android:color="?colorAccent">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/colorAccent" />
+            <solid android:color="?colorAccent" />
             <corners android:radius="30dp" />
         </shape>
     </item>
@@ -24,7 +24,7 @@
                     <size
                         android:width="32dp"
                         android:height="32dp" />
-                    <solid android:color="@color/colorAccent" />
+                    <solid android:color="?colorAccent" />
                 </shape>
             </item>
         </selector>
diff --git a/app/src/main/res/layout/manga_category_dialog.xml b/app/src/main/res/layout/manga_category_dialog.xml
index d71b03bbdc..47d6947a30 100644
--- a/app/src/main/res/layout/manga_category_dialog.xml
+++ b/app/src/main/res/layout/manga_category_dialog.xml
@@ -13,10 +13,10 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:hint="@string/title"
-        app:boxStrokeColor="@color/colorAccent"
+        app:boxStrokeColor="?colorAccent"
         app:endIconMode="clear_text"
         app:hintEnabled="false"
-        app:hintTextColor="@color/colorAccent">
+        app:hintTextColor="?colorAccent">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/title"
diff --git a/app/src/main/res/layout/manga_header_item.xml b/app/src/main/res/layout/manga_header_item.xml
index f20320b905..38d59d884e 100644
--- a/app/src/main/res/layout/manga_header_item.xml
+++ b/app/src/main/res/layout/manga_header_item.xml
@@ -305,9 +305,9 @@
         android:layout_marginEnd="16dp"
         android:visibility="gone"
         app:atg_backgroundColor="@android:color/transparent"
-        app:atg_borderColor="@color/colorAccent"
+        app:atg_borderColor="?colorAccent"
         app:atg_borderStrokeWidth="1dp"
-        app:atg_textColor="@color/colorAccent"
+        app:atg_textColor="?colorAccent"
         app:layout_constrainedHeight="true"
         app:layout_constraintBottom_toTopOf="@id/less_button"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/menu_sheet_item.xml b/app/src/main/res/layout/menu_sheet_item.xml
index 1ab62a9a73..89afa15e7d 100644
--- a/app/src/main/res/layout/menu_sheet_item.xml
+++ b/app/src/main/res/layout/menu_sheet_item.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="42dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
@@ -28,7 +29,7 @@
         android:layout_height="42dp"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:tint="@color/colorAccent"
+        app:tint="?colorAccent"
         android:visibility="invisible"
         tools:visibility="visible"
         android:src="@drawable/ic_arrow_upward_24dp" />
diff --git a/app/src/main/res/layout/pref_account_login.xml b/app/src/main/res/layout/pref_account_login.xml
index 9157f75fa7..ef77400bae 100644
--- a/app/src/main/res/layout/pref_account_login.xml
+++ b/app/src/main/res/layout/pref_account_login.xml
@@ -38,9 +38,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
         android:hint="@string/password"
-        app:boxStrokeColor="@color/colorAccent"
+        app:boxStrokeColor="?colorAccent"
         app:endIconMode="password_toggle"
-        app:hintTextColor="@color/colorAccent">
+        app:hintTextColor="?colorAccent">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/password"
diff --git a/app/src/main/res/layout/rounded_category_hopper.xml b/app/src/main/res/layout/rounded_category_hopper.xml
index ad9c6cd0a0..5369d5aec0 100644
--- a/app/src/main/res/layout/rounded_category_hopper.xml
+++ b/app/src/main/res/layout/rounded_category_hopper.xml
@@ -14,7 +14,7 @@
         android:id="@+id/category_hopper_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/colorAccent"
+        android:background="?colorAccent"
         android:clickable="true"
         android:focusable="true">
 
diff --git a/app/src/main/res/layout/set_categories_sheet.xml b/app/src/main/res/layout/set_categories_sheet.xml
index 4e18ba52e1..30c551f75b 100644
--- a/app/src/main/res/layout/set_categories_sheet.xml
+++ b/app/src/main/res/layout/set_categories_sheet.xml
@@ -58,7 +58,7 @@
             android:layout_height="0dp"
             android:layout_marginEnd="16dp"
             app:icon="@drawable/ic_plus_24dp"
-            app:iconTint="@color/colorAccent"
+            app:iconTint="?colorAccent"
             style="@style/Theme.Widget.Button.TextButton"
             android:text="@string/new_category"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -112,7 +112,7 @@
             android:layout_marginStart="48dp"
             android:layout_marginEnd="8dp"
             android:text="@string/new_category"
-            app:iconTint="@color/colorAccent"
+            app:iconTint="?colorAccent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/cancel_button"
diff --git a/app/src/main/res/layout/track_search_dialog.xml b/app/src/main/res/layout/track_search_dialog.xml
index f7a4e433a0..edfa03b631 100644
--- a/app/src/main/res/layout/track_search_dialog.xml
+++ b/app/src/main/res/layout/track_search_dialog.xml
@@ -13,10 +13,10 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:hint="@string/title"
-        app:boxStrokeColor="@color/colorAccent"
+        app:boxStrokeColor="?colorAccent"
         app:endIconMode="clear_text"
         app:hintEnabled="false"
-        app:hintTextColor="@color/colorAccent">
+        app:hintTextColor="?colorAccent">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/track_search"
diff --git a/app/src/main/res/layout/webview_activity.xml b/app/src/main/res/layout/webview_activity.xml
index 8ebe85f764..eea7643bf6 100644
--- a/app/src/main/res/layout/webview_activity.xml
+++ b/app/src/main/res/layout/webview_activity.xml
@@ -48,7 +48,7 @@
                 style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="match_parent"
                 android:layout_height="2dp"
-                android:progressTint="@color/colorAccent"
+                android:progressTint="?colorAccent"
                 android:progressBackgroundTint="@color/colorPrimary"
                 />
         </WebView>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 41c31a5a73..a26aafca53 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -13,9 +13,10 @@
 
     <attr name="actionBarTintColor" format="color"/>
     <attr name="readerBackground" format="color"/>
+    <attr name="colorAccentText" format="color"/>
     <attr name="tabBarIconColor" format="reference|integer"/>
     <attr name="tabBarIconInactive" format="reference|integer"/>
-    <attr name="tabHighlightBackground" format="reference|integer"/>
+    <attr name="tabHighlightBackground" format="color"/>
 
     <declare-styleable name="ReaderSpinnerView">
         <attr name="title" format="reference|string"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 87825feec3..0b5a48f87d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,8 +14,9 @@
         <item name="colorPrimaryVariant">@color/colorPrimary</item>
         <item name="colorSecondary">@color/background</item>
         <item name="colorPrimaryDark">@color/app_color_primary</item>
-        <item name="colorControlActivated">@color/colorAccent</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorAccentText">@color/colorAccentText</item>
+        <item name="colorControlActivated">?colorAccent</item>
         <item name="android:textColorPrimary">@color/textColorPrimary</item>
         <item name="android:textColorSecondary">@color/text_color_secondary</item>
         <item name="android:textColorHint">@color/text_color_hint</item>
@@ -46,7 +47,7 @@
         <!-- Material Dialog colors -->
         <item name="md_color_title">@color/textColorPrimary</item>
         <item name="md_color_content">@color/text_color_secondary</item>
-        <item name="md_color_button_text">@color/colorAccent</item>
+        <item name="md_color_button_text">?colorAccent</item>
         <item name="md_background_color">@color/dialog</item>
         <item name="md_button_casing">literal</item>
         <item name="md_corner_radius">16dp</item>