From 4f12f1e3543fce41e71ae9e21a782f8d9cb41947 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 10:45:11 +0800
Subject: [PATCH] Merge branch '1.3.1' into dev
---
app/src/main/res/layout/dialog_confirm_cancel.xml | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index ecc307d..6e77d40 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_confirm_cancel.xml
@@ -12,8 +12,8 @@
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_48"
android:layout_marginBottom="@dimen/dp_20"
- android:paddingBottom="@dimen/dp_24"
- android:background="@drawable/dalog_bj_ff222222"
+ android:paddingBottom="@dimen/dp_25"
+ android:background="@drawable/dalog_bj_ff1c1c1c"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -27,7 +27,7 @@
android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
android:textColor="@color/text_FFACACAC"
- android:textSize="@dimen/text_14"
+ android:textSize="@dimen/text_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -37,13 +37,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_15"
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_FF5B5B5B"
+ 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"
@@ -53,7 +53,14 @@
/>
-
+ <View
+ android:layout_height="26dp"
+ android:layout_width="match_parent"
+ app:layout_constraintTop_toBottomOf="@+id/loading_confirmation_content_tv"
+ app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
<LinearLayout
android:id="@+id/dialog_confirm_bottom_line_ly"
android:layout_width="0dp"
--
Gitblit v1.8.0