br0kenpixel/KernelSU-Next
1
0
Fork 0
mirror of https://github.com/KernelSU-Next/KernelSU-Next.git synced 2025-08-27 23:46:34 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

manager: rearrange and refactor the Module Card UI

Browse Source
This commit is contained in:
rifsxd
2025-05-28 21:50:17 +06:00
parent 15b703b5f2
commit 22a48e52eb
1 changed files with 75 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt
View File

@@ -8,6 +8,7 @@ import android.util.Log
import android.widget.Toast import android.widget.Toast
import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.clickable
import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.LocalIndication
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
@@ -669,51 +670,88 @@ fun ModuleItem(
val moduleUpdateJsonEmpty = stringResource(id = R.string.module_update_json_empty) val moduleUpdateJsonEmpty = stringResource(id = R.string.module_update_json_empty)
Column( Column(
modifier = Modifier.fillMaxWidth(0.8f) modifier = Modifier.fillMaxWidth()
) { ) {
// Combined row: left and right labels
Row( Row(
verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(6.dp) horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) { ) {
// Enabled/Disabled indicator // Left side: status, uninstall/restore, update
LabelItem( Row(
text = if (module.enabled) stringResource(R.string.enabled) else stringResource(R.string.disabled), horizontalArrangement = Arrangement.spacedBy(6.dp),
style = if (module.enabled) verticalAlignment = Alignment.CenterVertically
com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy() ) {
else
com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
containerColor = MaterialTheme.colorScheme.errorContainer,
contentColor = MaterialTheme.colorScheme.onErrorContainer
)
)
// Update notifier indicator
if (module.hasWebUi) {
LabelItem( LabelItem(
text = stringResource(R.string.webui), text = if (module.enabled) stringResource(R.string.enabled) else stringResource(R.string.disabled),
style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy( style = if (module.enabled)
containerColor = MaterialTheme.colorScheme.primaryContainer, com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy()
contentColor = MaterialTheme.colorScheme.onPrimaryContainer else
) com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
containerColor = MaterialTheme.colorScheme.errorContainer,
contentColor = MaterialTheme.colorScheme.onErrorContainer
),
modifier = Modifier.clickable { onCheckChanged(!module.enabled) }
) )
if (module.remove) {
LabelItem(
text = stringResource(R.string.restore),
style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
containerColor = MaterialTheme.colorScheme.tertiaryContainer,
contentColor = MaterialTheme.colorScheme.onTertiaryContainer
),
modifier = Modifier.clickable { onRestore(module) }
)
} else {
LabelItem(
text = stringResource(R.string.uninstall),
style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
containerColor = MaterialTheme.colorScheme.errorContainer,
contentColor = MaterialTheme.colorScheme.onErrorContainer
),
modifier = Modifier.clickable { onUninstall(module) }
)
}
if (updateUrl.isNotEmpty() && !module.remove) {
LabelItem(
text = stringResource(R.string.module_update),
style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
containerColor = MaterialTheme.colorScheme.onTertiary,
contentColor = MaterialTheme.colorScheme.onTertiaryContainer
),
modifier = Modifier.clickable { onUpdate(module) }
)
}
} }
// Update notifier indicator // Right side: WebUI and Action
if (module.hasActionScript) { Row(
LabelItem( horizontalArrangement = Arrangement.spacedBy(6.dp),
text = stringResource(R.string.action), verticalAlignment = Alignment.CenterVertically
style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy( ) {
containerColor = MaterialTheme.colorScheme.secondaryContainer, if (module.hasWebUi) {
contentColor = MaterialTheme.colorScheme.onSecondaryContainer LabelItem(
text = stringResource(R.string.webui),
style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
containerColor = MaterialTheme.colorScheme.primaryContainer,
contentColor = MaterialTheme.colorScheme.onPrimaryContainer
),
modifier = Modifier.clickable { onClick(module) }
) )
) }
} if (module.hasActionScript) {
if (updateUrl.isNotEmpty() && !module.remove) { LabelItem(
LabelItem( text = stringResource(R.string.action),
text = stringResource(R.string.module_update), style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy( containerColor = MaterialTheme.colorScheme.secondaryContainer,
containerColor = MaterialTheme.colorScheme.onTertiary, contentColor = MaterialTheme.colorScheme.onSecondaryContainer
contentColor = MaterialTheme.colorScheme.onTertiaryContainer ),
modifier = Modifier.clickable {
navigator.navigate(ExecuteModuleActionScreenDestination(module.dirId))
viewModel.markNeedRefresh()
}
) )
) }
} }
} }
@@ -771,86 +809,6 @@ fun ModuleItem(
) )
} }
} }
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.End,
) {
var menuExpanded by remember { mutableStateOf(false) }
IconButton(onClick = { menuExpanded = true }) {
Icon(
imageVector = Icons.Filled.MoreVert,
contentDescription = "Module options"
)
}
DropdownMenu(
expanded = menuExpanded,
onDismissRequest = { menuExpanded = false }
) {
// WebUI
if (module.hasWebUi) {
DropdownMenuItem(
text = { Text(stringResource(R.string.webui)) },
onClick = {
menuExpanded = false
onClick(module)
}
)
}
// ActionScript
if (module.hasActionScript) {
DropdownMenuItem(
text = { Text(stringResource(R.string.action)) },
onClick = {
menuExpanded = false
navigator.navigate(ExecuteModuleActionScreenDestination(module.dirId))
viewModel.markNeedRefresh()
}
)
}
// Update
if (updateUrl.isNotEmpty() && !module.remove) {
DropdownMenuItem(
text = { Text(stringResource(R.string.module_update)) },
onClick = {
menuExpanded = false
onUpdate(module)
}
)
}
// Enable/Disable
DropdownMenuItem(
text = {
Text(
if (module.enabled) stringResource(R.string.disable)
else stringResource(R.string.enable)
)
},
onClick = {
menuExpanded = false
onCheckChanged(!module.enabled)
}
)
// Restore/Uninstall
if (module.remove) {
DropdownMenuItem(
text = { Text(stringResource(R.string.restore)) },
onClick = {
menuExpanded = false
onRestore(module)
}
)
} else {
DropdownMenuItem(
text = { Text(stringResource(R.string.uninstall)) },
onClick = {
menuExpanded = false
onUninstall(module)
}
)
}
}
}
} }
Spacer(modifier = Modifier.height(12.dp)) Spacer(modifier = Modifier.height(12.dp))