From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/res/layout/dialog_confirmation_tip.xml | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/app/src/main/res/layout/dialog_confirmation_tip.xml b/app/src/main/res/layout/dialog_confirmation_tip.xml
index 66ffc77..3622d70 100644
--- a/app/src/main/res/layout/dialog_confirmation_tip.xml
+++ b/app/src/main/res/layout/dialog_confirmation_tip.xml
@@ -8,7 +8,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="280dp"
- android:layout_height="229dp"
+ android:layout_height="wrap_content"
android:background="@drawable/confirmation_bj"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -27,33 +27,46 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <!--榛樿鍥炬爣-->
- <TextView
- android:id="@+id/icon_tv"
- android:layout_width="@dimen/dp_48"
- android:layout_height="@dimen/dp_48"
- android:layout_marginTop="@dimen/dp_28"
- android:background="@drawable/succeed"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/title_tv" />
- <!--鏂囨湰闅愯棌-->
- <TextView
- android:id="@+id/content_tv"
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/content_cl"
android:layout_width="0dp"
- android:layout_height="@dimen/dp_50"
+ android:layout_height="@dimen/dp_68"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_20"
- android:gravity="center"
- android:singleLine="false"
- android:textColor="@color/text_030D1C"
- android:textSize="36sp"
- android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/title_tv" />
+ app:layout_constraintTop_toBottomOf="@+id/title_tv">
+
+
+ <!--榛樿鍥炬爣-->
+ <TextView
+ android:id="@+id/icon_tv"
+ android:layout_width="@dimen/dp_48"
+ android:layout_height="@dimen/dp_48"
+ android:background="@drawable/succeed"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <!--鏂囨湰闅愯棌-->
+ <TextView
+ android:id="@+id/content_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:gravity="center"
+ android:singleLine="false"
+ android:textColor="@color/text_030D1C"
+ android:textSize="12sp"
+ android:visibility="gone"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/comfirm_tv"
@@ -67,6 +80,13 @@
android:textSize="@dimen/text_18"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/icon_tv" />
+ app:layout_constraintTop_toBottomOf="@+id/content_cl" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/comfirm_tv" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0