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/set_line.xml | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/app/src/main/res/layout/set_line.xml b/app/src/main/res/layout/set_line.xml
index 55c2aff..6aba884 100644
--- a/app/src/main/res/layout/set_line.xml
+++ b/app/src/main/res/layout/set_line.xml
@@ -1,6 +1,7 @@
<?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/parent_cl"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -8,6 +9,7 @@
android:id="@+id/sll_ll_name_rl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_57"
+ android:background="@color/text_FFFFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -18,33 +20,48 @@
android:layout_height="@dimen/dp_21"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
- android:text="@string/set_nickname"
+ android:text="--"
android:textColor="@color/text_030D1C"
android:textSize="@dimen/text_15"
/>
- <ImageView
- android:id="@+id/sll_ll_rl_right_icon_iv"
- android:layout_width="@dimen/dp_16"
- android:layout_height="@dimen/dp_16"
+ <LinearLayout
+ android:id="@+id/sll_ll_rl_right_icon_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_13"
- android:src="@drawable/next" />
+ android:layout_marginEnd="@dimen/dp_13">
+ <!--鏍囧噯鍥炬爣-->
+ <ImageView
+ android:id="@+id/sll_ll_rl_right_next_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/next" />
+ <!--鐗规畩鍥炬爣-->
+ <ImageView
+ android:id="@+id/sll_ll_rl_right_switch_iv"
+ android:layout_width="@dimen/dp_57"
+ android:layout_height="@dimen/dp_31"
+ android:src="@drawable/switch_on_off"
+ android:visibility="gone" />
+
+ </LinearLayout>
+
+ <!--鍙宠竟澶囨敞鍐呭,榛樿闅愯棌-->
<TextView
android:id="@+id/sll_ll_rl_right_content_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_21"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_9"
- android:layout_toStartOf="@+id/sll_ll_rl_right_icon_iv"
- android:text="@string/set_nickname"
+ android:layout_toStartOf="@+id/sll_ll_rl_right_icon_ll"
android:textColor="@color/text_7C8590"
android:textSize="@dimen/text_15"
android:visibility="gone" />
-
+ <!--搴曢儴鐨勭嚎,榛樿闅愯棌-->
<View
android:id="@+id/line_v"
android:layout_width="match_parent"
--
Gitblit v1.8.0