mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 06:55:41 +00:00
Ensure menu item text has style fontBodyLgRegular
This commit is contained in:
committed by
Benoit Marty
parent
1d07aa9817
commit
0b7e0293cf
+2
-1
@@ -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.preview.LargeHeightPreview
|
||||||
import io.element.android.libraries.designsystem.theme.components.DropdownMenu
|
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.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.Icon
|
||||||
import io.element.android.libraries.designsystem.theme.components.IconButton
|
import io.element.android.libraries.designsystem.theme.components.IconButton
|
||||||
import io.element.android.libraries.designsystem.theme.components.Scaffold
|
import io.element.android.libraries.designsystem.theme.components.Scaffold
|
||||||
@@ -196,7 +197,7 @@ internal fun RoomDetailsTopBar(
|
|||||||
onDismissRequest = { showMenu = false },
|
onDismissRequest = { showMenu = false },
|
||||||
) {
|
) {
|
||||||
DropdownMenuItem(
|
DropdownMenuItem(
|
||||||
text = { Text(stringResource(id = CommonStrings.action_edit)) },
|
text = { DropdownMenuItemText(stringResource(id = CommonStrings.action_edit)) },
|
||||||
onClick = {
|
onClick = {
|
||||||
// Explicitly close the menu before handling the action, as otherwise it stays open during the
|
// Explicitly close the menu before handling the action, as otherwise it stays open during the
|
||||||
// transition and renders really badly.
|
// transition and renders really badly.
|
||||||
|
|||||||
+3
-2
@@ -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.preview.ElementPreviewLight
|
||||||
import io.element.android.libraries.designsystem.theme.components.DropdownMenu
|
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.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.Icon
|
||||||
import io.element.android.libraries.designsystem.theme.components.IconButton
|
import io.element.android.libraries.designsystem.theme.components.IconButton
|
||||||
import io.element.android.libraries.designsystem.theme.components.MediumTopAppBar
|
import io.element.android.libraries.designsystem.theme.components.MediumTopAppBar
|
||||||
@@ -153,7 +154,7 @@ private fun DefaultRoomListTopBar(
|
|||||||
showMenu = false
|
showMenu = false
|
||||||
onMenuActionClicked(RoomListMenuAction.InviteFriends)
|
onMenuActionClicked(RoomListMenuAction.InviteFriends)
|
||||||
},
|
},
|
||||||
text = { Text(stringResource(id = CommonStrings.action_invite)) },
|
text = { DropdownMenuItemText(stringResource(id = CommonStrings.action_invite)) },
|
||||||
leadingIcon = { Icon(Icons.Default.Share, contentDescription = null) }
|
leadingIcon = { Icon(Icons.Default.Share, contentDescription = null) }
|
||||||
)
|
)
|
||||||
DropdownMenuItem(
|
DropdownMenuItem(
|
||||||
@@ -161,7 +162,7 @@ private fun DefaultRoomListTopBar(
|
|||||||
showMenu = false
|
showMenu = false
|
||||||
onMenuActionClicked(RoomListMenuAction.ReportBug)
|
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) }
|
leadingIcon = { Icon(Icons.Default.BugReport, contentDescription = null) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-1
@@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier
|
|||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import io.element.android.libraries.designsystem.preview.ElementThemedPreview
|
import io.element.android.libraries.designsystem.preview.ElementThemedPreview
|
||||||
import io.element.android.libraries.designsystem.preview.PreviewGroup
|
import io.element.android.libraries.designsystem.preview.PreviewGroup
|
||||||
|
import io.element.android.libraries.theme.ElementTheme
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun DropdownMenuItem(
|
fun DropdownMenuItem(
|
||||||
@@ -55,6 +56,14 @@ fun DropdownMenuItem(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun DropdownMenuItemText(text: String) {
|
||||||
|
Text(
|
||||||
|
text = text,
|
||||||
|
style = ElementTheme.typography.fontBodyLgRegular
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
@Preview(group = PreviewGroup.Menus)
|
@Preview(group = PreviewGroup.Menus)
|
||||||
@Composable
|
@Composable
|
||||||
internal fun DropdownMenuItemPreview() = ElementThemedPreview { ContentToPreview() }
|
internal fun DropdownMenuItemPreview() = ElementThemedPreview { ContentToPreview() }
|
||||||
@@ -62,7 +71,7 @@ internal fun DropdownMenuItemPreview() = ElementThemedPreview { ContentToPreview
|
|||||||
@Composable
|
@Composable
|
||||||
private fun ContentToPreview() {
|
private fun ContentToPreview() {
|
||||||
DropdownMenuItem(
|
DropdownMenuItem(
|
||||||
text = { Text(text = "Item") },
|
text = { DropdownMenuItemText(text = "Item") },
|
||||||
onClick = {},
|
onClick = {},
|
||||||
leadingIcon = { Icon(Icons.Default.BugReport, contentDescription = null) },
|
leadingIcon = { Icon(Icons.Default.BugReport, contentDescription = null) },
|
||||||
trailingIcon = { Icon(Icons.Default.Share, contentDescription = null) },
|
trailingIcon = { Icon(Icons.Default.Share, contentDescription = null) },
|
||||||
|
|||||||
+2
-1
@@ -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.Button
|
||||||
import io.element.android.libraries.designsystem.theme.components.DropdownMenu
|
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.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.Icon
|
||||||
import io.element.android.libraries.designsystem.theme.components.Text
|
import io.element.android.libraries.designsystem.theme.components.Text
|
||||||
|
|
||||||
@@ -59,7 +60,7 @@ internal fun MenuPreview() {
|
|||||||
null
|
null
|
||||||
}
|
}
|
||||||
DropdownMenuItem(
|
DropdownMenuItem(
|
||||||
text = { Text(text = "Item $i") },
|
text = { DropdownMenuItemText(text = "Item $i") },
|
||||||
onClick = { isExpanded = false },
|
onClick = { isExpanded = false },
|
||||||
leadingIcon = leadingIcon,
|
leadingIcon = leadingIcon,
|
||||||
trailingIcon = trailingIcon,
|
trailingIcon = trailingIcon,
|
||||||
|
|||||||
Reference in New Issue
Block a user