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/dialog_confirm_cancel.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index 3684bfa..064a519 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_ff222222"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -37,7 +37,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_25"
+ android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_25"
android:gravity="center"
@@ -45,6 +45,7 @@
android:tag="click"
android:textColor="@color/text_66FFFFFF"
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
@@ -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
--
Gitblit v1.8.0