From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'

---
 app/src/main/res/layout/dialog_confirm_cancel.xml |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 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 45e544d..d29cfee 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_confirm_cancel.xml
@@ -6,13 +6,14 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/loading_confirmation_cl"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_48"
         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_E6FFFFFF"
+            android:textSize="@dimen/text_14"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -36,14 +37,14 @@
             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_25"
             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:tag="click"
-            android:textColor="@color/text_222222"
-            android:textSize="@dimen/text_18"
+            android:textColor="@color/text_66FFFFFF"
+            android:textSize="@dimen/text_14"
             app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -55,7 +56,9 @@
         <LinearLayout
             android:id="@+id/dialog_confirm_bottom_line_ly"
             android:layout_width="0dp"
-            android:layout_height="@dimen/dp_68"
+            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"
@@ -67,6 +70,7 @@
                 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
@@ -74,23 +78,22 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/loading_cancel"
-                    android:textColor="@color/text_7C8590"
-                    android:textSize="@dimen/text_18" />
+                    android:textColor="@color/text_E6FFFFFF"
+                    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
@@ -98,8 +101,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/loading_affirm"
-                    android:textColor="@color/text_FF245EC3"
-                    android:textSize="@dimen/text_18" />
+                    android:textColor="@color/text_E6FFFFFF"
+                    android:textSize="@dimen/text_14" />
             </LinearLayout>
         </LinearLayout>
 

--
Gitblit v1.8.0