From 2fa1c71fbd5bd468b42dc81ad76acac62e7dbfb9 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Sun, 19 Apr 2020 20:46:53 -0400
Subject: [PATCH] More attr cleanup

---
 .../eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt   | 5 -----
 .../java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt | 4 ----
 .../java/eu/kanade/tachiyomi/ui/source/SourceAdapter.kt    | 4 ----
 app/src/main/res/drawable/card_item_selector.xml           | 2 +-
 app/src/main/res/layout/chapter_header_item.xml            | 2 +-
 app/src/main/res/layout/chapters_item.xml                  | 2 +-
 app/src/main/res/layout/extension_card_item.xml            | 2 +-
 app/src/main/res/layout/manga_header_item.xml              | 2 +-
 app/src/main/res/layout/manga_list_item.xml                | 2 +-
 app/src/main/res/layout/migration_card_item.xml            | 2 +-
 app/src/main/res/layout/migration_source_item.xml          | 2 +-
 app/src/main/res/layout/reader_chapter_item.xml            | 2 +-
 app/src/main/res/layout/recent_chapters_item.xml           | 2 +-
 app/src/main/res/layout/recent_manga_item.xml              | 2 +-
 app/src/main/res/layout/recently_read_item.xml             | 6 ++++--
 app/src/main/res/layout/recents_footer_item.xml            | 2 +-
 .../layout/source_global_search_controller_card_item.xml   | 2 +-
 app/src/main/res/layout/source_item.xml                    | 2 +-
 app/src/main/res/layout/track_item.xml                     | 2 +-
 app/src/main/res/layout/track_search_dialog.xml            | 2 +-
 app/src/main/res/layout/track_search_item.xml              | 2 +-
 app/src/main/res/values-night/themes.xml                   | 5 -----
 app/src/main/res/values/attrs.xml                          | 2 --
 app/src/main/res/values/styles.xml                         | 4 ++--
 app/src/main/res/values/themes.xml                         | 7 +++----
 25 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt
