manager: make action execution screen have the same behavior as Magisk

based on pr https://github.com/tiann/KernelSU/pull/2321 * Magisk's behavior: Hide Bottom Navbar, Show close button if failed or success and removed automatic exit when module execution success.
2025-05-19 21:15:53 +07:00
parent d408c9f4bf
commit cfdbba45c3
5 changed files with 69 additions and 28 deletions
--- a/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt
+++ b/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt
@@ -24,6 +24,7 @@ import androidx.navigation.compose.rememberNavController
 import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.animations.NavHostAnimatedDestinationStyle
 import com.ramcosta.composedestinations.generated.NavGraphs
+import com.ramcosta.composedestinations.generated.destinations.ExecuteModuleActionScreenDestination
 import com.ramcosta.composedestinations.spec.NavHostGraphSpec
 import com.ramcosta.composedestinations.spec.RouteOrDirection
 import com.ramcosta.composedestinations.utils.isRouteOnBackStackAsState
@@ -39,6 +40,10 @@ import androidx.core.content.edit
 import com.sukisu.ultra.ui.theme.CardConfig.cardElevation
 import com.sukisu.ultra.ui.webui.initPlatform
 import java.util.Locale
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.navigation.compose.currentBackStackEntryAsState

 class MainActivity : ComponentActivity() {
    private inner class ThemeChangeContentObserver(
@@ -94,6 +99,7 @@ class MainActivity : ComponentActivity() {
        // 确保应用正确的语言设置
        applyLanguageSetting()

+        // 应用自定义 DPI
        applyCustomDpi()

        // Enable edge to edge
@@ -152,6 +158,12 @@ class MainActivity : ComponentActivity() {
            KernelSUTheme {
                val navController = rememberNavController()
                val snackBarHostState = remember { SnackbarHostState() }
+                val currentDestination = navController.currentBackStackEntryAsState().value?.destination
+
+                val showBottomBar = when (currentDestination?.route) {
+                    ExecuteModuleActionScreenDestination.route -> false // Hide for ExecuteModuleActionScreen
+                    else -> true
+                }

                // pre-init platform to faster start WebUI X activities
                LaunchedEffect(Unit) {
@@ -159,7 +171,15 @@ class MainActivity : ComponentActivity() {
                }

                Scaffold(
-                    bottomBar = { BottomBar(navController) },
+                    bottomBar = {
+                        AnimatedVisibility(
+                            visible = showBottomBar,
+                            enter = slideInVertically(initialOffsetY = { it }) + fadeIn(),
+                            exit = slideOutVertically(targetOffsetY = { it }) + fadeOut()
+                        ) {
+                            BottomBar(navController)
+                        }
+                    },
                    contentWindowInsets = WindowInsets(0, 0, 0, 0)
                ) { innerPadding ->
                    CompositionLocalProvider(
--- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/ExecuteModuleAction.kt
+++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/ExecuteModuleAction.kt
@@ -1,15 +1,22 @@
 package com.sukisu.ultra.ui.screen

 import android.os.Environment
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.only
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Save
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExtendedFloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -30,7 +37,6 @@ import androidx.compose.ui.input.key.key
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.dropUnlessResumed
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
@@ -55,7 +61,11 @@ fun ExecuteModuleActionScreen(navigator: DestinationsNavigator, moduleId: String
    val snackBarHost = LocalSnackbarHost.current
    val scope = rememberCoroutineScope()
    val scrollState = rememberScrollState()
-    var actionResult: Boolean
+    var isActionRunning by rememberSaveable { mutableStateOf(true) }
+
+    BackHandler(enabled = isActionRunning) {
+        // Disable back button if action is running
+    }

    LaunchedEffect(Unit) {
        if (text.isNotEmpty()) {
@@ -76,20 +86,17 @@ fun ExecuteModuleActionScreen(navigator: DestinationsNavigator, moduleId: String
                onStderr = {
                    logContent.append(it).append("\n")
                }
-            ).let {
-                actionResult = it
+            )
        }
-        }
-        if (actionResult) navigator.popBackStack()
+        isActionRunning = false
    }

    Scaffold(
        topBar = {
            TopBar(
-                onBack = dropUnlessResumed {
-                    navigator.popBackStack()
-                },
+                isActionRunning = isActionRunning,
                onSave = {
+                    if (!isActionRunning) {
                        scope.launch {
                            val format = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault())
                            val date = format.format(Date())
@@ -101,8 +108,21 @@ fun ExecuteModuleActionScreen(navigator: DestinationsNavigator, moduleId: String
                            snackBarHost.showSnackbar("Log saved to ${file.absolutePath}")
                        }
                    }
+                }
            )
        },
+        floatingActionButton = {
+            if (!isActionRunning) {
+                ExtendedFloatingActionButton(
+                    text = { Text(text = stringResource(R.string.close)) },
+                    icon = { Icon(Icons.Filled.Close, contentDescription = null) },
+                    onClick = {
+                        navigator.popBackStack()
+                    }
+                )
+            }
+        },
+        contentWindowInsets = WindowInsets.safeDrawing,
        snackbarHost = { SnackbarHost(snackBarHost) }
    ) { innerPadding ->
        KeyEventBlocker {
@@ -130,16 +150,14 @@ fun ExecuteModuleActionScreen(navigator: DestinationsNavigator, moduleId: String

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-private fun TopBar(onBack: () -> Unit = {}, onSave: () -> Unit = {}) {
+private fun TopBar(isActionRunning: Boolean, onSave: () -> Unit = {}) {
    TopAppBar(
        title = { Text(stringResource(R.string.action)) },
-        navigationIcon = {
-            IconButton(
-                onClick = onBack
-            ) { Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null) }
-        },
        actions = {
-            IconButton(onClick = onSave) {
+            IconButton(
+                onClick = onSave,
+                enabled = !isActionRunning
+            ) {
                Icon(
                    imageVector = Icons.Filled.Save,
                    contentDescription = stringResource(id = R.string.save_log),
--- a/manager/app/src/main/res/values-in/strings.xml
+++ b/manager/app/src/main/res/values-in/strings.xml
@@ -112,6 +112,7 @@
    <string name="install_inactive_slot">Instal ke slot nonaktif (setelah OTA)</string>
    <string name="grant_root_failed">Gagal memberikan akses root!</string>
    <string name="open">Buka</string>
+    <string name="close">Tutup</string>
    <string name="settings_check_update">Cek terbaru</string>
    <string name="settings_check_update_summary">Cek terbaru setiap membuka aplikasi</string>
    <string name="settings_uninstall_permanent_message">Hapus permanen KernelSU (root dan modul).</string>
--- a/manager/app/src/main/res/values-zh-rCN/strings.xml
+++ b/manager/app/src/main/res/values-zh-rCN/strings.xml
@@ -113,6 +113,7 @@
    <string name="grant_root_failed">获取 root 失败！</string>
    <string name="action">执行</string>
    <string name="open">打开</string>
+    <string name="close">关闭</string>
    <string name="enable_web_debugging">启用 WebView 调试</string>
    <string name="enable_web_debugging_summary">可用于调试 WebUI 。请仅在需要时启用。</string>
    <string name="direct_install">直接安装（推荐）</string>
--- a/manager/app/src/main/res/values/strings.xml
+++ b/manager/app/src/main/res/values/strings.xml
@@ -115,6 +115,7 @@
    <string name="grant_root_failed">Failed to grant root!</string>
    <string name="action">Action</string>
    <string name="open">Open</string>
+    <string name="close">Close</string>
    <string name="enable_web_debugging">Enable WebView debugging</string>
    <string name="enable_web_debugging_summary">Can be used to debug WebUI. Please enable only when needed.</string>
    <string name="direct_install">Direct install (Recommended)</string>