From ab93c2275023518bbeff2d548e76c57d02fa7d16 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Thu, 5 Mar 2026 12:09:05 +0800
Subject: [PATCH] Hide Modules and Superuser tabs when Magisk is not activated

Filter out disabled tabs from the pager and navigation bar instead
of showing them as greyed-out, preventing swipe access to unavailable
screens.

Made-with: Cursor
---
 .../com/topjohnwu/magisk/ui/MainScreen.kt     | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/MainScreen.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/MainScreen.kt
index 58c32b0f7..94709ccf5 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/MainScreen.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/MainScreen.kt
@@ -74,16 +74,26 @@ enum class Tab(val titleRes: Int, val iconRes: Int) {
 @Composable
 fun MainScreen(initialTab: Int = Tab.HOME.ordinal) {
     val navigator = LocalNavigator.current
-    val pagerState = rememberPagerState(initialPage = initialTab, pageCount = { Tab.entries.size })
+    val visibleTabs = remember {
+        Tab.entries.filter { tab ->
+            when (tab) {
+                Tab.SUPERUSER -> Info.showSuperUser
+                Tab.MODULES -> Info.env.isActive && LocalModule.loaded()
+                else -> true
+            }
+        }
+    }
+    val initialPage = visibleTabs.indexOf(Tab.entries[initialTab]).coerceAtLeast(0)
+    val pagerState = rememberPagerState(initialPage = initialPage, pageCount = { visibleTabs.size })
 
     Box(modifier = Modifier.fillMaxSize()) {
         HorizontalPager(
             state = pagerState,
             modifier = Modifier.fillMaxSize(),
-            beyondViewportPageCount = Tab.entries.size - 1,
+            beyondViewportPageCount = visibleTabs.size - 1,
             userScrollEnabled = true,
         ) { page ->
-            when (Tab.entries[page]) {
+            when (visibleTabs[page]) {
                 Tab.HOME -> {
                     val vm: HomeViewModel = viewModel(factory = VMFactory)
                     val installVm: InstallViewModel = viewModel(factory = VMFactory)
@@ -130,6 +140,7 @@ fun MainScreen(initialTab: Int = Tab.HOME.ordinal) {
 
         FloatingNavigationBar(
             pagerState = pagerState,
+            visibleTabs = visibleTabs,
             modifier = Modifier.align(Alignment.BottomCenter)
         )
     }
@@ -138,6 +149,7 @@ fun MainScreen(initialTab: Int = Tab.HOME.ordinal) {
 @Composable
 private fun FloatingNavigationBar(
     pagerState: PagerState,
+    visibleTabs: List<Tab>,
     modifier: Modifier = Modifier
 ) {
     val scope = rememberCoroutineScope()
@@ -156,18 +168,12 @@ private fun FloatingNavigationBar(
         horizontalArrangement = Arrangement.SpaceEvenly,
         verticalAlignment = Alignment.CenterVertically
     ) {
-        Tab.entries.forEachIndexed { index, tab ->
-            val selected = pagerState.currentPage == index
-            val enabled = when (tab) {
-                Tab.SUPERUSER -> Info.showSuperUser
-                Tab.MODULES -> Info.env.isActive && LocalModule.loaded()
-                else -> true
-            }
+        visibleTabs.forEachIndexed { index, tab ->
             FloatingNavItem(
                 icon = ImageVector.vectorResource(tab.iconRes),
                 label = stringResource(tab.titleRes),
-                selected = selected,
-                enabled = enabled,
+                selected = pagerState.currentPage == index,
+                enabled = true,
                 onClick = { scope.launch { pagerState.animateScrollToPage(index) } },
                 modifier = Modifier.weight(1f)
             )