From 2530487483c4dc88b68d875a6b66a29abd3b00b6 Mon Sep 17 00:00:00 2001
From: proletarius101 <proletarius101@protonmail.com>
Date: Tue, 18 May 2021 01:08:26 +0800
Subject: [PATCH] Migrate CardView to MaterialCardView

---
 app/src/main/res/layout-v21/app_details2_header.xml      | 7 ++-----
 app/src/main/res/layout/activity_app_list.xml            | 8 +++-----
 app/src/main/res/layout/app_card_horizontal.xml          | 5 ++---
 app/src/main/res/layout/app_card_large.xml               | 5 ++---
 app/src/main/res/layout/app_card_list_item.xml           | 5 ++---
 app/src/main/res/layout/app_details2_donate.xml          | 9 +++------
 app/src/main/res/layout/app_details2_header.xml          | 7 ++-----
 app/src/main/res/layout/app_details2_screenshot_item.xml | 9 ++++-----
 8 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/app/src/main/res/layout-v21/app_details2_header.xml b/app/src/main/res/layout-v21/app_details2_header.xml
index f6648f040..f35224530 100644
--- a/app/src/main/res/layout-v21/app_details2_header.xml
+++ b/app/src/main/res/layout-v21/app_details2_header.xml
@@ -1,13 +1,10 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/details_activity_padding"
-    app:cardBackgroundColor="?attr/appDetailsCardBackground"
-    app:cardCornerRadius="3dp"
-    app:cardElevation="3dp"
     android:animateLayoutChanges="true">
 
     <LinearLayout
@@ -262,4 +259,4 @@
             android:text="@string/more" />
 
     </LinearLayout>
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/activity_app_list.xml b/app/src/main/res/layout/activity_app_list.xml
index c0972afc6..8cf4bd3c3 100644
--- a/app/src/main/res/layout/activity_app_list.xml
+++ b/app/src/main/res/layout/activity_app_list.xml
@@ -8,14 +8,12 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/search_card"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
+        android:layout_marginStart="4dp"
         android:layout_marginEnd="0dp"
-        android:layout_marginRight="0dp"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         app:layout_constraintEnd_toStartOf="@+id/sort"
@@ -68,7 +66,7 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
     <ImageView
         android:id="@+id/sort"
diff --git a/app/src/main/res/layout/app_card_horizontal.xml b/app/src/main/res/layout/app_card_horizontal.xml
index 83adf84a5..7126a8cd0 100644
--- a/app/src/main/res/layout/app_card_horizontal.xml
+++ b/app/src/main/res/layout/app_card_horizontal.xml
@@ -1,10 +1,9 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:foreground="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true">
 
@@ -52,4 +51,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_card_large.xml b/app/src/main/res/layout/app_card_large.xml
index 2381b5deb..017c9279a 100644
--- a/app/src/main/res/layout/app_card_large.xml
+++ b/app/src/main/res/layout/app_card_large.xml
@@ -1,10 +1,9 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="220dp"
-    android:foreground="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true">
 
@@ -58,4 +57,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_card_list_item.xml b/app/src/main/res/layout/app_card_list_item.xml
index 9ee1ffacc..e307085f3 100644
--- a/app/src/main/res/layout/app_card_list_item.xml
+++ b/app/src/main/res/layout/app_card_list_item.xml
@@ -1,10 +1,9 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:foreground="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true">
 
@@ -53,4 +52,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_details2_donate.xml b/app/src/main/res/layout/app_details2_donate.xml
index 63fe3c894..b59942af5 100644
--- a/app/src/main/res/layout/app_details2_donate.xml
+++ b/app/src/main/res/layout/app_details2_donate.xml
@@ -1,13 +1,10 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/details_activity_padding"
-    app:cardBackgroundColor="?attr/appDetailsCardBackground"
-    app:cardCornerRadius="3dp"
-    app:cardElevation="3dp">
+    android:layout_margin="@dimen/details_activity_padding">
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -32,4 +29,4 @@
             app:columnCount="2" />
 
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
index 8250ca958..c72983694 100644
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -1,13 +1,10 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/details_activity_padding"
-    app:cardBackgroundColor="?attr/appDetailsCardBackground"
-    app:cardCornerRadius="3dp"
-    app:cardElevation="3dp"
     android:animateLayoutChanges="true">
 
     <LinearLayout
@@ -263,4 +260,4 @@
             android:text="@string/more" />
 
     </LinearLayout>
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/app_details2_screenshot_item.xml b/app/src/main/res/layout/app_details2_screenshot_item.xml
index 334322f35..d0a9def00 100644
--- a/app/src/main/res/layout/app_details2_screenshot_item.xml
+++ b/app/src/main/res/layout/app_details2_screenshot_item.xml
@@ -1,12 +1,11 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_margin="@dimen/details_screenshot_margin"
-    android:padding="10dp"
-    app:cardCornerRadius="0dp"
-    app:cardElevation="3dp">
+    android:padding="12dp"
+    app:cardCornerRadius="0dp">
 
     <ImageView
         android:id="@+id/image"
@@ -16,4 +15,4 @@
         android:minWidth="@dimen/details_screenshot_width"
         android:scaleType="centerCrop" />
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file