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 | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index 312a12c..2a747d5 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -1,5 +1,9 @@
<?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">
@@ -20,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"
@@ -72,6 +82,7 @@
</com.hjq.bar.TitleBar>
+<<<<<<< Updated upstream
<ImageView
android:id="@+id/iv_group_photo"
@@ -565,5 +576,24 @@
+=======
+ <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