From 88b00f3fc74446a1727c93722c7b64179b45a9db Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 17:40:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/res/layout/item_package_dashboard.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/layout/item_package_dashboard.xml b/app/src/main/res/layout/item_package_dashboard.xml
index b0990bb..f297510 100644
--- a/app/src/main/res/layout/item_package_dashboard.xml
+++ b/app/src/main/res/layout/item_package_dashboard.xml
@@ -31,7 +31,7 @@
<TextView
android:id="@+id/text_courier_name"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="25dp"
android:textSize="16sp"
android:textStyle="bold"
tools:text="某快递" />
@@ -42,16 +42,34 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textColor="@android:color/darker_gray"
- android:textSize="12sp"
+ android:textSize="8sp"
tools:text="2025-01-14 10:30" />
</LinearLayout>
- <TextView
- android:id="@+id/text_tracking_number"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@android:color/darker_gray"
- tools:text="14-6-7023" />
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/text_tracking_number"
+ android:layout_width="wrap_content"
+ android:layout_height="25dp"
+ android:textColor="@android:color/darker_gray"
+ android:layout_gravity="end"
+ tools:text="14-6-7023" />
+
+ <TextView
+ android:id="@+id/text_pick_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="4dp"
+ android:textColor="@android:color/darker_gray"
+ android:layout_gravity="end"
+ android:textSize="8sp"
+ tools:text="2025-01-15 11:30" />
+ </LinearLayout>
+
</LinearLayout>
</androidx.cardview.widget.CardView>
\ No newline at end of file
--
Gitblit v1.9.3