From f91ef956cf482ed4ce0885dc47794b783c20c415 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 30 四月 2025 10:14:43 +0800
Subject: [PATCH] Merge branch '1.2.0' into 1.5.1_google
---
app/src/main/res/layout/loading_alert.xml | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/layout/loading_alert.xml b/app/src/main/res/layout/loading_alert.xml
index d718362..fa17019 100644
--- a/app/src/main/res/layout/loading_alert.xml
+++ b/app/src/main/res/layout/loading_alert.xml
@@ -1,20 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="@dimen/dp_100"
- android:layout_height="85dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:background="@drawable/bg_load_dialog"
android:maxWidth="300dp"
android:minWidth="@dimen/dp_100">
- <ProgressBar
+ <!-- <ProgressBar-->
+ <!-- android:id="@+id/load_pb"-->
+ <!-- android:layout_width="40dp"-->
+ <!-- android:layout_height="40dp"-->
+ <!-- android:layout_marginTop="@dimen/dp_10"-->
+ <!-- android:indeterminateDrawable="@drawable/progress_small"-->
+ <!-- app:layout_constraintEnd_toEndOf="parent"-->
+ <!-- app:layout_constraintStart_toStartOf="parent"-->
+ <!-- app:layout_constraintTop_toTopOf="parent" />-->
+
+ <ImageView
android:id="@+id/load_pb"
- android:layout_width="40dp"
- android:layout_height="40dp"
+ android:layout_width="80dp"
+ android:layout_height="37.5dp"
android:layout_marginTop="@dimen/dp_10"
- android:indeterminateDrawable="@drawable/progress_small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -29,11 +37,12 @@
android:layout_marginBottom="@dimen/dp_10"
android:maxLines="1"
android:text="@string/device_loading"
- android:textColor="@color/text_FFFFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12"
app:layout_constraintEnd_toEndOf="@+id/load_pb"
app:layout_constraintStart_toStartOf="@+id/load_pb"
app:layout_constraintTop_toBottomOf="@+id/load_pb"
+ android:visibility="gone"
/>
--
Gitblit v1.8.0