From 3577b91a3c4ab093c04636781841a7bd2e28bdcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=B5=E3=81=AE=E7=A5=88?=
<33313113+teble@users.noreply.github.com>
Date: Fri, 13 Jan 2023 17:48:36 +0800
Subject: [PATCH] manager: Optimize ModuleScreen UI (#51)
* manager: fix moduleList is empty cannot parse to jsonArray
* manager: Optimize ModuleScreen UI
* manager: Optimize switch position
---
.../me/weishu/kernelsu/ui/screen/Module.kt | 91 +++++++++++--------
.../java/me/weishu/kernelsu/ui/util/KsuCli.kt | 2 +-
.../src/main/res/values-zh-rCN/strings.xml | 4 +
.../src/main/res/values-zh-rHK/strings.xml | 4 +
.../src/main/res/values-zh-rTW/strings.xml | 4 +
manager/app/src/main/res/values/strings.xml | 2 +
6 files changed, 67 insertions(+), 40 deletions(-)
diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt
index d7431d8d..4a5081bc 100644
--- a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt
+++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt
@@ -16,6 +16,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
@@ -101,6 +102,7 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
},
modifier = Modifier
.padding(innerPadding)
+ .padding(16.dp)
.fillMaxSize()
) {
val isEmpty = viewModel.moduleList.isEmpty()
@@ -110,7 +112,9 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
Text(stringResource(R.string.module_empty))
}
} else {
- LazyColumn {
+ LazyColumn(
+ verticalArrangement = Arrangement.spacedBy(15.dp)
+ ) {
items(viewModel.moduleList) { module ->
var isChecked by rememberSaveable(module) { mutableStateOf(module.enabled) }
ModuleItem(module,
@@ -141,11 +145,13 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
val message = if (isChecked) failedDisable else failedEnable
snackBarHost.showSnackbar(message.format(module.name))
}
- })
+ }
+ )
+ // fix last item shadow incomplete in LazyColumn
+ Spacer(Modifier.height(1.dp))
}
}
}
-
}
}
}
@@ -166,62 +172,69 @@ private fun ModuleItem(
onCheckChanged: (Boolean) -> Unit
) {
ElevatedCard(
- modifier = Modifier
- .fillMaxWidth()
- .padding(8.dp),
- colors =
- CardDefaults.elevatedCardColors(containerColor = MaterialTheme.colorScheme.surface)
+ modifier = Modifier.fillMaxWidth(),
+ colors = CardDefaults.elevatedCardColors(containerColor = MaterialTheme.colorScheme.surface)
) {
val textDecoration = if (!module.remove) null else TextDecoration.LineThrough
- Column(modifier = Modifier.padding(16.dp, 16.dp, 16.dp, 0.dp)) {
- Row {
- Column {
+ Column(modifier = Modifier.padding(24.dp, 16.dp, 24.dp, 0.dp)) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ ) {
+ val moduleVersion = stringResource(id = R.string.module_version)
+ val moduleAuthor = stringResource(id = R.string.module_author)
+
+ Column(modifier = Modifier.fillMaxWidth(0.8f)) {
Text(
text = module.name,
- fontSize = MaterialTheme.typography.titleLarge.fontSize,
- fontFamily = MaterialTheme.typography.titleLarge.fontFamily,
+ fontSize = MaterialTheme.typography.titleMedium.fontSize,
+ fontWeight = FontWeight.SemiBold,
+ lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+ fontFamily = MaterialTheme.typography.titleMedium.fontFamily,
textDecoration = textDecoration,
)
- Row {
- Text(
- text = module.version,
- fontFamily = MaterialTheme.typography.titleMedium.fontFamily,
- fontSize = MaterialTheme.typography.titleMedium.fontSize,
- textDecoration = textDecoration
- )
+ Text(
+ text = "$moduleVersion: ${module.version}",
+ fontSize = MaterialTheme.typography.bodySmall.fontSize,
+ lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+ fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+ textDecoration = textDecoration
+ )
- Spacer(modifier = Modifier.width(8.dp))
-
- Text(
- text = module.author,
- fontFamily = MaterialTheme.typography.titleMedium.fontFamily,
- fontSize = MaterialTheme.typography.titleMedium.fontSize,
- textDecoration = textDecoration
- )
-
- }
+ Text(
+ text = "$moduleAuthor: ${module.author}",
+ fontSize = MaterialTheme.typography.bodySmall.fontSize,
+ lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+ fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+ textDecoration = textDecoration
+ )
}
Spacer(modifier = Modifier.weight(1f))
- Switch(
- enabled = !module.update,
- checked = isChecked,
- onCheckedChange = onCheckChanged
- )
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.End,
+ ) {
+ Switch(
+ enabled = !module.update,
+ checked = isChecked,
+ onCheckedChange = onCheckChanged
+ )
+ }
}
Spacer(modifier = Modifier.height(12.dp))
Text(
text = module.description,
- fontFamily = MaterialTheme.typography.bodyMedium.fontFamily,
- fontSize = MaterialTheme.typography.bodyMedium.fontSize,
- lineHeight = MaterialTheme.typography.bodyMedium.lineHeight,
- fontWeight = MaterialTheme.typography.bodyMedium.fontWeight,
+ fontSize = MaterialTheme.typography.bodySmall.fontSize,
+ fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+ lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+ fontWeight = MaterialTheme.typography.bodySmall.fontWeight,
overflow = TextOverflow.Ellipsis,
maxLines = 4,
textDecoration = textDecoration
diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt
index 6ffc8aaa..29c5cc07 100644
--- a/manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt
+++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt
@@ -47,7 +47,7 @@ fun listModules(): String {
val shell = createRootShell()
val out = shell.newJob().add("${getKsuDaemonPath()} module list").to(ArrayList(), null).exec().out
- return out.joinToString("\n")
+ return out.joinToString("\n").ifBlank { "[]" }
}
fun toggleModule(id: String, enable: Boolean): Boolean {
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 70b97038..b8f61e4a 100644
--- a/manager/app/src/main/res/values-zh-rCN/strings.xml
+++ b/manager/app/src/main/res/values-zh-rCN/strings.xml
@@ -36,4 +36,8 @@
使用 overlayfs 使系统分区可写, 重启生效
关于
需要 KernelSU 版本 8+
+ %s 已卸载
+ 卸载失败: %s
+ 版本
+ 作者
diff --git a/manager/app/src/main/res/values-zh-rHK/strings.xml b/manager/app/src/main/res/values-zh-rHK/strings.xml
index 921f89a9..b5449d6e 100644
--- a/manager/app/src/main/res/values-zh-rHK/strings.xml
+++ b/manager/app/src/main/res/values-zh-rHK/strings.xml
@@ -36,4 +36,8 @@
使用 overlayfs 使系统分区可写, 重启生效
关于
需要 KernelSU 版本 8+
+ %s 已卸載
+ 卸載失敗: %s
+ 版本
+ 作者
diff --git a/manager/app/src/main/res/values-zh-rTW/strings.xml b/manager/app/src/main/res/values-zh-rTW/strings.xml
index 6b9b2d19..e983b435 100644
--- a/manager/app/src/main/res/values-zh-rTW/strings.xml
+++ b/manager/app/src/main/res/values-zh-rTW/strings.xml
@@ -36,4 +36,8 @@
使用 overlayfs 使系统分区可写, 重启生效
关于
需要 KernelSU 版本 8+
+ %s 已卸載
+ 卸載失敗: %s
+ 版本
+ 作者
diff --git a/manager/app/src/main/res/values/strings.xml b/manager/app/src/main/res/values/strings.xml
index df8ae7e2..8ba7e6d9 100644
--- a/manager/app/src/main/res/values/strings.xml
+++ b/manager/app/src/main/res/values/strings.xml
@@ -42,5 +42,7 @@
Require KernelSU version 8+
%s uninstalled
Failed to uninstall: %s
+ Version
+ Author