From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/res/layout/fragment_me.xml | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 6bf98eb..e3bfa61 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -4,27 +4,33 @@
android:id="@+id/me_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@drawable/bj">
- >
-
-
- <include
- android:id="@+id/toolbar_top_fragment_me_rl"
- layout="@layout/toolbar_top_view_52" />
+ <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"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<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_39"
+ android:layout_marginTop="@dimen/dp_31"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_me_rl">
+ app:layout_constraintTop_toBottomOf="@+id/me_title_tv">
<ImageView
android:id="@+id/fragment_me_icon_iv"
- android:layout_width="69dp"
- android:layout_height="69dp"
+ android:layout_width="73dp"
+ android:layout_height="73dp"
android:background="@drawable/default_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -35,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="25dp"
android:layout_marginTop="@dimen/dp_16"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv"
@@ -45,9 +51,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
+ android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_48"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:background="@drawable/bj_13fffffff"
android:orientation="vertical"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl">
--
Gitblit v1.8.0