diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/component/SwitchItem.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/component/SwitchItem.kt index c95cbfd3..ed9d06ae 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/component/SwitchItem.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/component/SwitchItem.kt @@ -70,7 +70,7 @@ fun SwitchItem( text = it, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 3, + maxLines = Int.MAX_VALUE, overflow = TextOverflow.Ellipsis ) } diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt index 04e9ba4b..80d220b8 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt @@ -110,7 +110,7 @@ fun SettingScreen(navigator: DestinationsNavigator) { } } - // 设置分组卡片 - 配置 + // 配置 Card( modifier = Modifier .fillMaxWidth() diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt index 5970f0ba..540e418e 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt @@ -166,7 +166,6 @@ fun SuperUserScreen(navigator: DestinationsNavigator) { snackbarHost = { SnackbarHost(snackBarHostState) }, contentWindowInsets = WindowInsets.safeDrawing.only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal), bottomBar = { - // 批量操作按钮,直接放在底部栏 AnimatedVisibility( visible = viewModel.showBatchActions && viewModel.selectedApps.isNotEmpty(), enter = slideInVertically(initialOffsetY = { it }), @@ -181,15 +180,13 @@ fun SuperUserScreen(navigator: DestinationsNavigator) { modifier = Modifier .fillMaxWidth() .padding(16.dp), - horizontalArrangement = Arrangement.spacedBy(16.dp) + horizontalArrangement = Arrangement.SpaceEvenly ) { OutlinedButton( onClick = { - // 修改为重新赋值为空集合 viewModel.selectedApps = emptySet() viewModel.showBatchActions = false }, - modifier = Modifier.weight(1f), colors = ButtonDefaults.outlinedButtonColors( contentColor = MaterialTheme.colorScheme.primary ) @@ -197,9 +194,9 @@ fun SuperUserScreen(navigator: DestinationsNavigator) { Icon( imageVector = Icons.Filled.Close, contentDescription = null, - modifier = Modifier.size(18.dp) + modifier = Modifier.size(16.dp) ) - Spacer(modifier = Modifier.width(8.dp)) + Spacer(modifier = Modifier.width(6.dp)) Text(stringResource(android.R.string.cancel)) } @@ -209,7 +206,6 @@ fun SuperUserScreen(navigator: DestinationsNavigator) { viewModel.updateBatchPermissions(true) } }, - modifier = Modifier.weight(1f), colors = ButtonDefaults.buttonColors( containerColor = MaterialTheme.colorScheme.primary ) @@ -217,9 +213,9 @@ fun SuperUserScreen(navigator: DestinationsNavigator) { Icon( imageVector = Icons.Filled.Check, contentDescription = null, - modifier = Modifier.size(18.dp) + modifier = Modifier.size(16.dp) ) - Spacer(modifier = Modifier.width(8.dp)) + Spacer(modifier = Modifier.width(6.dp)) Text(stringResource(R.string.batch_authorization)) } @@ -229,7 +225,6 @@ fun SuperUserScreen(navigator: DestinationsNavigator) { viewModel.updateBatchPermissions(false) } }, - modifier = Modifier.weight(1f), colors = ButtonDefaults.buttonColors( containerColor = MaterialTheme.colorScheme.error ) @@ -237,9 +232,9 @@ fun SuperUserScreen(navigator: DestinationsNavigator) { Icon( imageVector = Icons.Filled.Block, contentDescription = null, - modifier = Modifier.size(18.dp) + modifier = Modifier.size(16.dp) ) - Spacer(modifier = Modifier.width(8.dp)) + Spacer(modifier = Modifier.width(6.dp)) Text(stringResource(R.string.batch_cancel_authorization)) } } diff --git a/manager/app/src/main/res/values-zh-rCN/strings.xml b/manager/app/src/main/res/values-zh-rCN/strings.xml index 8bf2726a..fd0d2401 100644 --- a/manager/app/src/main/res/values-zh-rCN/strings.xml +++ b/manager/app/src/main/res/values-zh-rCN/strings.xml @@ -225,7 +225,6 @@ 授权 撤销 黄色 - 内核模块 内核模块 暂无已安装的内核模块 版本 diff --git a/manager/app/src/main/res/values/strings.xml b/manager/app/src/main/res/values/strings.xml index c21416d1..570ed0d5 100644 --- a/manager/app/src/main/res/values/strings.xml +++ b/manager/app/src/main/res/values/strings.xml @@ -222,12 +222,11 @@ Yes No Reboot Failed - authorizations + empower withdraw Backup Yellow - KPM - Kernel Module + KPM No installed kernel modules at this time Version Author