From 168f53f24a8d13968a9e13d3072af8f046f674be Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 24 三月 2025 18:01:58 +0800
Subject: [PATCH] fix 324 免登陆，删除ActionBar
---
app/src/main/res/layout/fragment_dashboard.xml | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index ddd092e..ad51843 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -82,34 +82,59 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="16dp"
- android:gravity="center_vertical">
+ android:weightSum="3">
- <ImageView
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:src="@drawable/resource_package" />
-
- <TextView
- android:id="@+id/text_package_count"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:textSize="24sp"
- android:textStyle="bold"
- tools:text="4个" />
+ android:layout_weight="1"
+ android:gravity="center">
+
+ <ImageView
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:src="@drawable/resource_package" />
+ </LinearLayout>
+
+ <Space
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center">
+
+ <TextView
+ android:id="@+id/text_package_count"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="24sp"
+ android:textStyle="bold"
+ tools:text="4个" />
+ </LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
- <!-- 包裹列表 -->
+ <!-- 年度统计布局 -->
+ <include
+ android:id="@+id/layout_year_stats"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ app:layout_constraintTop_toBottomOf="@id/card_package_stats"
+ layout="@layout/layout_year_stats" />
+
+ <!-- 包裹列表和统计图表 -->
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
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">
+ app:layout_constraintTop_toBottomOf="@id/layout_year_stats"
+ app:layout_constraintBottom_toBottomOf="parent">
<ViewFlipper
android:id="@+id/view_flipper_stats"
--
Gitblit v1.9.3