From 21953fd79cd978db3d59bea4f33c824b69028375 Mon Sep 17 00:00:00 2001
From: Hingbong Lo <hingbonglo@gmail.com>
Date: Tue, 7 Apr 2020 15:28:44 +0800
Subject: [PATCH] =?UTF-8?q?TextDialog=20=E6=B7=BB=E5=8A=A0=E5=80=92?=
 =?UTF-8?q?=E6=95=B0=E5=AE=8C=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD,=20changelog=20=E5=80=92=E6=95=B0=E5=AE=8C=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hingbong <hingbonglo@gmail.com>
---
 app/src/main/java/io/legado/app/ui/main/MainActivity.kt   | 2 +-
 .../java/io/legado/app/ui/widget/dialog/TextDialog.kt     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt
index a7a2b3209..181ec0330 100644
--- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt
@@ -78,7 +78,7 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
             putPrefInt(PreferKey.versionCode, App.INSTANCE.versionCode)
             if (!BuildConfig.DEBUG) {
                 val log = String(assets.open("updateLog.md").readBytes())
-                TextDialog.show(supportFragmentManager, log, TextDialog.MD, 5000)
+                TextDialog.show(supportFragmentManager, log, TextDialog.MD, 5000, true)
             }
         }
     }
diff --git a/app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt b/app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt
index 9c1c75d5e..dc6ba868b 100644
--- a/app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt
@@ -23,7 +23,8 @@ class TextDialog : BaseDialogFragment() {
             fragmentManager: FragmentManager,
             content: String?,
             mode: Int = 0,
-            time: Long = 0
+            time: Long = 0,
+            autoClose: Boolean = false
         ) {
             TextDialog().apply {
                 val bundle = Bundle()
@@ -32,6 +33,7 @@ class TextDialog : BaseDialogFragment() {
                 bundle.putLong("time", time)
                 arguments = bundle
                 isCancelable = false
+                this.autoClose = autoClose
             }.show(fragmentManager, "textDialog")
         }
 
@@ -39,6 +41,8 @@ class TextDialog : BaseDialogFragment() {
 
     private var time = 0L
 
+    private var autoClose: Boolean = false
+
     override fun onStart() {
         super.onStart()
         val dm = DisplayMetrics()
@@ -79,6 +83,7 @@ class TextDialog : BaseDialogFragment() {
                     if (time <= 0) {
                         view.post {
                             dialog?.setCancelable(true)
+                            if (autoClose) dialog?.cancel()
                         }
                     }
                 }
@@ -86,6 +91,7 @@ class TextDialog : BaseDialogFragment() {
         } else {
             view.post {
                 dialog?.setCancelable(true)
+                if (autoClose) dialog?.cancel()
             }
         }
     }