From 0b7e0293cf9b024fcb9437185e62194792ad276c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 28 Jun 2023 19:03:30 +0200 Subject: [PATCH] Ensure menu item text has style fontBodyLgRegular --- .../features/roomdetails/impl/RoomDetailsView.kt | 3 ++- .../roomlist/impl/components/RoomListTopBar.kt | 5 +++-- .../designsystem/theme/components/DropdownMenuItem.kt | 11 ++++++++++- .../theme/components/previews/MenuPreview.kt | 3 ++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt index 82d8cd2cf1..041c5cd829 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt @@ -70,6 +70,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.preview.LargeHeightPreview import io.element.android.libraries.designsystem.theme.components.DropdownMenu import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem +import io.element.android.libraries.designsystem.theme.components.DropdownMenuItemText import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.IconButton import io.element.android.libraries.designsystem.theme.components.Scaffold @@ -196,7 +197,7 @@ internal fun RoomDetailsTopBar( onDismissRequest = { showMenu = false }, ) { DropdownMenuItem( - text = { Text(stringResource(id = CommonStrings.action_edit)) }, + text = { DropdownMenuItemText(stringResource(id = CommonStrings.action_edit)) }, onClick = { // Explicitly close the menu before handling the action, as otherwise it stays open during the // transition and renders really badly. diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt index 9d14a5c86c..b9953bd564 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt @@ -48,6 +48,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.theme.components.DropdownMenu import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem +import io.element.android.libraries.designsystem.theme.components.DropdownMenuItemText import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.IconButton import io.element.android.libraries.designsystem.theme.components.MediumTopAppBar @@ -153,7 +154,7 @@ private fun DefaultRoomListTopBar( showMenu = false onMenuActionClicked(RoomListMenuAction.InviteFriends) }, - text = { Text(stringResource(id = CommonStrings.action_invite)) }, + text = { DropdownMenuItemText(stringResource(id = CommonStrings.action_invite)) }, leadingIcon = { Icon(Icons.Default.Share, contentDescription = null) } ) DropdownMenuItem( @@ -161,7 +162,7 @@ private fun DefaultRoomListTopBar( showMenu = false onMenuActionClicked(RoomListMenuAction.ReportBug) }, - text = { Text(stringResource(id = CommonStrings.common_report_a_bug)) }, + text = { DropdownMenuItemText(stringResource(id = CommonStrings.common_report_a_bug)) }, leadingIcon = { Icon(Icons.Default.BugReport, contentDescription = null) } ) } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt index b82fab2ea4..cd250dd266 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.designsystem.preview.ElementThemedPreview import io.element.android.libraries.designsystem.preview.PreviewGroup +import io.element.android.libraries.theme.ElementTheme @Composable fun DropdownMenuItem( @@ -55,6 +56,14 @@ fun DropdownMenuItem( ) } +@Composable +fun DropdownMenuItemText(text: String) { + Text( + text = text, + style = ElementTheme.typography.fontBodyLgRegular + ) +} + @Preview(group = PreviewGroup.Menus) @Composable internal fun DropdownMenuItemPreview() = ElementThemedPreview { ContentToPreview() } @@ -62,7 +71,7 @@ internal fun DropdownMenuItemPreview() = ElementThemedPreview { ContentToPreview @Composable private fun ContentToPreview() { DropdownMenuItem( - text = { Text(text = "Item") }, + text = { DropdownMenuItemText(text = "Item") }, onClick = {}, leadingIcon = { Icon(Icons.Default.BugReport, contentDescription = null) }, trailingIcon = { Icon(Icons.Default.Share, contentDescription = null) }, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt index 76819d59ae..f1c2cd444d 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt @@ -30,6 +30,7 @@ import io.element.android.libraries.designsystem.preview.PreviewGroup import io.element.android.libraries.designsystem.theme.components.Button import io.element.android.libraries.designsystem.theme.components.DropdownMenu import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem +import io.element.android.libraries.designsystem.theme.components.DropdownMenuItemText import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.Text @@ -59,7 +60,7 @@ internal fun MenuPreview() { null } DropdownMenuItem( - text = { Text(text = "Item $i") }, + text = { DropdownMenuItemText(text = "Item $i") }, onClick = { isExpanded = false }, leadingIcon = leadingIcon, trailingIcon = trailingIcon,