Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-29 22:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: remove animation settings button transition

Browse Source
This commit is contained in:
Steven Xu 2025-03-16 18:48:25 +11:00 committed by John Wu
parent 8e8d013b1b
commit 7dc010749b
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/apk/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt
View File

@ -1,5 +1,6 @@
package com.topjohnwu.magisk.arch package com.topjohnwu.magisk.arch
import android.content.ContentResolver
import android.view.KeyEvent import android.view.KeyEvent
import androidx.databinding.ViewDataBinding import androidx.databinding.ViewDataBinding
import androidx.navigation.NavController import androidx.navigation.NavController
@ -33,13 +34,19 @@ abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Bindin
} }
} }
fun NavDirections.navigate() { companion object {
if (AccessibilityUtils.isAnimationEnabled(contentResolver)) { fun navigate(directions: NavDirections, navigation: NavController, cr: ContentResolver) {
navigation.navigate(this) if (AccessibilityUtils.isAnimationEnabled(cr)) {
} else { navigation.navigate(directions)
navigation.navigate(this, navOptions { } else {
anim { enter = 0; exit = 0; popEnter = 0; popExit = 0 } navigation.navigate(directions, navOptions {
}) anim { enter = 0; exit = 0; popEnter = 0; popExit = 0 }
})
}
} }
} }
fun NavDirections.navigate() {
navigate(this, navigation, contentResolver)
}
} }

10
app/apk/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
View File

@ -17,6 +17,8 @@ import com.topjohnwu.magisk.core.Info
import com.topjohnwu.magisk.core.download.DownloadEngine import com.topjohnwu.magisk.core.download.DownloadEngine
import com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding import com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
import com.topjohnwu.magisk.core.R as CoreR import com.topjohnwu.magisk.core.R as CoreR
import androidx.navigation.findNavController
import com.topjohnwu.magisk.arch.NavigationActivity
class HomeFragment : BaseFragment<FragmentHomeMd2Binding>(), MenuProvider { class HomeFragment : BaseFragment<FragmentHomeMd2Binding>(), MenuProvider {
@ -68,7 +70,13 @@ class HomeFragment : BaseFragment<FragmentHomeMd2Binding>(), MenuProvider {
override fun onMenuItemSelected(item: MenuItem): Boolean { override fun onMenuItemSelected(item: MenuItem): Boolean {
when (item.itemId) { when (item.itemId) {
R.id.action_settings -> 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() } R.id.action_reboot -> activity?.let { RebootMenu.inflate(it).show() }
else -> return super.onOptionsItemSelected(item) else -> return super.onOptionsItemSelected(item)
} }