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/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 36d17b8..1c57c96 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
@@ -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