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 | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index e48aafc..a73a4df 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -19,10 +19,11 @@
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"
@@ -151,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