Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -47,7 +47,7 @@
                android:layout_height="@dimen/dp_20"
                android:layout_marginTop="@dimen/dp_12"
                android:text="@string/app_version_number"
                android:textColor="@color/text_E6FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_14"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -76,7 +76,7 @@
                android:layout_height="@dimen/dp_20"
                android:layout_marginTop="@dimen/dp_12"
                android:text="@string/app_scan_code_download"
                android:textColor="@color/text_E6FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_14"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -99,7 +99,7 @@
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_16"
                    android:text="@string/app_version_upgrade"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14"

                    />
@@ -127,7 +127,7 @@
                    android:layout_marginEnd="@dimen/dp_9"
                    android:layout_toStartOf="@+id/as_regards_version_updating_ll"
                    android:text="@string/app_new_version"
                    android:textColor="@color/text_66FFFFFF"
                    android:textColor="@color/text_FF5B5B5B"
                    android:textSize="@dimen/text_14" />

                <View
@@ -154,7 +154,7 @@
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_16"
                    android:text="@string/app_service_agreement"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14"

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

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

                    />