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_agree_onagree.xml | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/app/src/main/res/layout/dialog_agree_onagree.xml b/app/src/main/res/layout/dialog_agree_onagree.xml
index 9d853d9..1df2794 100644
--- a/app/src/main/res/layout/dialog_agree_onagree.xml
+++ b/app/src/main/res/layout/dialog_agree_onagree.xml
@@ -12,7 +12,7 @@
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:background="@drawable/dalog_bj_ff222222"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -23,7 +23,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/dp_25"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_24"
+ android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
android:textColor="@color/text_030D1C"
@@ -37,7 +37,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
- 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:singleLine="false"
@@ -55,22 +55,20 @@
android:id="@+id/dialog_confirm_bottom_line_ly"
android:layout_width="0dp"
android:layout_height="@dimen/dp_52"
+ android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loading_confirmation_content_tv">
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
-
<LinearLayout
android:id="@+id/dialog_cancel_ly"
- android:layout_width="@dimen/dp_120"
+ android:layout_width="0dp"
android:layout_height="match_parent"
- android:background="@drawable/fillet_line_00000000">
+ android:layout_weight="1"
+ android:background="@drawable/bj_un_ff39383d_24">
<TextView
android:id="@+id/dialog_cancel_tv"
@@ -78,8 +76,8 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/loading_on_agree"
- android:textColor="@color/text_FF245EC3"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
@@ -90,19 +88,19 @@
<LinearLayout
android:id="@+id/dialog_confirm_ly"
- android:layout_width="@dimen/dp_120"
+ android:layout_width="0dp"
android:layout_height="match_parent"
- android:background="@drawable/fillet_line_00000000">
+ android:layout_weight="1"
+ android:background="@drawable/bj_ff39383d_24">
<TextView
android:id="@+id/dialog_confirm_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/checked"
android:gravity="center"
android:text="@string/loading_agree"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
<!--搴曢儴闂磋窛-->
--
Gitblit v1.8.0