From 425f485b9538e74923ca635c61321c08a761dc50 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Tue, 28 Apr 2026 11:56:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E5=B0=86=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E5=9B=BE=E6=A0=87=E6=9B=BF=E6=8D=A2=E4=B8=BA?= =?UTF-8?q?=20VectorDrawable=EF=BC=8C=E6=B8=85=E7=90=86=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shuwei/dish/match/dialog/CommonDialog.kt | 11 ---- .../com/shuwei/dish/match/ui/InitActivity.kt | 4 -- app/src/main/res/drawable/loading.xml | 52 +++++++++++++++++++ app/src/main/res/layout/activity_init.xml | 6 +-- 4 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 app/src/main/res/drawable/loading.xml diff --git a/app/src/main/java/com/shuwei/dish/match/dialog/CommonDialog.kt b/app/src/main/java/com/shuwei/dish/match/dialog/CommonDialog.kt index af9feef..1494a67 100644 --- a/app/src/main/java/com/shuwei/dish/match/dialog/CommonDialog.kt +++ b/app/src/main/java/com/shuwei/dish/match/dialog/CommonDialog.kt @@ -134,14 +134,3 @@ open class CommonDialog( } } } - -open class SafeDialog(activity: Activity, @StyleRes themeResId: Int) : - Dialog(activity, themeResId) { - private val weakContext = WeakReference(activity) - - override fun show() { - weakContext.get()?.let { - if (!it.isFinishing && !it.isDestroyed) super.show() - } - } -} diff --git a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt index afa1076..9c0293e 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt @@ -2,13 +2,10 @@ package com.shuwei.dish.match.ui import android.annotation.SuppressLint import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.os.SystemClock -import android.view.KeyEvent import android.view.animation.RotateAnimation import androidx.activity.addCallback -import androidx.core.graphics.toColorInt import androidx.lifecycle.lifecycleScope import com.shuwei.dish.match.base.BaseActivity import com.shuwei.dish.match.base.BaseApp @@ -21,7 +18,6 @@ import com.shuwei.dish.match.utils.AddressUtil import com.shuwei.dish.match.utils.AppUtil import com.shuwei.dish.match.utils.NetworkUtils import com.shuwei.dish.match.utils.SpTool -import com.shuwei.dish.match.utils.Weigher2 import com.shuwei.dish.match.utils.WeightUtil import com.shuwei.dish.match.utils.ext.gone import com.shuwei.dish.match.utils.ext.startActivity diff --git a/app/src/main/res/drawable/loading.xml b/app/src/main/res/drawable/loading.xml new file mode 100644 index 0000000..7828371 --- /dev/null +++ b/app/src/main/res/drawable/loading.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_init.xml b/app/src/main/res/layout/activity_init.xml index cbd06cd..0ddf51d 100644 --- a/app/src/main/res/layout/activity_init.xml +++ b/app/src/main/res/layout/activity_init.xml @@ -75,9 +75,9 @@