From 8f5fe758de9464a5118bd306814c170b768fe695 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 21 十月 2024 09:29:14 +0800
Subject: [PATCH] Merge branch 'heads/v1.4.2'
---
app/src/main/res/layout/fragment_me.xml | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index aa3b0da..e5b2113 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -5,27 +5,39 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bj">
-
- <TextView
- android:id="@+id/me_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_22"
- android:layout_marginTop="53dp"
- android:text="@string/me"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_18"
+ <!--澶撮儴鏍囩-->
+ <RelativeLayout
+ android:id="@+id/title_cl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_38"
+ android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ android:id="@+id/me_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="@string/me"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_18" />
+
+
+ </RelativeLayout>
+
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/fragment_me_icon_parent_cl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/dp_31"
+ android:layout_marginTop="@dimen/dp_13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/me_title_tv">
+ app:layout_constraintTop_toBottomOf="@+id/title_cl">
<ImageView
android:id="@+id/fragment_me_icon_iv"
@@ -49,9 +61,9 @@
<ImageView
android:id="@+id/fragment_me_user_name_next_iv"
- android:layout_width="7dp"
- android:layout_height="@dimen/dp_12"
- android:layout_marginStart="@dimen/text_15"
+ android:layout_width="16dp"
+ android:layout_height="@dimen/dp_16"
+ android:layout_marginStart="3dp"
android:src="@drawable/next"
app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_name_tv"
app:layout_constraintStart_toEndOf="@+id/fragment_me_user_name_tv"
@@ -67,6 +79,16 @@
app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv"
app:layout_constraintTop_toBottomOf="@+id/fragment_me_user_name_tv" />
+
+ <ImageView
+ android:id="@+id/fragment_me_user_role_next_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:layout_marginStart="3dp"
+ android:src="@drawable/next"
+ app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_role_tv"
+ app:layout_constraintStart_toEndOf="@+id/fragment_me_user_role_tv"
+ app:layout_constraintTop_toTopOf="@+id/fragment_me_user_role_tv" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -74,7 +96,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_48"
+ android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/bj_13fffffff"
android:orientation="vertical"
@@ -87,12 +109,12 @@
layout="@layout/fragment_me_line" />
<include
- android:id="@+id/fragment_me_line_asregards_il"
- layout="@layout/fragment_me_line" />
-
- <include
android:id="@+id/fragment_me_line_set_il"
layout="@layout/fragment_me_line" />
+ <!--鍏充簬-->
+ <include
+ android:id="@+id/fragment_me_line_asregards_il"
+ layout="@layout/fragment_me_line" />
</LinearLayout>
--
Gitblit v1.8.0