Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复透明主题页面主题色无法正常显示

This commit is contained in:
HuanCheng65 2022-06-15 16:50:39 +08:00
parent 24084fa9a6
commit 99dbe90626
No known key found for this signature in database
GPG Key ID: E9031EF91A805148
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/huanchengfly/tieba/post/adapters/AppThemeAdapter.kt
View File

@ -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) {

6
app/src/main/java/com/huanchengfly/tieba/post/adapters/TranslucentThemeColorAdapter.java
View File

@ -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 {

5
app/src/main/res/layout/item_theme_color.xml
View File

@ -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"