Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 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,8 +20,8 @@
            android:layout_height="@dimen/dp_21"
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/set_nickname"
            android:textColor="@color/text_030D1C"
            android:text="--"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_15"

            />
@@ -56,8 +58,7 @@
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_9"
            android:layout_toStartOf="@+id/sll_ll_rl_right_icon_ll"
            android:text="@string/set_nickname"
            android:textColor="@color/text_7C8590"
            android:textColor="@color/text_66000000"
            android:textSize="@dimen/text_15"
            android:visibility="gone" />
        <!--底部的线,默认隐藏-->