From 6c4848b6f999abcfc5705a3f719def3fd84fbd7b Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Mon, 5 Jun 2023 00:15:31 +0800
Subject: [PATCH] Apply applyPopAnimationsToPendingTransition globally

---
 app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt       | 6 ++++++
 app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt | 6 ------
 .../main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt  | 2 --
 .../java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt | 6 ------
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
index 7c0fbd4ef..039ae47fc 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
@@ -19,6 +19,7 @@ import android.content.res.Resources.Theme
 import android.os.Bundle
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.navigation.ActivityNavigator
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import eu.kanade.tachiyomi.util.system.isNightMode
@@ -51,4 +52,9 @@ abstract class EhActivity : AppCompatActivity() {
         super.onResume()
         window.setSecureScreen(Settings.enabledSecurity)
     }
+
+    override fun finish() {
+        super.finish()
+        ActivityNavigator.applyPopAnimationsToPendingTransition(this)
+    }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt
index 14f556c06..4904dfd90 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt
@@ -21,7 +21,6 @@ import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.ActivityNavigator
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
@@ -112,9 +111,4 @@ class SettingsActivity : EhActivity() {
     fun resetAppbarLiftStatus() {
         mAppbarLayout?.setExpanded(true)
     }
-
-    override fun finish() {
-        super.finish()
-        ActivityNavigator.applyPopAnimationsToPendingTransition(this)
-    }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
index 9fd1f43d8..d0aa38bca 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
@@ -8,7 +8,6 @@ import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.navigation.ActivityNavigator
 import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -61,7 +60,6 @@ class LoginActivity : EhActivity() {
     override fun finish() {
         super.finish()
         Settings.needSignIn = false
-        ActivityNavigator.applyPopAnimationsToPendingTransition(this)
     }
 }
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt
index 4a1d944c1..779631a27 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt
@@ -3,7 +3,6 @@ package com.hippo.ehviewer.ui.settings
 import android.os.Bundle
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.core.view.WindowCompat
-import androidx.navigation.ActivityNavigator
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -39,11 +38,6 @@ class SettingsActivity : EhActivity() {
             }
         }
     }
-
-    override fun finish() {
-        super.finish()
-        ActivityNavigator.applyPopAnimationsToPendingTransition(this)
-    }
 }
 
 const val BASE_SETTINGS_SCREEN = "Base"