From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/res/layout/fragment_me_line.xml | 111 +++++++++++++++++++++++++------------------------------
1 files changed, 50 insertions(+), 61 deletions(-)
diff --git a/app/src/main/res/layout/fragment_me_line.xml b/app/src/main/res/layout/fragment_me_line.xml
index a762cd9..2a8efd0 100644
--- a/app/src/main/res/layout/fragment_me_line.xml
+++ b/app/src/main/res/layout/fragment_me_line.xml
@@ -1,70 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/fragment_me_line_cl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_64"
- android:background="@color/text_F9FAFB">
+ android:layout_height="@dimen/dp_64">
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_FFFFFFFF"
+ <ImageView
+ android:id="@+id/fragment_me_line_left_icon_iv"
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
+ android:layout_marginStart="@dimen/dp_16"
+ android:src="@drawable/set"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/fragment_me_line_title_iv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_7"
+ android:text="@string/me_set"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14"
+ app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
+ app:layout_constraintStart_toEndOf="@+id/fragment_me_line_left_icon_iv"
+ app:layout_constraintTop_toTopOf="@id/fragment_me_line_left_icon_iv" />
+
+ <ImageView
+ android:id="@+id/fragment_me_line_right_icon_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_23"
+ android:src="@drawable/next"
+ app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent">
-
- <ImageView
- android:id="@+id/fragment_me_line_left_icon_iv"
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:layout_marginStart="@dimen/dp_16"
- android:src="@drawable/set"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <TextView
- android:id="@+id/fragment_me_line_title_iv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_23"
- android:layout_marginStart="@dimen/dp_7"
- android:text="@string/me_set"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_16"
- app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
- app:layout_constraintStart_toEndOf="@+id/fragment_me_line_left_icon_iv"
- app:layout_constraintTop_toTopOf="@id/fragment_me_line_left_icon_iv" />
-
- <ImageView
- android:id="@+id/fragment_me_line_right_icon_iv"
- android:layout_width="@dimen/dp_7"
- android:layout_height="@dimen/dp_12"
- android:layout_marginEnd="@dimen/dp_23"
- android:src="@drawable/next"
- app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="@id/fragment_me_line_left_icon_iv" />
- <!--鍔犲ぇ鐐瑰嚮鐑尯-->
- <TextView
- android:id="@+id/fragment_me_line_right_icon_click_iv"
- android:layout_width="@dimen/dp_80"
- android:layout_height="match_parent"
- app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="@id/fragment_me_line_left_icon_iv" />
- <!-- 闅愯棌绾挎潯-->
- <View
- android:id="@+id/fragment_me_line_v"
- android:layout_width="0dp"
- android:layout_height="0.5dp"
- android:background="@color/text_E1E1E1"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
+ app:layout_constraintTop_toTopOf="@id/fragment_me_line_left_icon_iv" />
+ <!--鍔犲ぇ鐐瑰嚮鐑尯-->
+ <TextView
+ android:id="@+id/fragment_me_line_right_icon_click_iv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="@id/fragment_me_line_left_icon_iv" />
+ <!-- 闅愯棌绾挎潯-->
+ <View
+ android:id="@+id/fragment_me_line_v"
+ android:layout_width="0dp"
+ android:layout_height="0.5dp"
+ android:background="@color/text_1AFFFFFF"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0