From cedc402455cb859cb9d747290e9d4cc41cc665f4 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 15 Nov 2023 22:03:21 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E5=A4=8D=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/widget/dialog/CommonLoadingDialog.java | 16 ++++-----
 app/src/main/res/layout/dialog_loading.xml    | 33 +++++++++++--------
 .../res/layout/layout_progress_dialog.xml     |  3 +-
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonLoadingDialog.java b/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonLoadingDialog.java
index 4ca020b33..08e7c5de9 100644
--- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonLoadingDialog.java
+++ b/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonLoadingDialog.java
@@ -23,7 +23,7 @@ public class CommonLoadingDialog extends BaseDialog {
     private String msg = ResUtil.getString(R.string.widget_dialog_commonloadingdialog_01);
 
     private TextView tvTip;
-    private SVGAImageView loading;
+//    private SVGAImageView loading;
 
     public CommonLoadingDialog(Context context, String tip) {
         super(context, R.style.dialog);
@@ -40,7 +40,7 @@ public class CommonLoadingDialog extends BaseDialog {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_progress_dialog);
-        loading = (SVGAImageView) findViewById(R.id.dialog_loading) ;
+//        loading = (SVGAImageView) findViewById(R.id.dialog_loading) ;
         tvTip = (TextView) findViewById(R.id.tv_tip);
         tvTip.setText(msg);
     }
@@ -64,10 +64,10 @@ public class CommonLoadingDialog extends BaseDialog {
         return this;
     }
 
-    @Override
-    public void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        loading.stopAnimation();
-        loading.clear();
-    }
+//    @Override
+//    public void onDetachedFromWindow() {
+//        super.onDetachedFromWindow();
+//        loading.stopAnimation();
+//        loading.clear();
+//    }
 }
diff --git a/app/src/main/res/layout/dialog_loading.xml b/app/src/main/res/layout/dialog_loading.xml
index 35bed2826..3e4609681 100644
--- a/app/src/main/res/layout/dialog_loading.xml
+++ b/app/src/main/res/layout/dialog_loading.xml
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="120dp"
+    android:layout_height="120dp"
     android:layout_gravity="center"
+    android:gravity="center_horizontal"
+    android:background="@drawable/toast_bg"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-    <com.opensource.svgaplayer.SVGAImageView
-        android:id="@+id/dialog_loading"
-        android:layout_width="240dp"
-        android:layout_height="160dp"
-        app:autoPlay="true"
-        app:source="svga/loading.svga" />
-
-<!--    <ProgressBar-->
+<!--    <com.opensource.svgaplayer.SVGAImageView-->
+<!--        android:id="@+id/dialog_loading"-->
 <!--        android:layout_width="240dp"-->
-<!--        android:layout_height="wrap_content"/>-->
+<!--        android:layout_height="160dp"-->
+<!--        app:autoPlay="true"-->
+<!--        app:source="svga/loading.svga" />-->
+
+    <ProgressBar
+        android:id="@+id/loading_progress"
+        style="@style/progressDialog"
+        android:layout_width="35dp"
+        android:layout_height="37.5dp"
+        android:layout_marginTop="30dp"
+        android:layout_centerHorizontal="true"
+        android:indeterminate="false" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -23,7 +30,7 @@
         android:layout_gravity="center"
         android:layout_marginTop="16dp"
         android:text="@string/layout_dialog_loading_01"
-        android:textColor="#ffc9bcf2"
+        android:textColor="#FFFFFF"
         android:textSize="16sp" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/layout_progress_dialog.xml b/app/src/main/res/layout/layout_progress_dialog.xml
index 70fd1b588..cac4370cb 100644
--- a/app/src/main/res/layout/layout_progress_dialog.xml
+++ b/app/src/main/res/layout/layout_progress_dialog.xml
@@ -7,8 +7,7 @@
     android:layout_gravity="center"
     android:gravity="center_horizontal"
     android:background="@drawable/toast_bg"
-    android:orientation="vertical"
-    tools:background="@color/black_transparent_10">
+    android:orientation="vertical">
 
 <!--    <com.opensource.svgaplayer.SVGAImageView-->
 <!--        android:id="@+id/dialog_loading"-->