From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/res/layout/dialog_confirm_cancel.xml | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index 16fe379..ecc307d 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_confirm_cancel.xml
@@ -12,7 +12,8 @@
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_48"
android:layout_marginBottom="@dimen/dp_20"
- android:background="@drawable/loading_confirmation_bj"
+ android:paddingBottom="@dimen/dp_24"
+ android:background="@drawable/dalog_bj_ff222222"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -25,8 +26,8 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_18"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -36,11 +37,15 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_34"
+ android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:layout_marginBottom="@dimen/dp_34"
+ android:layout_marginBottom="@dimen/dp_25"
+ android:gravity="center"
android:singleLine="false"
- android:textColor="@color/text_030D1C"
+ android:tag="click"
+ android:textColor="@color/text_FF5B5B5B"
+ 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"
@@ -52,7 +57,9 @@
<LinearLayout
android:id="@+id/dialog_confirm_bottom_line_ly"
android:layout_width="0dp"
- android:layout_height="@dimen/dp_52"
+ android:layout_height="@dimen/dp_41"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -64,39 +71,39 @@
android:layout_width="@dimen/dp_0"
android:layout_height="match_parent"
android:layout_weight="1"
+ android:background="@drawable/bj_un_ff39383d_24"
android:gravity="center">
<TextView
android:id="@+id/dialog_cancel_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/loading_鍙栨秷"
- android:textColor="@color/text_7C8590"
- android:textSize="@dimen/text_18" />
+ android:text="@string/loading_cancel"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
<View
- android:layout_width="0.5dp"
- android:layout_height="@dimen/dp_23"
- android:layout_gravity="center"
- android:background="@color/text_E1E1E1" />
+ android:layout_width="9.5dp"
+ android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/dialog_confirm_ly"
android:layout_width="@dimen/dp_0"
android:layout_height="match_parent"
android:layout_weight="1"
+ android:background="@drawable/bj_ff39383d_24"
android:gravity="center">
<TextView
android:id="@+id/dialog_confirm_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/loading_纭"
- android:textColor="@color/text_FF245EC3"
- android:textSize="@dimen/text_18" />
+ android:text="@string/loading_affirm"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
--
Gitblit v1.8.0