From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/fragment_me.xml | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 9c789dd..c61cadf 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -3,29 +3,34 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/me_parent"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="match_parent">
- >
-
-
- <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:background="@drawable/default_user"
+ android:layout_width="73dp"
+ android:layout_height="73dp"
+ android:background="@drawable/default_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -35,7 +40,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 +50,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