From 2933603ee0940395a80a91bb23e50cbe8ba9baa5 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 05 三月 2025 10:03:16 +0800
Subject: [PATCH] fix: 2
---
app/src/main/res/layout/fragment_dashboard.xml | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 4d90e0c..ddd092e 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -81,7 +81,8 @@
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="48dp"
@@ -92,36 +93,45 @@
android:id="@+id/text_package_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
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