From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/activity_as_regards.xml | 101 +++++++++-----------------------------------------
1 files changed, 19 insertions(+), 82 deletions(-)
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index 0d49555..56e573b 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/app/src/main/res/layout/activity_as_regards.xml
@@ -4,81 +4,18 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/bj"
+ android:background="@color/text_FF000000"
tools:context=".ui.me.AsRegardsActivity">
- <RelativeLayout
- android:id="@+id/top_bar_view"
+ <include
+ android:id="@+id/toolbar_top_rl"
+ layout="@layout/toolbar_top_view_44"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_54"
- android:layout_marginTop="@dimen/dp_44"
- android:orientation="horizontal"
+ 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/top_content_view"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_44"
- android:layout_marginTop="@dimen/dp_10"
- android:orientation="horizontal">
- <!--1.杩斿洖鎸夐挳 澧炲ぇ鐐瑰嚮鍖哄煙-->
- <LinearLayout
- android:id="@+id/top_back_ll"
- android:layout_width="@dimen/dp_56"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/top_left_iv"
- android:layout_width="@dimen/dp_30"
- android:layout_height="@dimen/dp_30"
- android:layout_gravity="center"
- android:layout_marginStart="@dimen/dp_16"
- android:scaleType="centerInside"
- android:src="@drawable/back" />
- </LinearLayout>
-
- <!--2.鏍囬鏂囨湰-->
- <TextView
- android:id="@+id/top_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:layout_marginLeft="@dimen/dp_60"
- android:layout_marginRight="@dimen/dp_60"
- android:gravity="center"
- android:maxLines="1"
- android:text=""
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_18" />
-
- <!--3.鏇村鎸夐挳 榛樿闅愯棌-->
- <LinearLayout
- android:id="@+id/top_more_btn"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_alignParentEnd="true"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:src="@drawable/add"
- android:visibility="gone">
-
- <ImageView
- android:id="@+id/top_more_iv"
- android:layout_width="@dimen/dp_28"
- android:layout_height="@dimen/dp_28"
- android:layout_marginStart="20dp"
- android:layout_marginEnd="20dp"
- android:adjustViewBounds="true"
- android:scaleType="centerInside" />
-
- </LinearLayout>
-
- </RelativeLayout>
- </RelativeLayout>
+ app:layout_constraintTop_toTopOf="parent" />
<androidx.core.widget.NestedScrollView
android:layout_width="0dp"
@@ -88,7 +25,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/top_bar_view">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -110,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"
@@ -139,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"
@@ -150,7 +87,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_57"
android:layout_marginTop="@dimen/dp_29"
- android:background="@color/text_FF333738"
+ 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">
@@ -162,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"
/>
@@ -190,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
@@ -205,7 +142,7 @@
android:id="@+id/service_agreement_rl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_57"
- android:background="@color/text_FF333738"
+ 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">
@@ -217,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"
/>
@@ -248,7 +185,7 @@
android:id="@+id/privacy_policy_rl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_57"
- android:background="@color/text_FF333738"
+ android:background="@color/text_FF1C1C1E"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/service_agreement_rl">
@@ -260,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"
/>
@@ -292,7 +229,7 @@
android:id="@+id/contact_us_rl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_57"
- android:background="@color/text_FF333738"
+ android:background="@color/text_FF1C1C1E"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/privacy_policy_rl">
@@ -304,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"
/>
--
Gitblit v1.8.0