From b17b9aa59bae6d03055f14d937821655dfaffa1f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 29 一月 2024 23:27:08 +0800
Subject: [PATCH] 1、调整成长经历页面\n2、删除婚姻个人信息
---
app/src/main/res/layout/fragment_function.xml | 282 ++++++++++++++++++++++++++++---------------------------
1 files changed, 143 insertions(+), 139 deletions(-)
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index 2a747d5..1712a99 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<<<<<<< Updated upstream
+
+
<layout
-=======
-<layout xmlns:tools="http://schemas.android.com/tools"
->>>>>>> Stashed changes
xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:android="http://schemas.android.com/apk/res/android">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ >
<data>
<variable
@@ -16,92 +15,73 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
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"
-<<<<<<< Updated upstream
- android:background="@color/color_title_bar_background"
-=======
- android:id="@+id/title_t_bar"
- app:layout_constraintTop_toTopOf="parent"
- android:background="@color/color_title_background"
->>>>>>> Stashed changes
- android:paddingHorizontal="@dimen/dp_16"
- app:layout_constraintEnd_toEndOf="parent"
+ app:titleGravity="left"
+ app:title="鍔熻兘"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="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>
-
+ >
<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>
-
-<<<<<<< Updated upstream
-
- <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="?attr/pageBackgroundColor"
+ >
+ <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"
@@ -138,20 +118,19 @@
android:id="@+id/tv_core_module"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_20"
+ android:layout_marginStart="20dp"
+ android:layout_marginTop="20dp"
android:text="鏍稿績妯″潡"
android:textColor="@color/black"
android:textSize="@dimen/sp_18"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
<LinearLayout
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"
@@ -159,9 +138,10 @@
app:layout_constraintTop_toBottomOf="@id/tv_core_module">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_family_root_net" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionFamilyRootNet"
+ />
<TextView
android:layout_width="wrap_content"
@@ -182,9 +162,9 @@
app:layout_constraintTop_toTopOf="@id/layout_home_root_net">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_notes" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="?attr/icFunctionNotes" />
<TextView
android:layout_width="wrap_content"
@@ -205,9 +185,9 @@
app:layout_constraintTop_toTopOf="@id/layout_home_root_net">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_asset" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionAsset" />
<TextView
android:layout_width="wrap_content"
@@ -228,9 +208,9 @@
app:layout_constraintTop_toTopOf="@id/layout_home_root_net">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_honor" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionHonor" />
<TextView
android:layout_width="wrap_content"
@@ -254,9 +234,9 @@
>
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_little_doctor"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionLittleDoctor"
/>
<TextView
android:layout_width="wrap_content"
@@ -279,9 +259,9 @@
>
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_cleaning"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionCleaning"
/>
<TextView
android:layout_width="wrap_content"
@@ -303,9 +283,10 @@
app:layout_constraintTop_toTopOf="@id/layout_little_doctor">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_mail_list" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionMailList"
+ />
<TextView
android:layout_width="wrap_content"
@@ -326,9 +307,10 @@
app:layout_constraintTop_toTopOf="@id/layout_little_doctor">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_pamper_pet" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionPamperPet"
+ />
<TextView
android:layout_width="wrap_content"
@@ -351,15 +333,41 @@
app:layout_constraintTop_toBottomOf="@+id/layout_little_doctor">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_income_expense" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionIncomeExpense"
+ />
<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>
+
+ <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="?attr/icFunctionHomeDevices"
+ />
+
+ <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>
@@ -380,7 +388,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"
@@ -388,9 +396,10 @@
app:layout_constraintTop_toBottomOf="@id/tv_personal_module">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_growth" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionGrowth"
+ />
<TextView
android:layout_width="wrap_content"
@@ -411,9 +420,10 @@
app:layout_constraintTop_toTopOf="@id/layout_growing_up">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_marriage" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionMarriage"
+ />
<TextView
android:layout_width="wrap_content"
@@ -435,9 +445,10 @@
app:layout_constraintTop_toTopOf="@+id/layout_growing_up">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_property"/>
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionProperty"
+ />
<TextView
android:layout_width="wrap_content"
@@ -458,9 +469,10 @@
app:layout_constraintTop_toTopOf="@+id/layout_growing_up">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_wish"/>
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionWish"
+ />
<TextView
android:layout_width="wrap_content"
@@ -483,9 +495,10 @@
app:layout_constraintTop_toBottomOf="@+id/layout_growing_up">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_tour" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionTour"
+ />
<TextView
android:layout_width="wrap_content"
@@ -507,9 +520,10 @@
app:layout_constraintTop_toTopOf="@+id/layout_tourism">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_health" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionHealth"
+ />
<TextView
android:layout_width="wrap_content"
@@ -531,9 +545,10 @@
app:layout_constraintTop_toTopOf="@+id/layout_tourism">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_honor" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionCertificate"
+ />
<TextView
android:layout_width="wrap_content"
@@ -555,9 +570,10 @@
app:layout_constraintTop_toTopOf="@+id/layout_tourism">
<ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/function_privacy" />
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="?attr/icFunctionPrivacy"
+ />
<TextView
android:layout_width="wrap_content"
@@ -570,30 +586,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>
-
-
-
-=======
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- >
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- >
- <ImageView
- android:id="@+id/imageView_m/argin_pic"
- android:layout_width="@dimen/dp_360"
- android:layout_height="@dimen/dp_202"
- app:srcCompat="@drawable/margin_pic"
-</LinearLayout>
- </LinearLayout>
->>>>>>> Stashed changes
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
--
Gitblit v1.9.1