From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/res/layout/activity_as_regards.xml | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 28 deletions(-)
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index ca00d89..1df3740 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/app/src/main/res/layout/activity_as_regards.xml
@@ -4,12 +4,18 @@
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.AsRegardsActivity">
<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" />
<androidx.core.widget.NestedScrollView
android:layout_width="0dp"
@@ -41,20 +47,28 @@
android:layout_height="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_12"
android:text="@string/app_version_number"
- android:textColor="@color/text_030D1C"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_iv" />
- <ImageView
- android:id="@+id/as_regards_qr_code_iv"
- android:layout_width="168dp"
- android:layout_height="168dp"
- android:layout_marginTop="@dimen/dp_34"
+ <RelativeLayout
+ android:id="@+id/qr_code_box"
+ android:layout_width="180dp"
+ android:layout_height="180dp"
+ android:layout_marginTop="34dp"
+ android:background="@drawable/code_box"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_versions_tv" />
+ app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_versions_tv">
+
+ <ImageView
+ android:id="@+id/as_regards_qr_code_iv"
+ android:layout_width="168dp"
+ android:layout_height="168dp"
+ android:layout_centerInParent="true" />
+ </RelativeLayout>
<TextView
android:id="@+id/as_regards_download_app_tv"
@@ -62,21 +76,31 @@
android:layout_height="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_12"
android:text="@string/app_scan_code_download"
- android:textColor="@color/text_030D1C"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/as_regards_qr_code_iv" />
+ app:layout_constraintTop_toBottomOf="@+id/qr_code_box" />
+
+
+ <View
+ android:id="@+id/line"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_29"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/as_regards_download_app_tv" />
+
+
<!--鐗堟湰鏇存柊-->
<RelativeLayout
android:id="@+id/as_regards_version_updating_rl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_57"
- android:layout_marginTop="@dimen/dp_29"
- 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/as_regards_download_app_tv">
+ app:layout_constraintTop_toBottomOf="@+id/line">
<TextView
android:id="@+id/as_regards_version_updating_tv"
@@ -85,8 +109,8 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/app_version_upgrade"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14"
/>
@@ -113,8 +137,14 @@
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_7C8590"
- android:textSize="@dimen/text_15" />
+ 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>
<!--鏈嶅姟鍗忚-->
@@ -122,7 +152,7 @@
android:id="@+id/service_agreement_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/as_regards_version_updating_rl">
@@ -134,8 +164,8 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/app_service_agreement"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14"
/>
@@ -154,14 +184,18 @@
android:src="@drawable/next" />
</LinearLayout>
-
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:layout_alignParentBottom="true"
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
<!--闅愮鏀跨瓥-->
<RelativeLayout
android:id="@+id/privacy_policy_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/service_agreement_rl">
@@ -173,8 +207,8 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/app_privacy_policy"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14"
/>
@@ -193,6 +227,11 @@
android:src="@drawable/next" />
</LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:layout_alignParentBottom="true"
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
<!--鑱旂郴鎴戜滑-->
@@ -200,7 +239,7 @@
android:id="@+id/contact_us_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/privacy_policy_rl">
@@ -212,8 +251,8 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/contact_us"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14"
/>
--
Gitblit v1.8.0