Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -4,19 +4,25 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFECECEC"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.ContactUsActivity">

    <include
        android:id="@+id/toolbar_top_rl"
        layout="@layout/toolbar_top_view_44" />
        layout="@layout/toolbar_top_view_44"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_38"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <RelativeLayout
        android:id="@+id/wechat_id_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:layout_marginTop="@dimen/dp_12"
        android:background="@color/text_FFFFFFFF"
        android:layout_marginTop="@dimen/dp_10"
        android:background="@color/text_FF1C1C1E"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
@@ -28,8 +34,8 @@
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/wechat_id"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14"

            />

@@ -40,8 +46,14 @@
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_16"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_14" />

        <View
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:layout_alignParentBottom="true"
            android:background="@color/text_1AFFFFFF" />

    </RelativeLayout>

@@ -49,7 +61,7 @@
        android:id="@+id/idemail_address_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:background="@color/text_FFFFFFFF"
        android:background="@color/text_FF1C1C1E"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/wechat_id_rl">
@@ -61,8 +73,8 @@
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/email_address"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />

        <TextView
            android:id="@+id/email_address_content_tv"
@@ -71,8 +83,8 @@
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_16"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_14" />

    </RelativeLayout>