android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manager: fix alignment and padding of some text in ModuleScreen (#812)

Browse Source
This commit is contained in:
TinyHai
2023-07-28 22:27:03 +08:00
committed by GitHub
parent 07a430aa5b
commit abe1fa471d
1 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt
View File

@@ -186,32 +186,42 @@ private fun ModuleList(
val refreshState = rememberPullRefreshState(refreshing = viewModel.isRefreshing, val refreshState = rememberPullRefreshState(refreshing = viewModel.isRefreshing,
onRefresh = { viewModel.fetchModuleList() }) onRefresh = { viewModel.fetchModuleList() })
Box(modifier.pullRefresh(refreshState)) { Box(modifier.pullRefresh(refreshState)) {
if (viewModel.isOverlayAvailable) { val context = LocalContext.current
val context = LocalContext.current
LazyColumn( LazyColumn(
modifier = Modifier.fillMaxSize(), modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.spacedBy(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp),
contentPadding = remember { contentPadding = remember {
PaddingValues( PaddingValues(
start = 16.dp, start = 16.dp,
top = 16.dp, top = 16.dp,
end = 16.dp, end = 16.dp,
bottom = 16.dp + 16.dp + 56.dp /* Scaffold Fab Spacing + Fab container height */ bottom = 16.dp + 16.dp + 56.dp /* Scaffold Fab Spacing + Fab container height */
) )
}, },
) { ) {
val isEmpty = viewModel.moduleList.isEmpty() when {
if (isEmpty) { !viewModel.isOverlayAvailable -> {
item { item {
Box( Box(
modifier = Modifier.fillParentMaxSize(), modifier = Modifier.fillParentMaxSize(),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
Text(stringResource(R.string.module_empty)) Text(stringResource(R.string.module_overlay_fs_not_available), textAlign = TextAlign.Center)
} }
} }
} else { }
viewModel.moduleList.isEmpty() -> {
item {
Box(
modifier = Modifier.fillParentMaxSize(),
contentAlignment = Alignment.Center
) {
Text(stringResource(R.string.module_empty), textAlign = TextAlign.Center)
}
}
}
else -> {
items(viewModel.moduleList) { module -> items(viewModel.moduleList) { module ->
var isChecked by rememberSaveable(module) { mutableStateOf(module.enabled) } var isChecked by rememberSaveable(module) { mutableStateOf(module.enabled) }
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
@@ -274,15 +284,10 @@ private fun ModuleList(
} }
} }
} }
DownloadListener(context, onInstallModule)
} else {
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
Text(stringResource(R.string.module_overlay_fs_not_available))
}
} }
DownloadListener(context, onInstallModule)
PullRefreshIndicator( PullRefreshIndicator(
refreshing = viewModel.isRefreshing, state = refreshState, modifier = Modifier.align( refreshing = viewModel.isRefreshing, state = refreshState, modifier = Modifier.align(
Alignment.TopCenter Alignment.TopCenter