From d1f8e64fa1708898c97f8f9031ca0649534e0b43 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 29 Jun 2023 09:48:15 +0200 Subject: [PATCH] Do not change bg color of DropdownMenu for dark theme --- .../designsystem/theme/components/DropdownMenu.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt index 6f97dae6d4..175c0fb402 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt @@ -38,11 +38,16 @@ fun DropdownMenu( properties: PopupProperties = PopupProperties(focusable = true), content: @Composable ColumnScope.() -> Unit ) { + val bgColor = if (ElementTheme.isLightTheme) { + ElementTheme.materialColors.background + } else { + ElementTheme.colors.bgSubtlePrimary + } androidx.compose.material3.DropdownMenu( expanded = expanded, onDismissRequest = onDismissRequest, modifier = modifier - .background(color = ElementTheme.materialColors.background) + .background(color = bgColor) .widthIn(min = minMenuWidth), offset = offset, properties = properties,