From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/res/layout/dialog_agree_onagree.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/dialog_agree_onagree.xml b/app/src/main/res/layout/dialog_agree_onagree.xml
index 9c78e39..a24f6bf 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/bj_ff1c1c1e"
+ android:background="@drawable/dalog_bj_ff1c1c1c"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -26,7 +26,7 @@
android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
- android:textColor="@color/text_030D1C"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +42,7 @@
android:layout_marginBottom="@dimen/dp_34"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_030D1C"
+ android:textColor="@color/text_FFACACAC"
app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -68,7 +68,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@drawable/bj_ff555859_no">
+ android:background="@drawable/bj_un_ff39383d_24">
<TextView
android:id="@+id/dialog_cancel_tv"
@@ -76,7 +76,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/loading_on_agree"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -91,7 +91,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@drawable/bj_ff555859">
+ android:background="@drawable/bj_ff39383d_24">
<TextView
android:id="@+id/dialog_confirm_tv"
@@ -99,7 +99,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/loading_agree"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
--
Gitblit v1.8.0