From 96006756770c4e6da55ca810720e1c2622675f46 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Mon, 15 Nov 2021 10:11:47 -0500
Subject: [PATCH] Adjust CardView styles

---
 app/src/main/res/layout/categories_item.xml   | 3 +--
 app/src/main/res/layout/download_header.xml   | 3 +--
 app/src/main/res/layout/download_item.xml     | 3 +--
 app/src/main/res/layout/pref_tracker_item.xml | 1 -
 app/src/main/res/layout/track_item.xml        | 2 +-
 app/src/main/res/values/themes.xml            | 1 +
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/categories_item.xml b/app/src/main/res/layout/categories_item.xml
index c781589dba..b28f574535 100644
--- a/app/src/main/res/layout/categories_item.xml
+++ b/app/src/main/res/layout/categories_item.xml
@@ -7,8 +7,7 @@
     android:layout_height="wrap_content"
     app:cardBackgroundColor="?android:attr/colorBackground"
     app:cardElevation="0dp"
-    app:cardForegroundColor="@color/draggable_card_foreground"
-    app:strokeWidth="0dp">
+    app:cardForegroundColor="@color/draggable_card_foreground">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/download_header.xml b/app/src/main/res/layout/download_header.xml
index 9e8779fe26..191e7e315f 100644
--- a/app/src/main/res/layout/download_header.xml
+++ b/app/src/main/res/layout/download_header.xml
@@ -8,8 +8,7 @@
     android:layout_marginTop="8dp"
     app:cardBackgroundColor="?android:attr/colorBackground"
     app:cardElevation="0dp"
-    app:cardForegroundColor="@color/draggable_card_foreground"
-    app:strokeWidth="0dp">
+    app:cardForegroundColor="@color/draggable_card_foreground">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index 46161bb590..cfd6dbfc3d 100644
--- a/app/src/main/res/layout/download_item.xml
+++ b/app/src/main/res/layout/download_item.xml
@@ -7,8 +7,7 @@
     android:layout_height="wrap_content"
     app:cardBackgroundColor="?android:attr/colorBackground"
     app:cardElevation="0dp"
-    app:cardForegroundColor="@color/draggable_card_foreground"
-    app:strokeWidth="0dp">
+    app:cardForegroundColor="@color/draggable_card_foreground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/pref_tracker_item.xml b/app/src/main/res/layout/pref_tracker_item.xml
index f1406ef176..75d57e10b6 100644
--- a/app/src/main/res/layout/pref_tracker_item.xml
+++ b/app/src/main/res/layout/pref_tracker_item.xml
@@ -14,7 +14,6 @@
         android:layout_height="48dp"
         app:cardBackgroundColor="#2E51A2"
         app:cardElevation="0dp"
-        app:strokeWidth="0dp"
         app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.MaterialCardView.Tracker">
 
         <ImageView
diff --git a/app/src/main/res/layout/track_item.xml b/app/src/main/res/layout/track_item.xml
index 3efed6043f..845a5eb937 100644
--- a/app/src/main/res/layout/track_item.xml
+++ b/app/src/main/res/layout/track_item.xml
@@ -22,7 +22,6 @@
             android:layout_height="48dp"
             app:cardBackgroundColor="#2E51A2"
             app:cardElevation="0dp"
-            app:strokeWidth="0dp"
             app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.MaterialCardView.Tracker">
 
             <ImageView
@@ -79,6 +78,7 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card"
+        style="@style/Widget.Material3.CardView.Outlined"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bb76703184..ee09bc5059 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -85,6 +85,7 @@
         <item name="navigationRailStyle">@style/Widget.Tachiyomi.NavigationRailView</item>
         <item name="switchStyle">@style/Widget.Tachiyomi.Switch</item>
         <item name="sliderStyle">@style/Widget.Tachiyomi.Slider</item>
+        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="elevationOverlayEnabled">false</item>
         <item name="lightSystemBarsOnPrimary">false</item>