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_main.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 201a214..64a75df 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,12 +6,14 @@
<data>
<variable
name="viewModel"
- type="com.application.zhangshi_app_android.module.main.MainViewModel" />
+ type="com.application.zhangshi_app_android.ui.main.MainViewModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/main_vp"
@@ -24,11 +26,11 @@
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/main_bnv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_56"
+ android:layout_height="56dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- android:background="@color/white"
+ android:background="?attr/bottomNavigationViewBackgroundColor"
app:itemBackground="@null"
app:itemIconTint="@null"
app:itemTextAppearanceActive="@style/bottom_navigation_title_active"
--
Gitblit v1.9.1