From 99dbe906263915f996136f379d1af71d21d3171c Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Wed, 15 Jun 2022 16:50:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=8F=E6=98=8E?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E9=A1=B5=E9=9D=A2=E4=B8=BB=E9=A2=98=E8=89=B2?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/huanchengfly/tieba/post/adapters/AppThemeAdapter.kt | 6 ++----
 .../tieba/post/adapters/TranslucentThemeColorAdapter.java   | 6 ++++--
 app/src/main/res/layout/item_theme_color.xml                | 5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/AppThemeAdapter.kt b/app/src/main/java/com/huanchengfly/tieba/post/adapters/AppThemeAdapter.kt
index 3154c9b2..493d7226 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/AppThemeAdapter.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/AppThemeAdapter.kt
@@ -1,9 +1,7 @@
 package com.huanchengfly.tieba.post.adapters
 
 import android.content.Context
-import android.content.res.ColorStateList
 import android.os.Build
-import android.view.View
 import com.google.android.material.card.MaterialCardView
 import com.huanchengfly.tieba.post.BaseApplication.ThemeDelegate.getColorByAttr
 import com.huanchengfly.tieba.post.R
@@ -45,8 +43,8 @@ class AppThemeAdapter private constructor(
         }
         viewHolder.getView<MaterialCardView>(R.id.theme_preview).strokeColor =
             getThemePrimaryColor(item.value)
-        viewHolder.getView<View>(R.id.theme_preview_bg).backgroundTintList =
-            ColorStateList.valueOf(getThemeColor(item.value))
+        viewHolder.getView<MaterialCardView>(R.id.theme_preview)
+            .setCardBackgroundColor(getThemeColor(item.value))
         viewHolder.itemView.apply {
             contentDescription = item.name
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/TranslucentThemeColorAdapter.java b/app/src/main/java/com/huanchengfly/tieba/post/adapters/TranslucentThemeColorAdapter.java
index b4275d64..1d188922 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/TranslucentThemeColorAdapter.java
+++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/TranslucentThemeColorAdapter.java
@@ -10,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.palette.graphics.Palette;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.card.MaterialCardView;
 import com.huanchengfly.tieba.post.R;
 import com.huanchengfly.tieba.post.components.MyViewHolder;
 import com.huanchengfly.tieba.post.interfaces.OnItemClickListener;
@@ -79,8 +80,9 @@ public class TranslucentThemeColorAdapter extends RecyclerView.Adapter<MyViewHol
                 getOnItemClickListener().onClick(holder.itemView, mColors.get(position), position, 0);
             }
         });
-        View preview = holder.getView(R.id.theme_preview);
-        preview.setBackgroundTintList(ColorStateList.valueOf(mColors.get(position)));
+        MaterialCardView preview = holder.getView(R.id.theme_preview);
+        preview.setCardBackgroundColor(mColors.get(position));
+        preview.setStrokeColor(ColorStateList.valueOf(mColors.get(position)));
         if (mSelectedColor == mColors.get(position)) {
             holder.setVisibility(R.id.theme_selected, View.VISIBLE);
         } else {
diff --git a/app/src/main/res/layout/item_theme_color.xml b/app/src/main/res/layout/item_theme_color.xml
index 77ed20e7..35298cc8 100644
--- a/app/src/main/res/layout/item_theme_color.xml
+++ b/app/src/main/res/layout/item_theme_color.xml
@@ -12,7 +12,7 @@
         android:id="@+id/theme_preview"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        app:cardBackgroundColor="@color/transparent"
+        app:cardBackgroundColor="@color/white"
         app:cardCornerRadius="10dp"
         app:cardElevation="0dp"
         app:strokeWidth="2dp">
@@ -20,8 +20,7 @@
         <FrameLayout
             android:id="@+id/theme_preview_bg"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/white">
+            android:layout_height="match_parent">
 
             <com.huanchengfly.tieba.post.widgets.theme.TintImageView
                 android:id="@+id/theme_icon"