From ec86f5caf2775e72114901eb22b4e0012c37ec13 Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Mon, 5 May 2025 19:14:34 +0800 Subject: [PATCH] [skip ci]:Simplifying Conditional Judgment in the Selection of Installation Methods --- manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt | 1 + .../app/src/main/java/com/sukisu/ultra/ui/screen/Install.kt | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt index ccddbd74..a06e8fa6 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt @@ -198,6 +198,7 @@ private fun BottomBar(navController: NavHostController) { destination.iconNotSelected }, contentDescription = stringResource(destination.label), + tint = if (isCurrentDestOnBackStack) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant ) }, label = { diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Install.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Install.kt index d3b5a5de..8dbfadd3 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Install.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Install.kt @@ -639,8 +639,7 @@ private fun SelectInstallMethod( bottom = 16.dp ) ) { - if (radioOptions.size > 3) { - radioOptions.drop(3).forEach { option -> + radioOptions.filterIsInstance().forEach { option -> val interactionSource = remember { MutableInteractionSource() } Surface( color = if (option.javaClass == selectedOption?.javaClass) @@ -695,7 +694,6 @@ private fun SelectInstallMethod( } } } - } } } }