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 | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index 312a12c..a73a4df 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
+
+
<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
@@ -16,15 +19,16 @@
android:orientation="vertical"
>
+
<com.hjq.bar.TitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_55"
+ android:layout_height="wrap_content"
android:background="@color/color_title_bar_background"
+ app:layout_constraintTop_toTopOf="parent"
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">
@@ -148,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
--
Gitblit v1.9.1