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_agree_onagree.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..0dde711 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_ff222222"
app:layout_constraintBottom_toBottomOf="parent"
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