From 5b06b2b9917fbe0c35d21d1b2b54a7de1ec3da29 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:06:44 +0800
Subject: [PATCH] Merge branch '1.4.4'
---
app/src/main/res/layout/fragment_me.xml | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 6517fe0..0f1d15e 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -33,7 +33,8 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/me"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+
android:textSize="@dimen/text_18" />
@@ -78,7 +79,7 @@
android:gravity="end|center_vertical"
android:paddingStart="@dimen/dp_0"
android:paddingEnd="@dimen/dp_3"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<ImageView
@@ -108,7 +109,7 @@
android:gravity="end|center_vertical"
android:paddingStart="@dimen/dp_0"
android:paddingEnd="@dimen/dp_3"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -133,13 +134,14 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl">
<!--璁惧璋冭瘯-->
+ <!--涓昏处鍙锋墠鏄剧ず-->
<include
android:id="@+id/fragment_me_line_device_debug_il"
layout="@layout/fragment_me_line" />
- <!--涓昏处鍙锋墠鏄剧ず-->
- <include
- android:id="@+id/fragment_me_line_user_management_il"
- layout="@layout/fragment_me_line" />
+
+<!-- <include-->
+<!-- android:id="@+id/fragment_me_line_user_management_il"-->
+<!-- layout="@layout/fragment_me_line" />-->
<include
android:id="@+id/fragment_me_line_set_il"
@@ -148,6 +150,9 @@
<include
android:id="@+id/fragment_me_line_asregards_il"
layout="@layout/fragment_me_line" />
+ <include
+ android:id="@+id/fragment_me_line_help_il"
+ layout="@layout/fragment_me_line" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
--
Gitblit v1.8.0