From caead5ad019c24b9a7958f01fa663ea8159aee6c Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期一, 01 七月 2024 16:16:04 +0800
Subject: [PATCH] 修复会议申请的闪退bgg（starttime,endtime字段的划分和修改）
---
app/src/main/res/layout/activity_main.xml | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bd629de..64a75df 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,31 +6,39 @@
<data>
<variable
name="viewModel"
- type="com.application.zhangshi_app_android.viewmodel.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">
- <Button
- android:id="@+id/button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Button"
+
+
+ <androidx.viewpager2.widget.ViewPager2
+ android:id="@+id/main_vp"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@+id/main_bnv"
+ />
+
+ <com.google.android.material.bottomnavigation.BottomNavigationView
+ android:id="@+id/main_bnv"
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ android:background="?attr/bottomNavigationViewBackgroundColor"
+ app:itemBackground="@null"
+ app:itemIconTint="@null"
+ app:itemTextAppearanceActive="@style/bottom_navigation_title_active"
+ app:itemTextAppearanceInactive="@style/bottom_navigation_title_inactive"
+ app:itemTextColor="@drawable/selector_bottom_navigation_text_color"
+ app:labelVisibilityMode="labeled"
+ app:menu="@menu/bottom_nav_menu"
+ />
- <TextView
- android:id="@+id/textView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="TextView"
- app:layout_constraintBottom_toTopOf="@+id/button"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
--
Gitblit v1.9.1