From a1c880c476327032fe174af8c80d6f78a590dae9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 07 二月 2025 16:35:22 +0800
Subject: [PATCH] Merge branch '1.5.1' into dev
---
app/src/main/res/layout/activity_account_and_security.xml | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/app/src/main/res/layout/activity_account_and_security.xml b/app/src/main/res/layout/activity_account_and_security.xml
index 0394358..ad7d46a 100644
--- a/app/src/main/res/layout/activity_account_and_security.xml
+++ b/app/src/main/res/layout/activity_account_and_security.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_FF161616"
+ android:background="@color/text_FF000000"
tools:context=".ui.me.AccountAndSecurityActivity">
<include
@@ -47,25 +47,34 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/set_account_mail_il" />
- <!--鏆傛椂闅愯棌娉ㄩ攢璐﹀彿缁勪欢-->
- <TextView
- android:id="@+id/set_account_close"
+ <include
+ android:id="@+id/set_account_close_il"
+ layout="@layout/set_line"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_52"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
- android:layout_marginBottom="@dimen/dp_55"
- android:background="@drawable/backgruond_ff6b6b"
- android:gravity="center"
- android:text="@string/set_close_account"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_18"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_height="@dimen/dp_57"
+ android:layout_marginTop="@dimen/dp_10"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/set_change_psw_il" />
- />
+<!-- <!–鏆傛椂闅愯棌娉ㄩ攢璐﹀彿缁勪欢–>-->
+<!-- <TextView-->
+<!-- android:id="@+id/set_account_close"-->
+<!-- android:layout_width="match_parent"-->
+<!-- android:layout_height="@dimen/dp_52"-->
+<!-- android:layout_marginStart="@dimen/dp_20"-->
+<!-- android:layout_marginEnd="@dimen/dp_20"-->
+<!-- android:layout_marginBottom="@dimen/dp_55"-->
+<!-- android:background="@drawable/backgruond_ff6b6b"-->
+<!-- android:gravity="center"-->
+<!-- android:text="@string/set_close_account"-->
+<!-- android:textColor="@color/text_FFFFFFFF"-->
+<!-- android:textSize="@dimen/text_18"-->
+<!-- app:layout_constraintBottom_toBottomOf="parent"-->
+<!-- app:layout_constraintEnd_toEndOf="parent"-->
+<!-- app:layout_constraintStart_toStartOf="parent"-->
+
+<!-- />-->
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0