Update

Author: Zenlua

app/src/main/java/com/tool/tree/ActionPageOnline.kt

@@ -14,6 +14,7 @@ import android.view.MenuItem
 import android.view.View
 import android.webkit.*
 import android.widget.Toast
+import androidx.activity.addCallback
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
@@ -64,13 +65,13 @@ class ActionPageOnline : AppCompatActivity() {
 
         binding.krOnlineWebview.setLayerType(View.LAYER_TYPE_HARDWARE, null)
 
-        PredictiveBackHelper(this, binding.root) {
+        onBackPressedDispatcher.addCallback(this) {
             if (binding.krOnlineWebview.canGoBack()) {
                 binding.krOnlineWebview.goBack()
             } else {
                 finish()
             }
-        }.register(onBackPressedDispatcher)
+        }
 
         loadIntentData()
     }

app/src/main/java/com/tool/tree/ActivityFileSelector.kt

@@ -12,6 +12,7 @@ import com.omarea.common.ui.ProgressBarDialog
 import com.tool.tree.databinding.ActivityFileSelectorBinding
 import com.tool.tree.ui.AdapterFileSelector
 import java.io.File
+import androidx.activity.addCallback
 import com.google.android.material.snackbar.Snackbar;
 
 class ActivityFileSelector : AppCompatActivity() {
@@ -48,12 +49,11 @@ class ActivityFileSelector : AppCompatActivity() {
             finish()
         }
 
-        PredictiveBackHelper(this, binding.root) {
-            if (adapterFileSelector?.goParent() != true) {
-                setResult(RESULT_CANCELED, Intent())
-                finish()
-            }
-        }.register(onBackPressedDispatcher)
+        onBackPressedDispatcher.addCallback(this) {
+            if (adapterFileSelector?.goParent() == true) return@addCallback
+            setResult(RESULT_CANCELED, Intent())
+            finish()
+        }
 
         intent.extras?.run {
             if (containsKey("extension")) {

app/src/main/java/com/tool/tree/MainActivity.kt

@@ -11,6 +11,7 @@ import android.widget.ArrayAdapter
 import android.widget.CheckBox
 import android.widget.TextView
 import android.widget.Toast
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.ListPopupWindow
 import androidx.appcompat.widget.Toolbar
@@ -29,7 +30,6 @@ import com.omarea.krscript.ui.ParamsFileChooserRender
 import com.tool.tree.databinding.ActivityMainBinding
 import com.tool.tree.ui.MainPagerAdapter
 import com.tool.tree.ui.TabIconHelper
-import com.tool.tree.ui.TabZoomFadePageTransformer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -65,22 +65,21 @@ class MainActivity : AppCompatActivity() {
         initAdapter()
         loadTabs()
 
-        PredictiveBackHelper(this, binding.root) {
+        onBackPressedDispatcher.addCallback(this) {
             startService(Intent(this@MainActivity, WakeLockService::class.java).apply {
                 action = WakeLockService.ACTION_END_WAKELOCK
             })
+            // isEnabled = false
+            // onBackPressedDispatcher.onBackPressed()
             finish()
-        }.register(onBackPressedDispatcher)
+        }
     }
 
     private fun initAdapter() {
         if (!::adapter.isInitialized) {
             adapter = MainPagerAdapter(this)
             binding.viewPager.adapter = adapter
             binding.viewPager.offscreenPageLimit = 4
-            // Dùng hiệu ứng "Zoom + Fade" (thu nhỏ/mờ + phóng to/hiện rõ trong lúc trượt)
-            // khi chuyển tab, thay cho hiệu ứng slide thuần kiểu AOSP.
-            binding.viewPager.setPageTransformer(TabZoomFadePageTransformer())
         }
     }
 

app/src/main/java/com/tool/tree/PredictiveBackHelper.kt

@@ -16,6 +16,7 @@ import android.view.ViewGroup
 import android.widget.HorizontalScrollView
 import android.widget.ImageButton
 import android.widget.Toast
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.ViewCompat
@@ -112,7 +113,7 @@ class TextEditorActivity : AppCompatActivity() {
         toolbar.setNavigationOnClickListener { attemptClose() }
         setupUndoRedoButtons(toolbar)
 
-        PredictiveBackHelper(this, binding.root) { attemptClose() }.register(onBackPressedDispatcher)
+        onBackPressedDispatcher.addCallback(this) { attemptClose() }
 
         filePath = intent.getStringExtra(EXTRA_FILE) ?: ""
         if (filePath.isEmpty()) {