From 9daa05ef02c74a65fddf3a3c210429095ad36f62 Mon Sep 17 00:00:00 2001
From: nullArrayList <99822064+nullArrayList@users.noreply.github.com>
Date: Wed, 8 Nov 2023 19:06:41 +0800
Subject: [PATCH] Enable Predictive Back (#214)

* Enable Predictive Back

Tested with UP1A.231005.007, no bugs

* Fix Wrong SDK behaviour

---------

Co-authored-by: Lokesh Gidra <lokeshgidra@google.com>
---
 app/src/main/AndroidManifest.xml                    |  4 ++--
 .../com/hippo/ehviewer/ui/scene/SearchBarScene.kt   | 13 ++++++++-----
 .../main/kotlin/com/hippo/ehviewer/util/SDKUtils.kt |  1 +
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b3215d34e..f029150a1 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
         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"
@@ -135,8 +136,7 @@
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <activity
-            android:name=".ui.WebViewActivity" />
+        <activity android:name=".ui.WebViewActivity" />
 
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/SearchBarScene.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
index 79ea47cb9..4db3bdb93 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
@@ -45,6 +45,7 @@ import com.hippo.ehviewer.ui.setMD3Content
 import com.hippo.ehviewer.util.AnimationUtils
 import com.hippo.ehviewer.util.SimpleAnimatorListener
 import com.hippo.ehviewer.util.applyNavigationBarsPadding
+import com.hippo.ehviewer.util.isAtLeastT
 import com.jamal.composeprefs3.ui.ifNotNullThen
 import com.jamal.composeprefs3.ui.ifTrueThen
 import dev.chrisbanes.insetter.applyInsetter
@@ -119,10 +120,12 @@ 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
-        binding.searchview.addTransitionListener(mSearchViewOnBackPressedCallback)
-        requireActivity().onBackPressedDispatcher.addCallback(mSearchViewOnBackPressedCallback)
+        if (!isAtLeastT) {
+            // This has to be placed after onCreateViewWithToolbar() since
+            // callbacks are invoked in the reverse order in which they are added
+            binding.searchview.addTransitionListener(mSearchViewOnBackPressedCallback)
+            requireActivity().onBackPressedDispatcher.addCallback(mSearchViewOnBackPressedCallback)
+        }
         binding.appbar.bringToFront()
         fabLayout.applyNavigationBarsPadding()
         fastScroller.applyNavigationBarsPadding()
@@ -149,7 +152,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
 
     override fun onDestroyView() {
         super.onDestroyView()
-        mSearchViewOnBackPressedCallback.remove()
+        if (!isAtLeastT) mSearchViewOnBackPressedCallback.remove()
         binding.root.removeAllViews()
         _binding = null
     }
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/util/SDKUtils.kt b/app/src/main/kotlin/com/hippo/ehviewer/util/SDKUtils.kt
index 6fc7eaf3a..2ef238743 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/util/SDKUtils.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/util/SDKUtils.kt
@@ -8,5 +8,6 @@ val isAtLeastO = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
 val isAtLeastP = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
 val isAtLeastQ = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
 val isAtLeastR = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+val isAtLeastT = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
 val isAtLeastU = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
 val isAtLeastSExtension7 = isAtLeastR && SdkExtensions.getExtensionVersion(Build.VERSION_CODES.S) >= 7