diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/MainActivity.kt b/src/android/app/src/main/java/com/izzy2lost/weeu/MainActivity.kt index 6ae506af..64eb12d0 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/MainActivity.kt +++ b/src/android/app/src/main/java/com/izzy2lost/weeu/MainActivity.kt @@ -21,7 +21,10 @@ import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.MenuDefaults import androidx.compose.material3.Text +import androidx.compose.ui.graphics.Color import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -152,27 +155,43 @@ private fun GameListToolBarActionsMenu( } DropdownMenu( expanded = expandMenu, - onDismissRequest = { expandMenu = false } + onDismissRequest = { expandMenu = false }, + containerColor = MaterialTheme.colorScheme.secondaryContainer ) { DropdownMenuItem( onClick = goToGraphicPacks, - text = tr("Graphic packs") + text = { Text(tr("Graphic packs")) }, + colors = MenuDefaults.itemColors( + textColor = MaterialTheme.colorScheme.onSecondaryContainer + ) ) DropdownMenuItem( onClick = goToTitleManager, - text = tr("Title manager") + text = { Text(tr("Title manager")) }, + colors = MenuDefaults.itemColors( + textColor = MaterialTheme.colorScheme.onSecondaryContainer + ) ) DropdownMenuItem( onClick = { openCemuFolder(context) }, - text = tr("Open Cemu folder") + text = { Text(tr("Open Cemu folder")) }, + colors = MenuDefaults.itemColors( + textColor = MaterialTheme.colorScheme.onSecondaryContainer + ) ) DropdownMenuItem( onClick = { shareLogFile(context) }, - text = tr("Share log file"), + text = { Text(tr("Share log file")) }, + colors = MenuDefaults.itemColors( + textColor = MaterialTheme.colorScheme.onSecondaryContainer + ) ) DropdownMenuItem( onClick = goToAboutCemu, - text = tr("About Cemu"), + text = { Text(tr("About Cemu")) }, + colors = MenuDefaults.itemColors( + textColor = MaterialTheme.colorScheme.onSecondaryContainer + ) ) } } diff --git a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/theme/Theme.kt b/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/theme/Theme.kt index f4bf2181..22323ada 100644 --- a/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/theme/Theme.kt +++ b/src/android/app/src/main/java/com/izzy2lost/weeu/common/ui/theme/Theme.kt @@ -32,14 +32,18 @@ private val DarkColorScheme = darkColorScheme( onPrimaryContainer = WeeUBlack, secondary = WeeUGray, onSecondary = WeeUBlack, + secondaryContainer = WeeUCyan, // Use the same cyan as FAB menu items + onSecondaryContainer = WeeUWhite, // White text on cyan background tertiary = WeeUCyan, onTertiary = WeeUBlack, + tertiaryContainer = WeeUCyan, + onTertiaryContainer = WeeUWhite, // White text on cyan background background = WeeUBlack, onBackground = WeeUWhite, surface = Color(0xFF1A1A1A), onSurface = WeeUWhite, surfaceVariant = Color(0xFF2A2A2A), - onSurfaceVariant = WeeUGray, + onSurfaceVariant = WeeUWhite, // Changed to white for better icon visibility outline = WeeUGray, outlineVariant = Color(0xFF3A3A3A), )