Apply applyPopAnimationsToPendingTransition globally

This commit is contained in:
tarsin committed 2023-06-05 00:15:31 +08:00
1 parent b6c36c20b6
commit 6c4848b6f9
4 files changed
+6 -14

No files matched your search

@@ -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)
}
}
@@ -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)
}
}
@@ -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)
}
}
@@ -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"