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/DailyConsumeRecordRvAdapter.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java
index bb848fc..ec8f658 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java
@@ -3,6 +3,7 @@
import android.app.Activity;
import android.content.Context;
import android.graphics.Color;
+import android.util.TypedValue;
import android.widget.FrameLayout;
import androidx.lifecycle.LifecycleOwner;
@@ -62,14 +63,19 @@
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();
@@ -80,14 +86,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
holder.getBinding().cardView.postDelayed(new Runnable() {
@Override
--
Gitblit v1.9.1