index d40c17c7e5..58c72e8c7e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt
@@ -2,9 +2,7 @@ package eu.kanade.tachiyomi.ui.extension
 
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.extension.ExtensionAdapter.OnButtonClickListener
-import eu.kanade.tachiyomi.util.system.getResourceColor
 
 /**
  * Adapter that holds the catalogue cards.
@@ -14,9 +12,6 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
 class ExtensionAdapter(val listener: OnButtonClickListener) :
         FlexibleAdapter<IFlexible<*>>(null, listener, true) {
 
-    val cardBackground = (listener as ExtensionBottomSheet).context.getResourceColor(R.attr
-        .background_card)
-
     init {
         setDisplayHeadersAtStartUp(true)
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt
index c70ff66ef0..1467a4763b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.ui.migration
 
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.system.getResourceColor
 
 /**
  * Adapter that holds the catalogue cards.
@@ -13,8 +11,6 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
 class SourceAdapter(val controller: MigrationController) :
         FlexibleAdapter<IFlexible<*>>(null, controller, true) {
 
-    val cardBackground = controller.activity!!.getResourceColor(R.attr.background_card)
-
     private var items: List<IFlexible<*>>? = null
 
     init {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceAdapter.kt
index 92da8eaeea..952493e610 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceAdapter.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.ui.source
 
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.system.getResourceColor
 
 /**
  * Adapter that holds the catalogue cards.
@@ -13,8 +11,6 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
 class SourceAdapter(val controller: SourceController) :
         FlexibleAdapter<IFlexible<*>>(null, controller, true) {
 
-    val cardBackground = controller.activity!!.getResourceColor(R.attr.background_card)
-
     init {
         setDisplayHeadersAtStartUp(true)
     }
diff --git a/app/src/main/res/drawable/card_item_selector.xml b/app/src/main/res/drawable/card_item_selector.xml
index 7c810901d6..647eefdb81 100644
--- a/app/src/main/res/drawable/card_item_selector.xml
+++ b/app/src/main/res/drawable/card_item_selector.xml
@@ -15,7 +15,7 @@
             </item>
 
             <item android:id="@android:id/mask">
-                <color android:color="?attr/background_card" />
+                <color android:color="?md_background_color" />
             </item>
         </selector>
     </item>
diff --git a/app/src/main/res/layout/chapter_header_item.xml b/app/src/main/res/layout/chapter_header_item.xml
index 6316c4effa..853c849d9b 100644
--- a/app/src/main/res/layout/chapter_header_item.xml
+++ b/app/src/main/res/layout/chapter_header_item.xml
@@ -5,7 +5,7 @@
     android:id="@+id/chapter_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectable_list_drawable"
+    android:background="@drawable/list_item_selector"
     android:tooltipText="@string/sort_and_filter"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chapters_item.xml b/app/src/main/res/layout/chapters_item.xml
index 5569b507e5..1877774983 100644
--- a/app/src/main/res/layout/chapters_item.xml
+++ b/app/src/main/res/layout/chapters_item.xml
@@ -55,7 +55,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:background="?attr/selectable_list_drawable"
+        android:background="@drawable/list_item_selector"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/extension_card_item.xml b/app/src/main/res/layout/extension_card_item.xml
index b79ca9e2d6..4034751ecf 100644
--- a/app/src/main/res/layout/extension_card_item.xml
+++ b/app/src/main/res/layout/extension_card_item.xml
@@ -9,7 +9,7 @@
         android:id="@+id/card"
         android:layout_width="match_parent"
         android:layout_height="64dp"
-        android:background="?attr/selectable_list_drawable">
+        android:background="@drawable/list_item_selector">
 
         <ImageView
             android:id="@+id/edit_button"
diff --git a/app/src/main/res/layout/manga_header_item.xml b/app/src/main/res/layout/manga_header_item.xml
index 2b8b47fd60..0798739a50 100644
--- a/app/src/main/res/layout/manga_header_item.xml
+++ b/app/src/main/res/layout/manga_header_item.xml
@@ -346,7 +346,7 @@
         android:layout_height="wrap_content"
         android:tooltipText="@string/sort_and_filter"
         app:layout_constraintEnd_toEndOf="parent"
-        android:background="?selectable_list_drawable"
+        android:background="@drawable/list_item_selector"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/start_reading_button">
 
diff --git a/app/src/main/res/layout/manga_list_item.xml b/app/src/main/res/layout/manga_list_item.xml
index e31c86213f..10ebc39698 100644
--- a/app/src/main/res/layout/manga_list_item.xml
+++ b/app/src/main/res/layout/manga_list_item.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
     android:id="@+id/constraint_layout"
-    android:background="?attr/selectable_list_drawable"
+    android:background="@drawable/list_item_selector"
     android:minHeight="@dimen/material_component_lists_single_line_with_avatar_height">
 
     <com.google.android.material.card.MaterialCardView
diff --git a/app/src/main/res/layout/migration_card_item.xml b/app/src/main/res/layout/migration_card_item.xml
index d9c6530c24..4ec2ef2a2b 100644
--- a/app/src/main/res/layout/migration_card_item.xml
+++ b/app/src/main/res/layout/migration_card_item.xml
@@ -10,7 +10,7 @@
         android:id="@+id/card"
         android:layout_width="match_parent"
         android:layout_height="@dimen/material_component_lists_two_line_height"
-        android:background="?attr/selectable_list_drawable">
+        android:background="@drawable/list_item_selector">
 
         <ImageView
             android:id="@+id/edit_button"
diff --git a/app/src/main/res/layout/migration_source_item.xml b/app/src/main/res/layout/migration_source_item.xml
index 89df23a3ca..eca6709be6 100644
--- a/app/src/main/res/layout/migration_source_item.xml
+++ b/app/src/main/res/layout/migration_source_item.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
-    android:background="?attr/selectable_list_drawable">
+    android:background="@drawable/list_item_selector">
 
     <ImageView
         android:id="@+id/edit_button"
diff --git a/app/src/main/res/layout/reader_chapter_item.xml b/app/src/main/res/layout/reader_chapter_item.xml
index 0f5cee287e..c57927aa9a 100644
--- a/app/src/main/res/layout/reader_chapter_item.xml
+++ b/app/src/main/res/layout/reader_chapter_item.xml
@@ -6,7 +6,7 @@
     android:layout_height="60dp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
-    android:background="?attr/selectable_list_drawable"
+    android:background="@drawable/list_item_selector"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent">
 
diff --git a/app/src/main/res/layout/recent_chapters_item.xml b/app/src/main/res/layout/recent_chapters_item.xml
index b714a363ac..ab8683af7b 100644
--- a/app/src/main/res/layout/recent_chapters_item.xml
+++ b/app/src/main/res/layout/recent_chapters_item.xml
@@ -30,7 +30,7 @@
         android:id="@+id/front_view"
         android:layout_width="match_parent"
         android:layout_height="@dimen/material_component_lists_two_line_height"
-        android:background="?attr/selectable_list_drawable">
+        android:background="@drawable/list_item_selector">
 
         <ImageView
             android:id="@+id/manga_cover"
diff --git a/app/src/main/res/layout/recent_manga_item.xml b/app/src/main/res/layout/recent_manga_item.xml
index 02aee83bd7..725dc38056 100644
--- a/app/src/main/res/layout/recent_manga_item.xml
+++ b/app/src/main/res/layout/recent_manga_item.xml
@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:background="?attr/selectable_list_drawable"
+        android:background="@drawable/list_item_selector"
         android:minHeight="@dimen/material_component_lists_single_line_with_avatar_height">
 
         <FrameLayout
diff --git a/app/src/main/res/layout/recently_read_item.xml b/app/src/main/res/layout/recently_read_item.xml
index a0262d3a3c..3da82ecec4 100644
--- a/app/src/main/res/layout/recently_read_item.xml
+++ b/app/src/main/res/layout/recently_read_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/history_card"
     style="@style/Theme.Widget.CardView.Item"
     android:padding="0dp">
 
@@ -70,4 +72,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/recents_footer_item.xml b/app/src/main/res/layout/recents_footer_item.xml
index 7f918868ea..946877a941 100644
--- a/app/src/main/res/layout/recents_footer_item.xml
+++ b/app/src/main/res/layout/recents_footer_item.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/recent_item"
-    android:background="?selectable_list_drawable"
+    android:background="@drawable/list_item_selector"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
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 7ddec41deb..61375e95f5 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
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?attr/selectable_list_drawable"
+    android:background="@drawable/list_item_selector"
     android:orientation="vertical"
     android:paddingBottom="8dp"
     android:paddingEnd="4dp"
diff --git a/app/src/main/res/layout/source_item.xml b/app/src/main/res/layout/source_item.xml
index aee31cf1e4..6641dd7df5 100644
--- a/app/src/main/res/layout/source_item.xml
+++ b/app/src/main/res/layout/source_item.xml
@@ -49,7 +49,7 @@
         android:id="@+id/card"
         android:layout_width="match_parent"
         android:layout_height="@dimen/material_component_lists_two_line_height"
-        android:background="?attr/selectable_list_drawable">
+        android:background="@drawable/list_item_selector">
 
         <ImageView
             android:id="@+id/edit_button"
diff --git a/app/src/main/res/layout/track_item.xml b/app/src/main/res/layout/track_item.xml
index 3259f8e355..1787550a10 100644
--- a/app/src/main/res/layout/track_item.xml
+++ b/app/src/main/res/layout/track_item.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:background="?attr/background_card">
+        android:background="?md_background_color">
 
         <FrameLayout
             android:id="@+id/logo_container"
diff --git a/app/src/main/res/layout/track_search_dialog.xml b/app/src/main/res/layout/track_search_dialog.xml
index 0c9d8191ec..f3b486ae33 100644
--- a/app/src/main/res/layout/track_search_dialog.xml
+++ b/app/src/main/res/layout/track_search_dialog.xml
@@ -43,7 +43,7 @@
             android:dividerHeight="10dp"
             android:footerDividersEnabled="true"
             android:headerDividersEnabled="true"
-            android:listSelector="?attr/selectable_list_drawable"
+            android:listSelector="@drawable/list_item_selector"
             android:paddingBottom="4dp"
             android:paddingTop="4dp"
             android:scrollbars="none"
diff --git a/app/src/main/res/layout/track_search_item.xml b/app/src/main/res/layout/track_search_item.xml
index a760bea366..95d32dc436 100644
--- a/app/src/main/res/layout/track_search_item.xml
+++ b/app/src/main/res/layout/track_search_item.xml
@@ -8,7 +8,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="216dp"
-        android:background="?attr/selectable_list_drawable"
+        android:background="@drawable/list_item_selector"
         android:orientation="horizontal">
 
         <ImageView
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 717082b1fb..f79bb59417 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -18,11 +18,6 @@
         <item name="android:colorBackground">@color/md_black_1000</item>
         <item name="android:statusBarColor">@color/blackStatus</item>
 
-        <!-- Custom Attributes-->
-        <item name="selectable_list_drawable">@drawable/list_item_selector</item>
-        <item name="background_card">@color/colorAmoledPrimary</item>
-
-
         <!-- Material Dialog colors -->
         <item name="md_color_title">@color/textColorPrimary</item>
         <item name="md_color_content">@color/textColorSecondary</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a02c43f713..8e4f935f4a 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -23,6 +23,4 @@
     <attr name="actionBarTintColor" format="color"/>
     <attr name="tabBarIconColor" format="reference|integer"/>
     <attr name="tabBarIconInactive" format="reference|integer"/>
-    <attr name="selectable_list_drawable" format="reference|integer" />
-    <attr name="background_card" format="reference|integer"/>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 103bd2c91f..30085d5d32 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -150,7 +150,7 @@
         </item>
         <item name="android:layout_marginEnd">@dimen/material_component_cards_space_between_cards
         </item>
-        <item name="cardBackgroundColor">?attr/background_card</item>
+        <item name="cardBackgroundColor">?md_background_color</item>
         <item name="cardElevation">2dp</item>
     </style>
 
@@ -178,7 +178,7 @@
 
     <style name="Theme.Widget.SpinnerItem" parent="Widget.AppCompat.DropDownItem.Spinner">
         <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:background">?attr/selectable_list_drawable</item>
+        <item name="android:background">@drawable/list_item_selector</item>
     </style>
 
     <!-- set the rounded drawable as background to your bottom sheet -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ff45ac41e9..bd97b70d47 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -26,9 +26,6 @@
         <item name="android:divider">@color/divider</item>
         <item name="android:listDivider">@drawable/line_divider</item>
         <item name="actionModeStyle">@style/CustomActionModeStyle</item>
-        <item name="tabBarIconColor">?colorAccent</item>
-        <item name="tabBarIconInactive">@color/colorPrimaryInactive</item>
-
 
         <!-- Themes -->
         <item name="windowActionModeOverlay">true</item>
@@ -36,8 +33,9 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 
         <!-- Custom Attributes-->
-        <item name="selectable_list_drawable">@drawable/list_item_selector</item>
         <item name="actionBarTintColor">@color/textColorPrimary</item>
+        <item name="tabBarIconColor">?colorAccent</item>
+        <item name="tabBarIconInactive">@color/colorPrimaryInactive</item>
 
         <item name="android:statusBarColor">@color/mainStatus</item>
         <item name="android:navigationBarColor">#B3000000</item>
@@ -50,6 +48,7 @@
         <item name="md_background_color">@color/dialog</item>
         <item name="md_button_casing">literal</item>
         <item name="md_corner_radius">16dp</item>
+
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
     </style>