From 590c1cff46b105d774271f950caa9f65523f05c1 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 29 十二月 2023 20:20:40 +0800
Subject: [PATCH] 1、增加护眼模式主题\n2、修复显示问题

---
 app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
index 48c64a5..6762c39 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
@@ -1,6 +1,7 @@
 package com.application.zhangshi_app_android.adapter;
 
 import android.content.Context;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.Transformation;
@@ -45,22 +46,33 @@
         ContactsDetailAdapter adapter = new ContactsDetailAdapter(mContext);
         holder.getBinding().recyclerView.setAdapter(adapter);
         adapter.setData(mDataList.get(position).getContactsDetailBeans());
+        //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗$墖鑳屾櫙鑹�
+        TypedValue typedValue1 = new TypedValue();
+        mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+        TypedValue typedValue2 = new TypedValue();
+        mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
         if (position % 2 != 0){
-            holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+            holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
         }else {
-            holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+            holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
         }
         if (!expendMap.containsKey(getItem(position))){
             expendMap.put(getItem(position),false);
         }
+
+        //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+        TypedValue unfoldIcon = new TypedValue();
+        mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+        TypedValue foldIcon = new TypedValue();
+        mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
         if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
-            holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+            holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
             holder.getBinding().cardView.post(() -> {
                 holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
                 holder.getBinding().cardView.requestLayout();
             });
         }else{
-            holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+            holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
             holder.getBinding().cardView.post(() -> {
                 holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
                 holder.getBinding().cardView.requestLayout();

--
Gitblit v1.9.1