From 897ffe5e29ab022d75ad948ecf894e0a3ed3b2f5 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 04 三月 2025 18:01:41 +0800
Subject: [PATCH] fix: 1
---
app/src/main/res/layout/fragment_dashboard.xml | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 8e543a4..ddd092e 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -81,49 +81,57 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:padding="16dp">
+ android:padding="16dp"
+ android:gravity="center_vertical">
<ImageView
- android:layout_width="0dp"
+ android:layout_width="48dp"
android:layout_height="48dp"
- android:layout_weight="1"
android:src="@drawable/resource_package" />
<TextView
android:id="@+id/text_package_count"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
- android:layout_weight="1"
android:textSize="24sp"
android:textStyle="bold"
tools:text="4个" />
+
</LinearLayout>
</androidx.cardview.widget.CardView>
<!-- 包裹列表 -->
- <ViewFlipper
- android:id="@+id/view_flipper_stats"
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:layout_constraintTop_toBottomOf="@id/card_package_stats">
+ android:layout_height="0dp"
+ android:fillViewport="true"
+ android:clipToPadding="false"
+ app:layout_constraintTop_toBottomOf="@id/card_package_stats"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="56dp">
- <!-- 日视图 -->
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/recycler_packages"
+ <ViewFlipper
+ android:id="@+id/view_flipper_stats"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content">
- <!-- 周视图 -->
- <include
- android:id="@+id/layout_week_stats"
- layout="@layout/layout_week_stats"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ <!-- 日视图 -->
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recycler_packages"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:clipToPadding="false"
+ android:paddingBottom="16dp" />
- <!-- 月视图和年视图可以根据需要添加 -->
+ <!-- 周视图 -->
+ <include
+ android:id="@+id/layout_week_stats"
+ layout="@layout/layout_week_stats"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
- </ViewFlipper>
+ </ViewFlipper>
+ </androidx.core.widget.NestedScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.9.3