From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段
---
app/src/main/res/layout/item_income_and_expenses.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/item_income_and_expenses.xml b/app/src/main/res/layout/item_income_and_expenses.xml
index 02e3c0c..cbb1a3c 100644
--- a/app/src/main/res/layout/item_income_and_expenses.xml
+++ b/app/src/main/res/layout/item_income_and_expenses.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -38,7 +38,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:background="@drawable/ic_flower"
+ android:background="?attr/icIsOwnFamilyDataFlower"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
--
Gitblit v1.9.1