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/activity_marriage.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/activity_marriage.xml b/app/src/main/res/layout/activity_marriage.xml
index ae01890..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,6 +376,7 @@
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"
@@ -423,6 +425,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="20dp"
>
<LinearLayout
android:layout_width="0dp"
@@ -493,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"
--
Gitblit v1.9.1