From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/res/layout/dialog_confirm_cancel.xml | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index 4f89afe..e1e75db 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_confirm_cancel.xml
@@ -13,7 +13,7 @@
android:layout_marginEnd="@dimen/dp_48"
android:layout_marginBottom="@dimen/dp_20"
android:paddingBottom="@dimen/dp_24"
- android:background="@drawable/bj_ff333738"
+ android:background="@drawable/dalog_bj_ff1c1c1c"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -26,7 +26,7 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
- 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"
@@ -37,14 +37,15 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_43"
+ android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_25"
android:gravity="center"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
+ android:lineSpacingExtra="@dimen/dp_2"
app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -70,7 +71,7 @@
android:layout_width="@dimen/dp_0"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@drawable/bj_ff555859_23_no"
+ android:background="@drawable/bj_un_ff39383d_24"
android:gravity="center">
<TextView
@@ -78,7 +79,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_cancel"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -93,7 +94,7 @@
android:layout_width="@dimen/dp_0"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@drawable/bj_ff555859_23"
+ android:background="@drawable/bj_ff39383d_24"
android:gravity="center">
<TextView
@@ -101,7 +102,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_affirm"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
--
Gitblit v1.8.0