Use Legado theme colors for Miuix dropdown items
This commit is contained in:
+4
-13
@@ -29,14 +29,12 @@ import androidx.compose.ui.Alignment
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.drawBehind
|
import androidx.compose.ui.draw.drawBehind
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.Color.Companion
|
|
||||||
import androidx.compose.ui.graphics.vector.ImageVector
|
import androidx.compose.ui.graphics.vector.ImageVector
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import io.legado.app.ui.theme.LegadoTheme
|
import io.legado.app.ui.theme.LegadoTheme
|
||||||
import io.legado.app.ui.theme.ThemeResolver
|
import io.legado.app.ui.theme.ThemeResolver
|
||||||
import io.legado.app.ui.widget.components.icon.AppIcon
|
import io.legado.app.ui.widget.components.icon.AppIcon
|
||||||
import top.yukonga.miuix.kmp.basic.DropdownDefaults
|
|
||||||
import top.yukonga.miuix.kmp.icon.MiuixIcons
|
import top.yukonga.miuix.kmp.icon.MiuixIcons
|
||||||
import top.yukonga.miuix.kmp.icon.basic.Check
|
import top.yukonga.miuix.kmp.icon.basic.Check
|
||||||
import top.yukonga.miuix.kmp.theme.MiuixTheme
|
import top.yukonga.miuix.kmp.theme.MiuixTheme
|
||||||
@@ -60,17 +58,10 @@ fun RoundDropdownMenuItem(
|
|||||||
val hasCustomContentColor = color != Color.Unspecified
|
val hasCustomContentColor = color != Color.Unspecified
|
||||||
|
|
||||||
if (isMiuix) {
|
if (isMiuix) {
|
||||||
val dropdownColors = DropdownDefaults.dropdownColors()
|
val legadoColorScheme = LegadoTheme.colorScheme
|
||||||
val (textColor, backgroundColor) = if (isSelected) {
|
val textColor = if (isSelected) legadoColorScheme.primary else legadoColorScheme.onSurface
|
||||||
dropdownColors.selectedContentColor to dropdownColors.selectedContainerColor
|
val backgroundColor = legadoColorScheme.surfaceContainer
|
||||||
} else {
|
val checkColor = if (isSelected) legadoColorScheme.primary else Color.Transparent
|
||||||
dropdownColors.contentColor to dropdownColors.containerColor
|
|
||||||
}
|
|
||||||
val checkColor = if (isSelected) {
|
|
||||||
dropdownColors.selectedContentColor
|
|
||||||
} else {
|
|
||||||
Color.Transparent
|
|
||||||
}
|
|
||||||
|
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
|||||||
Reference in New Issue
Block a user