From 1ad33847e84874d4fec803190e92b8e3f49a59fe Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 28 三月 2023 19:00:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_android
---
app/src/main/res/layout/fragment_function.xml | 44 +++++++++-----------------------------------
1 files changed, 9 insertions(+), 35 deletions(-)
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index 2a747d5..a73a4df 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:app="http://schemas.android.com/apk/res-auto"
+xmlns:android="http://schemas.android.com/apk/res/android"
+>
<data>
<variable
@@ -20,21 +19,16 @@
android:orientation="vertical"
>
+
<com.hjq.bar.TitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_55"
-<<<<<<< Updated upstream
+ android:layout_height="wrap_content"
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"
- app:layout_constraintTop_toTopOf="parent"
app:leftIcon="@null"
app:rightIcon="@null">
@@ -82,7 +76,6 @@
</com.hjq.bar.TitleBar>
-<<<<<<< Updated upstream
<ImageView
android:id="@+id/iv_group_photo"
@@ -159,8 +152,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="wrap_content"
+ android:layout_height="wrap_content"
android:background="@drawable/function_family_root_net" />
<TextView
@@ -576,24 +569,5 @@
-=======
- <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