manager: better handle webui engine select

This commit is contained in:
Der_Googler
2025-05-30 01:22:30 +02:00
parent 18219a40b0
commit b82f50685d

View File

@@ -314,28 +314,22 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
.putExtra("name", name) .putExtra("name", name)
val config = id.asModuleConfig val config = id.asModuleConfig
val engine = config.getWebuiEngine(context) val engine = config.getWebuiEngine(context)
if (engine != null) { val selectedEngine = when (engine) {
webUILauncher.launch( "wx" -> wxEngine
when (config.getWebuiEngine(context)) { "ksu" -> ksuEngine
"wx" -> wxEngine null -> if (prefs.getBoolean(
"ksu" -> ksuEngine "use_webuix",
else -> wxEngine true
} ) && Platform.isAlive
) ) wxEngine else ksuEngine
return@ModuleList else -> wxEngine
} }
webUILauncher.launch( webUILauncher.launch(selectedEngine)
if (prefs.getBoolean("use_webuix", true) && Platform.isAlive) { return@ModuleList
wxEngine
} else {
ksuEngine
}
)
} }
}, },
context = context, context = context,
@@ -678,7 +672,9 @@ fun ModuleItem(
horizontalArrangement = Arrangement.spacedBy(6.dp) horizontalArrangement = Arrangement.spacedBy(6.dp)
) { ) {
LabelItem( LabelItem(
text = if (module.enabled) stringResource(R.string.enabled) else stringResource(R.string.disabled), text = if (module.enabled) stringResource(R.string.enabled) else stringResource(
R.string.disabled
),
style = if (module.enabled) style = if (module.enabled)
com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy() com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy()
else else
@@ -816,7 +812,7 @@ fun ModuleItem(
) )
HorizontalDivider() HorizontalDivider()
} }
if (module.hasWebUi) { if (module.hasWebUi) {
DropdownMenuItem( DropdownMenuItem(
text = { Text(stringResource(R.string.webui)) }, text = { Text(stringResource(R.string.webui)) },
@@ -837,7 +833,7 @@ fun ModuleItem(
) )
} }
if (module.hasWebUi || module.hasActionScript ) { if (module.hasWebUi || module.hasActionScript) {
HorizontalDivider() HorizontalDivider()
} }