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 | 201 +++++++++++++++++++++++++++----------------------
1 files changed, 110 insertions(+), 91 deletions(-)
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index e48aafc..3bdd176 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -2,9 +2,9 @@
<layout
-xmlns:app="http://schemas.android.com/apk/res-auto"
-xmlns:android="http://schemas.android.com/apk/res/android"
->
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ >
<data>
<variable
@@ -18,82 +18,70 @@
android:background="@color/color_normal_background"
android:orientation="vertical"
>
-
- <com.hjq.bar.TitleBar
+ <com.android.app_base.widget.ExtendTitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_55"
- android:background="@color/color_title_bar_background"
- app:layout_constraintTop_toTopOf="parent"
- android:paddingHorizontal="@dimen/dp_16"
- app:layout_constraintEnd_toEndOf="parent"
+ app:titleGravity="left"
+ app:title="鍔熻兘"
app:layout_constraintStart_toStartOf="parent"
- app:leftIcon="@null"
- app:rightIcon="@null">
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="start|center_vertical"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/menu"
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:layout_gravity="center"
- android:background="@drawable/ic_menu" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_32"
- android:text="@string/title_function"
- android:textColor="@color/white"
- android:textSize="@dimen/sp_20" />
-
- </LinearLayout>
-
+ app:layout_constraintTop_toTopOf="parent"
+ >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
+ android:layout_marginHorizontal="16dp"
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:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:layout_marginStart="@dimen/dp_16"
+ android:id="@+id/iv_operate"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginStart="16dp"
android:background="@drawable/ic_operate" />
</LinearLayout>
+ </com.android.app_base.widget.ExtendTitleBar>
- </com.hjq.bar.TitleBar>
-
-
- <ImageView
- android:id="@+id/iv_group_photo"
+ <FrameLayout
+ android:id="@+id/layout_banner"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_200"
- android:background="@drawable/margin_pic"
+ 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"
- />
+ >
+ <FrameLayout
+ android:id="@+id/layout_frame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/color_card_pink"
+ >
+ <ImageView
+ android:id="@+id/iv_banner"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ />
+ </FrameLayout>
+ </FrameLayout>
- <LinearLayout
+ <FrameLayout
+ android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintTop_toBottomOf="@id/iv_group_photo"
+ app:layout_constraintTop_toBottomOf="@id/layout_banner"
>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
@@ -143,7 +131,7 @@
android:id="@+id/layout_home_root_net"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/dp_15"
+ android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/gl_v_0.25"
@@ -151,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
@@ -174,8 +162,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="wrap_content"
+ android:layout_height="wrap_content"
android:background="@drawable/function_notes" />
<TextView
@@ -197,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
@@ -220,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
@@ -246,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
@@ -271,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
@@ -295,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
@@ -318,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
@@ -343,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
@@ -352,6 +340,30 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:text="鏀舵敮鍙拌处"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_14" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_home_devices"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="vertical"
+ app:layout_constraintEnd_toEndOf="@id/layout_family_memorabilia"
+ app:layout_constraintStart_toStartOf="@id/layout_family_memorabilia"
+ app:layout_constraintTop_toTopOf="@+id/layout_income_and_expenses">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/function_home_devices" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_4"
+ android:text="瀹跺涵璁惧"
android:textColor="@color/black"
android:textSize="@dimen/sp_14" />
</LinearLayout>
@@ -372,7 +384,7 @@
android:id="@+id/layout_growing_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/dp_15"
+ android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/gl_v_0.25"
@@ -380,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
@@ -403,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
@@ -427,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
@@ -450,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
@@ -475,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
@@ -499,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
@@ -523,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
@@ -547,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
@@ -562,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