From 57d1ff885c981283758d355856012b16b4c7bc5e Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期三, 26 三月 2025 18:00:38 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/res/layout/fragment_home.xml | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 79dd0bb..82554fe 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -69,39 +69,17 @@
android:layout_height="wrap_content"
android:layout_margin="16dp">
- <!-- 快递内容 -->
- <androidx.cardview.widget.CardView
- android:id="@+id/expressContent"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/express_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:cardBackgroundColor="@color/light_blue_50"
- app:cardCornerRadius="8dp"
- app:cardElevation="0dp">
+ android:padding="8dp"/>
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/express_recycler"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="8dp"/>
-
- </androidx.cardview.widget.CardView>
-
- <!-- 财务内容 -->
- <androidx.cardview.widget.CardView
- android:id="@+id/financeContent"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/finance_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:cardBackgroundColor="@color/light_blue_50"
- app:cardCornerRadius="8dp"
- app:cardElevation="0dp">
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/finance_recycler"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="8dp"/>
-
- </androidx.cardview.widget.CardView>
+ android:padding="8dp"/>
</FrameLayout>
--
Gitblit v1.9.3