Remove predictive back support

Reland after #1322 resolved
This commit is contained in:
FooIbar committed 2023-08-11 13:48:51 +08:00
1 parent 09dd200655
commit 8c9cdf46db
3 files changed
+6 -16

No files matched your search

-1
View File
@@ -23,7 +23,6 @@
android:allowBackup="true"
android:appCategory="image"
android:dataExtractionRules="@xml/data_extraction_rules"
android:enableOnBackInvokedCallback="true"
android:fullBackupContent="@xml/backup_scheme"
android:hasFragileUserData="true"
android:icon="@mipmap/ic_launcher"
@@ -191,11 +191,7 @@ class MainActivity : EhActivity() {
supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
navController = navHostFragment.navController
if (!EhUtils.needSignedIn()) setNavGraph()
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
binding.drawView.addDrawerListener(
mDrawerOnBackPressedCallback,
)
}
binding.drawView.addDrawerListener(mDrawerOnBackPressedCallback)
binding.navView.setupWithNavController(navController)
// Trick: Tweak NavigationUI to disable multiple backstack
@@ -323,10 +319,8 @@ class MainActivity : EhActivity() {
super.onResume()
lifecycleScope.launch {
delay(300)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
mDrawerOnBackPressedCallback.remove()
onBackPressedDispatcher.addCallback(mDrawerOnBackPressedCallback)
}
mDrawerOnBackPressedCallback.remove()
onBackPressedDispatcher.addCallback(mDrawerOnBackPressedCallback)
checkClipboardUrl()
}
}
@@ -1,6 +1,5 @@
package com.hippo.ehviewer.ui.scene
import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
import android.view.MenuItem
@@ -103,10 +102,8 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
onCreateViewWithToolbar(inflater, binding.root, savedInstanceState)
// This has to be placed after onCreateViewWithToolbar() since
// callbacks are invoked in the reverse order in which they are added
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
binding.searchview.addTransitionListener(mSearchViewOnBackPressedCallback)
requireActivity().onBackPressedDispatcher.addCallback(mSearchViewOnBackPressedCallback)
}
binding.searchview.addTransitionListener(mSearchViewOnBackPressedCallback)
requireActivity().onBackPressedDispatcher.addCallback(mSearchViewOnBackPressedCallback)
binding.appbar.bringToFront()
return binding.root
}
@@ -125,7 +122,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
override fun onDestroyView() {
super.onDestroyView()
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) mSearchViewOnBackPressedCallback.remove()
mSearchViewOnBackPressedCallback.remove()
_binding = null
}