From 084a575a73775b22d1659fb3b3661e588f37b4bc Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期一, 27 三月 2023 17:35:15 +0800
Subject: [PATCH] 提交本地代码并且获取最新代码
---
app/src/main/res/layout/fragment_function.xml | 72 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index 1750aa7..2a747d5 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+<<<<<<< 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">
<data>
@@ -19,7 +24,13 @@
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:layout_constraintStart_toStartOf="parent"
@@ -68,13 +79,16 @@
android:background="@drawable/ic_operate" />
</LinearLayout>
+
</com.hjq.bar.TitleBar>
+
+<<<<<<< Updated upstream
<ImageView
android:id="@+id/iv_group_photo"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_200"
- android:background="@drawable/img_sakura"
+ android:background="@drawable/margin_pic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/titleBar"
@@ -147,7 +161,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_family_root_net" />
<TextView
android:layout_width="wrap_content"
@@ -170,7 +184,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_notes" />
<TextView
android:layout_width="wrap_content"
@@ -193,7 +207,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_asset" />
<TextView
android:layout_width="wrap_content"
@@ -216,7 +230,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_honor" />
<TextView
android:layout_width="wrap_content"
@@ -242,7 +256,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete"
+ android:background="@drawable/function_little_doctor"
/>
<TextView
android:layout_width="wrap_content"
@@ -267,7 +281,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete"
+ android:background="@drawable/function_cleaning"
/>
<TextView
android:layout_width="wrap_content"
@@ -291,7 +305,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_mail_list" />
<TextView
android:layout_width="wrap_content"
@@ -314,7 +328,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_pamper_pet" />
<TextView
android:layout_width="wrap_content"
@@ -339,7 +353,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_income_expense" />
<TextView
android:layout_width="wrap_content"
@@ -376,7 +390,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_growth" />
<TextView
android:layout_width="wrap_content"
@@ -399,7 +413,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_marriage" />
<TextView
android:layout_width="wrap_content"
@@ -423,7 +437,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_property"/>
<TextView
android:layout_width="wrap_content"
@@ -446,7 +460,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_wish"/>
<TextView
android:layout_width="wrap_content"
@@ -471,7 +485,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_tour" />
<TextView
android:layout_width="wrap_content"
@@ -495,7 +509,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_health" />
<TextView
android:layout_width="wrap_content"
@@ -519,7 +533,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_honor" />
<TextView
android:layout_width="wrap_content"
@@ -543,7 +557,7 @@
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_delete" />
+ android:background="@drawable/function_privacy" />
<TextView
android:layout_width="wrap_content"
@@ -561,5 +575,25 @@
+
+=======
+ <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