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_update_confirm_cancel.xml | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/app/src/main/res/layout/dialog_update_confirm_cancel.xml b/app/src/main/res/layout/dialog_update_confirm_cancel.xml
index af3226c..0becbe0 100644
--- a/app/src/main/res/layout/dialog_update_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_update_confirm_cancel.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/bj_ff1c1c1e"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -26,8 +26,8 @@
android:layout_marginTop="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_20"
android:text="@string/app_discover_new_version"
- 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"
@@ -44,7 +44,7 @@
android:layout_marginBottom="@dimen/dp_0"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_030D1C"
+ android:textColor="@color/text_66FFFFFF"
app:layout_constraintBottom_toTopOf="@+id/loading_confirmation_content2_tv"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
android:layout_marginBottom="@dimen/dp_34"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_030D1C"
+ android:textColor="@color/text_66FFFFFF"
app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -75,57 +75,58 @@
<LinearLayout
android:id="@+id/dialog_confirm_bottom_line_ly"
android:layout_width="0dp"
- android:layout_height="@dimen/dp_52"
- android:layout_marginTop="@dimen/dp_16"
+ android:layout_height="@dimen/dp_41"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:layout_marginBottom="@dimen/dp_16"
android:orientation="horizontal"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/loading_confirmation_content2_tv">
-
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
+ app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:id="@+id/dialog_cancel_ly"
- android:layout_width="@dimen/dp_120"
+ android:layout_width="@dimen/dp_0"
android:layout_height="match_parent"
- android:background="@drawable/fillet_line_00000000">
+ android:layout_weight="1"
+ android:background="@drawable/bj_un_ff39383d_24"
+ android:gravity="center">
<TextView
android:id="@+id/dialog_cancel_tv"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:text="@string/loading_cancel"
- android:textColor="@color/text_FF245EC3"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
<View
- android:layout_width="@dimen/dp_8"
+ android:layout_width="9.5dp"
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/dialog_confirm_ly"
- android:layout_width="@dimen/dp_120"
+ android:layout_width="@dimen/dp_0"
android:layout_height="match_parent"
- android:background="@drawable/fillet_line_00000000">
+ android:layout_weight="1"
+ android:background="@drawable/bj_ff39383d_24"
+ android:gravity="center">
<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:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:text="@string/app_update_now"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
+
+
<!--搴曢儴闂磋窛-->
<View
android:layout_width="match_parent"
--
Gitblit v1.8.0