From 7dc010749b909d23114279a693b4731350fcb80b Mon Sep 17 00:00:00 2001
From: Steven Xu <stevenxxiu@gmail.com>
Date: Sun, 16 Mar 2025 18:48:25 +1100
Subject: [PATCH] feat: remove animation settings button transition

---
 .../magisk/arch/NavigationActivity.kt         | 21 ++++++++++++-------
 .../topjohnwu/magisk/ui/home/HomeFragment.kt  | 10 ++++++++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt b/app/apk/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt
index 0d6adabbc..ec337e137 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt
@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.arch
 
+import android.content.ContentResolver
 import android.view.KeyEvent
 import androidx.databinding.ViewDataBinding
 import androidx.navigation.NavController
@@ -33,13 +34,19 @@ abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Bindin
         }
     }
 
-    fun NavDirections.navigate() {
-        if (AccessibilityUtils.isAnimationEnabled(contentResolver)) {
-            navigation.navigate(this)
-        } else {
-            navigation.navigate(this, navOptions {
-                anim { enter = 0; exit = 0; popEnter = 0; popExit = 0 }
-            })
+    companion object {
+        fun navigate(directions: NavDirections, navigation: NavController, cr: ContentResolver) {
+            if (AccessibilityUtils.isAnimationEnabled(cr)) {
+                navigation.navigate(directions)
+            } else {
+                navigation.navigate(directions, navOptions {
+                    anim { enter = 0; exit = 0; popEnter = 0; popExit = 0 }
+                })
+            }
         }
     }
+
+    fun NavDirections.navigate() {
+        navigate(this, navigation, contentResolver)
+    }
 }
diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
index 0c5a173aa..1b5a76f7b 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
@@ -17,6 +17,8 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.DownloadEngine
 import com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
 import com.topjohnwu.magisk.core.R as CoreR
+import androidx.navigation.findNavController
+import com.topjohnwu.magisk.arch.NavigationActivity
 
 class HomeFragment : BaseFragment<FragmentHomeMd2Binding>(), MenuProvider {
 
@@ -68,7 +70,13 @@ class HomeFragment : BaseFragment<FragmentHomeMd2Binding>(), MenuProvider {
     override fun onMenuItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_settings ->
-                HomeFragmentDirections.actionHomeFragmentToSettingsFragment().navigate()
+                activity?.let {
+                    NavigationActivity.navigate(
+                        HomeFragmentDirections.actionHomeFragmentToSettingsFragment(),
+                        it.findNavController(R.id.main_nav_host),
+                        it.contentResolver,
+                    )
+                }
             R.id.action_reboot -> activity?.let { RebootMenu.inflate(it).show() }
             else -> return super.onOptionsItemSelected(item)
         }