From 454a84caa83c4ebc1b4c422f10166bddfb0e03ec Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期四, 21 九月 2023 21:53:30 +0800
Subject: [PATCH] 1、修复添加按钮消失问题\n2、修改家族导图\n3、新增便捷添加功能\n4、新增修改头像功能\n5、个人财产增加搜索条件

---
 app/src/main/res/layout/activity_marriage.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/app/src/main/res/layout/activity_marriage.xml b/app/src/main/res/layout/activity_marriage.xml
index 36d17b8..ae01890 100644
--- a/app/src/main/res/layout/activity_marriage.xml
+++ b/app/src/main/res/layout/activity_marriage.xml
@@ -377,6 +377,7 @@
                     android:layout_marginHorizontal="14dp"
                     app:cardCornerRadius="10dp"
                     app:cardElevation="3dp"
+                    app:cardBackgroundColor="@color/white"
                     tools:layout_height="wrap_content"
                     >
                     <LinearLayout
@@ -573,6 +574,7 @@
                     android:layout_marginTop="10dp"
                     app:cardCornerRadius="10dp"
                     app:cardElevation="2dp"
+                    app:cardBackgroundColor="@color/white"
                     tools:layout_height="wrap_content"
                     >
                     <LinearLayout
@@ -633,6 +635,7 @@
                     android:layout_marginTop="10dp"
                     app:cardCornerRadius="10dp"
                     app:cardElevation="2dp"
+                    app:cardBackgroundColor="@color/white"
                     tools:layout_height="wrap_content"
                     >
                     <LinearLayout
@@ -871,7 +874,7 @@
                         android:layout_height="wrap_content"
                         android:textSize="16sp"
                         android:textColor="#FF131215"
-                        android:text="@{viewModel.infoLiveData.content}"
+                        android:text="@{viewModel.infoLiveData.notion}"
                         />
                     <TextView
                         android:layout_width="wrap_content"

--
Gitblit v1.9.1