Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -34,7 +34,7 @@
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/wechat_id"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14"

            />
@@ -46,7 +46,7 @@
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_16"
            android:textColor="@color/text_66FFFFFF"
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_14" />

        <View
@@ -73,8 +73,8 @@
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/email_address"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />

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

    </RelativeLayout>