From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/res/layout/activity_as_regards.xml | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index babe0ed..4668c36 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/app/src/main/res/layout/activity_as_regards.xml
@@ -15,8 +15,8 @@
android:id="@+id/as_regards_icon_iv"
android:layout_width="53.5dp"
android:layout_height="53.5dp"
- android:src="@drawable/logo"
android:layout_marginTop="@dimen/dp_29"
+ android:src="@drawable/logo"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
@@ -53,7 +53,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/as_regards_qr_code_iv" />
-
+ <!--鐗堟湰鏇存柊-->
<RelativeLayout
android:id="@+id/as_regards_version_updating_rl"
android:layout_width="match_parent"
@@ -103,7 +103,7 @@
android:textSize="@dimen/text_15" />
</RelativeLayout>
-
+ <!--鏈嶅姟鍗忚-->
<RelativeLayout
android:id="@+id/service_agreement_rl"
android:layout_width="match_parent"
@@ -142,7 +142,7 @@
</RelativeLayout>
-
+ <!--闅愮鏀跨瓥-->
<RelativeLayout
android:id="@+id/privacy_policy_rl"
android:layout_width="match_parent"
@@ -181,6 +181,45 @@
</RelativeLayout>
+ <!--鑱旂郴鎴戜滑-->
+ <RelativeLayout
+ android:id="@+id/contact_us_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_57"
+ android:background="@color/text_FFFFFFFF"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/service_agreement_rl">
+
+ <TextView
+ android:id="@+id/contact_us_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_21"
+ 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"
+
+ />
+
+ <LinearLayout
+ android:id="@+id/contact_us_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_13">
+ <!--鏍囧噯鍥炬爣-->
+ <ImageView
+ android:id="@+id/contact_us_ll_right_next_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/next" />
+ </LinearLayout>
+
+
+ </RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0