Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

 app/src/main/res/layout/general_line.xml

@@ -15,12 +15,12 @@
        <TextView
            android:id="@+id/sll_ll_rl_name_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_21"
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/set_nickname"
            android:textColor="@color/text_030D1C"
            android:textSize="@dimen/text_15"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"

            />

@@ -52,10 +52,10 @@
            <TextView
                android:id="@+id/sll_ll_rl_right_content_tv"
                android:layout_width="wrap_content"
                android:layout_height="@dimen/dp_21"
                android:layout_height="wrap_content"
                android:gravity="end"
                android:textColor="@color/text_7C8590"
                android:textSize="@dimen/text_15"
                android:textColor="@color/text_66FFFFFF"
                android:textSize="@dimen/text_14"
                android:visibility="gone" />
        </LinearLayout>

@@ -89,7 +89,7 @@
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:layout_alignParentBottom="true"
            android:background="@color/text_E1E1E1"
            android:background="@color/text_1AFFFFFF"
            android:visibility="gone"

            />