@@ -35,67 +35,45 @@ fun MagiskApp(initialSection: String? = null) {
3535 }
3636
3737 var currentScreen by remember { mutableStateOf(initialScreen) }
38- var navBackStack by remember { mutableStateOf(listOf<MainScreen >()) }
39-
40- val isRootScreen = currentScreen in listOf (
41- MainScreen .HOME , MainScreen .MODULES , MainScreen .SUPERUSER , MainScreen .LOG
42- )
4338
4439 MagiskTheme {
4540 Scaffold (
4641 bottomBar = {
47- if (isRootScreen) {
48- NavigationBar {
42+ NavigationBar {
4943 NavigationBarItem (
5044 selected = currentScreen == MainScreen .HOME ,
51- onClick = {
52- currentScreen = MainScreen .HOME
53- navBackStack = emptyList()
54- },
45+ onClick = { currentScreen = MainScreen .HOME },
5546 icon = Icons .Rounded .Home ,
5647 label = stringResource(CoreR .string.section_home)
5748 )
5849 NavigationBarItem (
5950 selected = currentScreen == MainScreen .MODULES ,
6051 enabled = Info .env.isActive,
61- onClick = {
62- currentScreen = MainScreen .MODULES
63- navBackStack = emptyList()
64- },
52+ onClick = { currentScreen = MainScreen .MODULES },
6553 icon = Icons .Rounded .Extension ,
6654 label = stringResource(CoreR .string.modules)
6755 )
6856 NavigationBarItem (
6957 selected = currentScreen == MainScreen .SUPERUSER ,
7058 enabled = Info .showSuperUser,
71- onClick = {
72- currentScreen = MainScreen .SUPERUSER
73- navBackStack = emptyList()
74- },
59+ onClick = { currentScreen = MainScreen .SUPERUSER },
7560 icon = Icons .Rounded .Security ,
7661 label = stringResource(CoreR .string.superuser)
7762 )
7863 NavigationBarItem (
7964 selected = currentScreen == MainScreen .LOG ,
80- onClick = {
81- currentScreen = MainScreen .LOG
82- navBackStack = emptyList()
83- },
65+ onClick = { currentScreen = MainScreen .LOG },
8466 icon = Icons .Rounded .BugReport ,
8567 label = stringResource(CoreR .string.logs)
8668 )
8769 NavigationBarItem (
8870 selected = currentScreen == MainScreen .SETTINGS ,
89- onClick = {
90- navBackStack = navBackStack + MainScreen .HOME
91- currentScreen = MainScreen .SETTINGS
92- },
71+ onClick = { currentScreen = MainScreen .SETTINGS },
9372 icon = Icons .Rounded .Settings ,
9473 label = stringResource(CoreR .string.settings)
9574 )
9675 }
9776 }
98- }
9977 ) { paddingValues ->
10078 when (currentScreen) {
10179 MainScreen .HOME -> HomeScreen (paddingValues = paddingValues)
0 commit comments