diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/component/SearchBar.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/component/SearchBar.kt index 57c698cd..31743ec0 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/component/SearchBar.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/component/SearchBar.kt @@ -63,7 +63,7 @@ fun SearchAppBar( var onSearch by remember { mutableStateOf(false) } // 获取卡片颜色和透明度 - val cardColor = MaterialTheme.colorScheme.surfaceContainer + val cardColor = MaterialTheme.colorScheme.surfaceContainerLow val cardAlpha = CardConfig.cardAlpha if (onSearch) { diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/AppProfile.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/AppProfile.kt index 22e1050b..59527bde 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/AppProfile.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/AppProfile.kt @@ -122,7 +122,7 @@ fun AppProfileScreen( mutableStateOf(initialProfile) } - val cardColor = MaterialTheme.colorScheme.surfaceContainer + val cardColor = MaterialTheme.colorScheme.surfaceContainerLow val cardAlpha = CardConfig.cardAlpha Scaffold( diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/BottomBarDestination.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/BottomBarDestination.kt index f4325222..93669fe9 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/BottomBarDestination.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/BottomBarDestination.kt @@ -21,7 +21,7 @@ enum class BottomBarDestination( val rootRequired: Boolean, ) { Home(HomeScreenDestination, R.string.home, Icons.Filled.Home, Icons.Outlined.Home, false), - Kpm(KpmScreenDestination, R.string.kpm_title, Icons.Filled.Build, Icons.Outlined.Build, true), + Kpm(KpmScreenDestination, R.string.kpm_title, Icons.Filled.Token, Icons.Outlined.Token, true), SuperUser(SuperUserScreenDestination, R.string.superuser, Icons.Filled.AdminPanelSettings, Icons.Outlined.AdminPanelSettings, true), Module(ModuleScreenDestination, R.string.module, Icons.Filled.Extension, Icons.Outlined.Extension, true), Settings(SettingScreenDestination, R.string.settings, Icons.Filled.Settings, Icons.Outlined.Settings, false), diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Flash.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Flash.kt index 7ea89bf7..3bd9d90a 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Flash.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Flash.kt @@ -435,7 +435,7 @@ private fun TopBar( onSave: () -> Unit = {}, scrollBehavior: TopAppBarScrollBehavior? = null ) { - val cardColor = MaterialTheme.colorScheme.surfaceContainer + val cardColor = MaterialTheme.colorScheme.surfaceContainerLow val cardAlpha = CardConfig.cardAlpha val statusColor = when(status) { diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt index 3bc897e2..1b201369 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt @@ -42,6 +42,7 @@ import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Security import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Storage +import androidx.compose.material.icons.filled.Token import androidx.compose.material.icons.outlined.Block import androidx.compose.material.icons.outlined.CheckCircle import androidx.compose.material.icons.outlined.Warning @@ -350,7 +351,7 @@ private fun TopBar( onInstallClick: () -> Unit, scrollBehavior: TopAppBarScrollBehavior? = null ) { - val cardColor = MaterialTheme.colorScheme.surfaceContainer + val cardColor = MaterialTheme.colorScheme.surfaceContainerLow val cardAlpha = CardConfig.cardAlpha TopAppBar( @@ -908,7 +909,7 @@ private fun InfoCard() { InfoCardItem( stringResource(R.string.home_kpm_version), displayVersion, - icon = Icons.Default.Settings + icon = Icons.Default.Token ) } } 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 20532653..3c1eceb3 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 @@ -752,7 +752,7 @@ private fun TopBar( onLkmUpload: () -> Unit = {}, scrollBehavior: TopAppBarScrollBehavior? = null ) { - val cardColor = MaterialTheme.colorScheme.surfaceContainer + val cardColor = MaterialTheme.colorScheme.surfaceContainerLow val cardAlpha = cardAlpha TopAppBar( diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/MoreSettings.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/MoreSettings.kt index 5c40e563..3a80ff9f 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/MoreSettings.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/MoreSettings.kt @@ -33,38 +33,10 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.NavigateNext -import androidx.compose.material.icons.filled.AcUnit -import androidx.compose.material.icons.filled.Brush -import androidx.compose.material.icons.filled.ColorLens -import androidx.compose.material.icons.filled.DarkMode -import androidx.compose.material.icons.filled.KeyboardArrowDown -import androidx.compose.material.icons.filled.KeyboardArrowUp -import androidx.compose.material.icons.filled.Language -import androidx.compose.material.icons.filled.LightMode -import androidx.compose.material.icons.filled.Opacity -import androidx.compose.material.icons.filled.Palette -import androidx.compose.material.icons.filled.Security -import androidx.compose.material.icons.filled.VisibilityOff -import androidx.compose.material.icons.filled.Wallpaper +import androidx.compose.material.icons.filled.* import androidx.compose.material3.AlertDialog import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton -import androidx.compose.material3.ListItem -import androidx.compose.material3.ListItemDefaults -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.RadioButton -import androidx.compose.material3.Scaffold -import androidx.compose.material3.Slider -import androidx.compose.material3.SliderDefaults -import androidx.compose.material3.Surface -import androidx.compose.material3.Switch -import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberTopAppBarState +import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -507,7 +479,7 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) { ) } - val cardColor = MaterialTheme.colorScheme.surfaceContainer + val cardColor = MaterialTheme.colorScheme.surfaceContainerLow val cardAlphaUse = CardConfig.cardAlpha val isDarkTheme = isSystemInDarkTheme() @@ -1024,7 +996,7 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) { // 显示KPM开关 SwitchItem( - icon = Icons.Filled.VisibilityOff, + icon = Icons.Filled.Visibility, title = stringResource(R.string.show_kpm_info), summary = stringResource(R.string.show_kpm_info_summary), checked = isShowKpmInfo diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt index 7357d072..5e127024 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Settings.kt @@ -789,7 +789,7 @@ private fun TopBar( scrollBehavior: TopAppBarScrollBehavior? = null ) { val systemIsDark = isSystemInDarkTheme() - val cardColor = MaterialTheme.colorScheme.surfaceContainer + val cardColor = MaterialTheme.colorScheme.surfaceContainerLow val cardAlpha = if (ThemeConfig.customBackgroundUri != null) { cardAlpha } else { diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt index 068895ca..90dc975c 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt @@ -44,6 +44,7 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator import kotlinx.coroutines.launch import com.sukisu.ultra.Natives import com.sukisu.ultra.ui.component.SearchAppBar +import com.sukisu.ultra.ui.theme.CardConfig import com.sukisu.ultra.ui.util.ModuleModify import com.sukisu.ultra.ui.viewmodel.SuperUserViewModel @@ -683,12 +684,14 @@ private fun AppItem( onLongClick: () -> Unit, viewModel: SuperUserViewModel ) { + val cardAlpha = CardConfig.cardAlpha + val cardColor = if (app.allowSu) - MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.3f) + MaterialTheme.colorScheme.surfaceVariant.copy(alpha = cardAlpha) else if (app.hasCustomProfile) - MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.3f) + MaterialTheme.colorScheme.secondaryContainer.copy(alpha = cardAlpha) else - MaterialTheme.colorScheme.surfaceContainerLow + MaterialTheme.colorScheme.tertiaryContainer.copy(alpha = cardAlpha) Card( colors = CardDefaults.cardColors(containerColor = cardColor), diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Template.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Template.kt index 80ffb95c..bdc26f09 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Template.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Template.kt @@ -231,7 +231,7 @@ private fun TopBar( colors: TopAppBarColors, scrollBehavior: TopAppBarScrollBehavior? = null ) { - val cardColor = MaterialTheme.colorScheme.surfaceContainer + val cardColor = MaterialTheme.colorScheme.surfaceContainerLow val cardAlpha = CardConfig.cardAlpha TopAppBar( diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/theme/Theme.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/theme/Theme.kt index f62f1d03..10f96a55 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/theme/Theme.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/theme/Theme.kt @@ -216,7 +216,7 @@ fun KernelSUTheme( modifier = Modifier .fillMaxSize() .zIndex(-2f) - .background(if (darkTheme) Color.Black else Color.White) + .background(if (darkTheme) MaterialTheme.colorScheme.surfaceContainerLow else MaterialTheme.colorScheme.surfaceContainerLow) ) // 自定义背景层