From b17b9aa59bae6d03055f14d937821655dfaffa1f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 29 一月 2024 23:27:08 +0800
Subject: [PATCH] 1、调整成长经历页面\n2、删除婚姻个人信息
---
app/src/main/res/layout/activity_marriage.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/activity_marriage.xml b/app/src/main/res/layout/activity_marriage.xml
index 36d17b8..a5059e0 100644
--- a/app/src/main/res/layout/activity_marriage.xml
+++ b/app/src/main/res/layout/activity_marriage.xml
@@ -13,7 +13,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
@@ -46,6 +46,7 @@
android:orientation="vertical"
android:layout_marginHorizontal="20dp"
android:layout_marginVertical="16dp"
+ android:visibility="gone"
>
<TextView
android:layout_width="wrap_content"
@@ -375,8 +376,10 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginHorizontal="14dp"
+ android:layout_marginTop="16dp"
app:cardCornerRadius="10dp"
app:cardElevation="3dp"
+ app:cardBackgroundColor="@color/white"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -422,6 +425,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="20dp"
>
<LinearLayout
android:layout_width="0dp"
@@ -492,7 +496,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="20dp"
+ android:layout_marginBottom="20dp"
>
<LinearLayout
android:layout_width="0dp"
@@ -573,6 +577,7 @@
android:layout_marginTop="10dp"
app:cardCornerRadius="10dp"
app:cardElevation="2dp"
+ app:cardBackgroundColor="@color/white"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -633,6 +638,7 @@
android:layout_marginTop="10dp"
app:cardCornerRadius="10dp"
app:cardElevation="2dp"
+ app:cardBackgroundColor="@color/white"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -871,7 +877,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