From dde2eeddbaf07246da7c2c352e7d49ec63fddcd2 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 28 三月 2025 14:56:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/res/layout/fragment_home.xml | 38 ++++++++------------------------------
1 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 79dd0bb..18a5e11 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -8,7 +8,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="80dp"> <!-- 留出顶部广告位的高度 -->
+ android:layout_marginTop="40dp"> <!-- 留出顶部广告位的高度 -->
>
<!-- LinearLayout的作用是按照垂直或者水平方向排列其子视图-->
@@ -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>
@@ -131,7 +109,7 @@
<ImageView
android:id="@+id/adBanner"
android:layout_width="match_parent"
- android:layout_height="80dp"
+ android:layout_height="40dp"
android:scaleType="centerCrop"
android:src="@drawable/up"/>
</androidx.cardview.widget.CardView>
--
Gitblit v1.9.3