From 31b7700b976a46901f67c5d7a00281ca4745fc9f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期六, 07 十月 2023 21:44:35 +0800
Subject: [PATCH] 调整旅游模块功能
---
app/src/main/res/layout/fragment_function.xml | 124 ++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 70 deletions(-)
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index dc8f422..3bdd176 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -35,25 +35,26 @@
android:orientation="horizontal">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_search" />
+ android:id="@+id/iv_operate_select"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_operate_select_white" />
<ImageView
android:id="@+id/iv_operate"
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:layout_marginStart="@dimen/dp_16"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginStart="16dp"
android:background="@drawable/ic_operate" />
</LinearLayout>
</com.android.app_base.widget.ExtendTitleBar>
-
<FrameLayout
android:id="@+id/layout_banner"
android:layout_width="match_parent"
- android:layout_height="200dp"
+ android:layout_height="0dp"
+ app:layout_constraintDimensionRatio="16:9"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/titleBar"
@@ -70,34 +71,10 @@
android:layout_height="match_parent"
/>
</FrameLayout>
- <RelativeLayout
- android:id="@+id/layout_data_null"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- >
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:src="@drawable/img_data_null"
- android:scaleType="center"
- />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="绌虹┖濡備篃~"
- android:textColor="#73000000"
- android:layout_gravity="center"
- android:layout_centerHorizontal="true"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="10dp"
- />
- </RelativeLayout>
-
</FrameLayout>
- <LinearLayout
+ <FrameLayout
+ android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical"
@@ -162,8 +139,8 @@
app:layout_constraintTop_toBottomOf="@id/tv_core_module">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_family_root_net" />
<TextView
@@ -208,8 +185,8 @@
app:layout_constraintTop_toTopOf="@id/layout_home_root_net">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_asset" />
<TextView
@@ -231,8 +208,8 @@
app:layout_constraintTop_toTopOf="@id/layout_home_root_net">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_honor" />
<TextView
@@ -257,8 +234,8 @@
>
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_little_doctor"
/>
<TextView
@@ -282,8 +259,8 @@
>
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_cleaning"
/>
<TextView
@@ -306,8 +283,8 @@
app:layout_constraintTop_toTopOf="@id/layout_little_doctor">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_mail_list" />
<TextView
@@ -329,8 +306,8 @@
app:layout_constraintTop_toTopOf="@id/layout_little_doctor">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_pamper_pet" />
<TextView
@@ -354,8 +331,8 @@
app:layout_constraintTop_toBottomOf="@+id/layout_little_doctor">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_income_expense" />
<TextView
@@ -415,8 +392,8 @@
app:layout_constraintTop_toBottomOf="@id/tv_personal_module">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_growth" />
<TextView
@@ -438,8 +415,8 @@
app:layout_constraintTop_toTopOf="@id/layout_growing_up">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_marriage" />
<TextView
@@ -462,8 +439,8 @@
app:layout_constraintTop_toTopOf="@+id/layout_growing_up">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_property"/>
<TextView
@@ -485,8 +462,8 @@
app:layout_constraintTop_toTopOf="@+id/layout_growing_up">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_wish"/>
<TextView
@@ -510,8 +487,8 @@
app:layout_constraintTop_toBottomOf="@+id/layout_growing_up">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_tour" />
<TextView
@@ -534,8 +511,8 @@
app:layout_constraintTop_toTopOf="@+id/layout_tourism">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_health" />
<TextView
@@ -558,8 +535,8 @@
app:layout_constraintTop_toTopOf="@+id/layout_tourism">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_honor" />
<TextView
@@ -582,8 +559,8 @@
app:layout_constraintTop_toTopOf="@+id/layout_tourism">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:background="@drawable/function_privacy" />
<TextView
@@ -597,11 +574,18 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
+ <com.google.android.material.floatingactionbutton.FloatingActionButton
+ android:id="@+id/fab_add"
+ android:layout_width="56dp"
+ android:layout_height="56dp"
+ android:layout_gravity="end | bottom"
+ android:layout_marginEnd="25dp"
+ android:layout_marginBottom="44dp"
+ android:src="@drawable/ic_add"
+ app:fabCustomSize="56dp"
+ />
- </LinearLayout>
-
-
-
+ </FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
--
Gitblit v1.9.1