From 92bc490fa3a87f16ef6b8adcdf5382913e69107b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 10 Jul 2023 17:02:06 +0200 Subject: [PATCH] Remove `fontWeight` parameter. Must use `style` only. --- .../impl/root/CreateRoomRootView.kt | 5 +---- .../impl/components/InviteSummaryRow.kt | 13 +++--------- .../impl/forward/ForwardMessagesView.kt | 7 ++----- .../retrysendmenu/RetrySendMessageMenu.kt | 20 ++++++++++++++----- .../virtual/TimelineItemDaySeparatorView.kt | 3 ++- .../impl/edit/RoomDetailsEditView.kt | 3 +-- .../impl/invite/RoomInviteMembersView.kt | 4 ++-- .../roomlist/impl/RoomListContextMenu.kt | 9 +++++++-- .../components/LabelledTextField.kt | 5 ++--- .../designsystem/theme/components/Text.kt | 3 --- .../matrix/ui/components/MatrixUserRow.kt | 8 +++----- .../matrix/ui/components/UnresolvedUserRow.kt | 5 ++--- 12 files changed, 40 insertions(+), 45 deletions(-) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt index 75a2efc433..a4b6b50c95 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt @@ -36,11 +36,9 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import io.element.android.features.createroom.impl.R import io.element.android.features.createroom.impl.components.UserListView import io.element.android.libraries.architecture.Async @@ -199,8 +197,7 @@ fun CreateRoomActionButton( ) Text( text = text, - fontSize = 16.sp, - fontWeight = FontWeight.Normal + style = ElementTheme.typography.fontBodyLgRegular, ) } } diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt index 619c6a779f..dcaa8c8c2d 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt +++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt @@ -41,7 +41,6 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import io.element.android.features.invitelist.impl.R import io.element.android.features.invitelist.impl.model.InviteListInviteSummary import io.element.android.features.invitelist.impl.model.InviteListInviteSummaryProvider @@ -53,7 +52,6 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.theme.components.Button import io.element.android.libraries.designsystem.theme.components.OutlinedButton import io.element.android.libraries.designsystem.theme.components.Text -import io.element.android.libraries.designsystem.theme.noFontPadding import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings @@ -106,21 +104,18 @@ internal fun DefaultInviteSummaryRow( // Name Text( - fontSize = 16.sp, - fontWeight = FontWeight.Medium, text = invite.roomName, color = MaterialTheme.colorScheme.primary, maxLines = 1, overflow = TextOverflow.Ellipsis, - style = noFontPadding, + style = ElementTheme.typography.fontBodyLgMedium, modifier = Modifier.padding(end = bonusPadding), ) // ID or Alias invite.roomAlias?.let { Text( - fontSize = 14.sp, - fontWeight = FontWeight.Normal, + style = ElementTheme.typography.fontBodyMdRegular, text = it, color = MaterialTheme.colorScheme.secondary, maxLines = 1, @@ -188,10 +183,8 @@ private fun SenderRow(sender: InviteSender) { ) ) }, - style = noFontPadding, + style = ElementTheme.typography.fontBodyMdRegular, color = MaterialTheme.colorScheme.secondary, - fontSize = 14.sp, - fontWeight = FontWeight.Normal, ) } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt index 03fb05f455..2397485370 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt @@ -38,12 +38,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import io.element.android.libraries.designsystem.components.ProgressDialog import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData @@ -253,8 +251,7 @@ internal fun RoomSummaryView( ) { // Name Text( - fontSize = 16.sp, - fontWeight = FontWeight.SemiBold, + style = ElementTheme.typography.fontBodyLgRegular, text = summary.name, color = MaterialTheme.roomListRoomName(), maxLines = 1, @@ -264,7 +261,7 @@ internal fun RoomSummaryView( Text( text = roomAlias, color = MaterialTheme.roomListRoomMessage(), - fontSize = 14.sp, + style = ElementTheme.typography.fontBodySmRegular, maxLines = 1, overflow = TextOverflow.Ellipsis ) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt index 696df16b67..d344a5e995 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt @@ -35,11 +35,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp +import io.element.android.features.messages.impl.R import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight -import io.element.android.libraries.designsystem.theme.components.Text -import io.element.android.features.messages.impl.R import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet +import io.element.android.libraries.designsystem.theme.components.Text +import io.element.android.libraries.theme.ElementTheme import kotlinx.coroutines.launch @Composable @@ -112,11 +113,17 @@ private fun ColumnScope.RetrySendMenuContents( val coroutineScope = rememberCoroutineScope() ListItem(headlineContent = { - Text(stringResource(R.string.screen_room_retry_send_menu_title), fontWeight = FontWeight.Medium) + Text( + text = stringResource(R.string.screen_room_retry_send_menu_title), + style = ElementTheme.typography.fontBodyLgMedium, + ) }) ListItem( headlineContent = { - Text(stringResource(R.string.screen_room_retry_send_menu_send_again_action)) + Text( + text = stringResource(R.string.screen_room_retry_send_menu_send_again_action), + style = ElementTheme.typography.fontBodyLgRegular, + ) }, modifier = Modifier.clickable { coroutineScope.launch { @@ -127,7 +134,10 @@ private fun ColumnScope.RetrySendMenuContents( ) ListItem( headlineContent = { - Text(stringResource(R.string.screen_room_retry_send_menu_remove_action)) + Text( + text = stringResource(R.string.screen_room_retry_send_menu_remove_action), + style = ElementTheme.typography.fontBodyLgRegular, + ) }, colors = ListItemDefaults.colors(headlineColor = MaterialTheme.colorScheme.error), modifier = Modifier.clickable { diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemDaySeparatorView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemDaySeparatorView.kt index fc8d0ec387..c76d59806d 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemDaySeparatorView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemDaySeparatorView.kt @@ -33,6 +33,7 @@ import io.element.android.features.messages.impl.timeline.model.virtual.Timeline import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.theme.components.Text +import io.element.android.libraries.theme.ElementTheme @Composable internal fun TimelineItemDaySeparatorView( @@ -48,7 +49,7 @@ internal fun TimelineItemDaySeparatorView( ) { Text( text = model.formattedDate, - style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium), + style = ElementTheme.typography.fontBodyMdMedium, color = MaterialTheme.colorScheme.primary, ) } diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt index 80abbd600f..ddec4752db 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt @@ -264,8 +264,7 @@ private fun LabelledReadOnlyField( ) { Text( modifier = Modifier.padding(horizontal = 16.dp), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.Normal, + style = ElementTheme.typography.fontBodyMdRegular, color = MaterialTheme.colorScheme.primary, text = title, ) diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt index 1c9792f0c1..ab9d14bfd9 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt @@ -174,8 +174,8 @@ private fun RoomInviteMembersSearchBar( resultState = state, resultHandler = { results -> Text( - text = "Search results", - fontWeight = FontWeight.Medium, + text = stringResource(id = CommonStrings.common_search_results), + style = ElementTheme.typography.fontBodyLgMedium, modifier = Modifier .fillMaxWidth() .padding(start = 16.dp, top = 12.dp, end = 16.dp, bottom = 8.dp) diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt index 198916bae0..740c14aa8d 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt @@ -40,6 +40,7 @@ import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.matrix.api.core.RoomId +import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings @OptIn(ExperimentalMaterial3Api::class) @@ -79,13 +80,16 @@ private fun RoomListModalBottomSheetContent( headlineContent = { Text( text = contextMenu.roomName, - fontWeight = FontWeight.Bold, + style = ElementTheme.typography.fontBodyLgMedium, ) } ) ListItem( headlineContent = { - Text(text = stringResource(id = CommonStrings.common_settings)) + Text( + text = stringResource(id = CommonStrings.common_settings), + style = MaterialTheme.typography.bodyLarge, + ) }, modifier = Modifier.clickable { onRoomSettingsClicked(contextMenu.roomId) }, leadingContent = { @@ -102,6 +106,7 @@ private fun RoomListModalBottomSheetContent( Text( text = stringResource(id = CommonStrings.action_leave_room), color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodyLarge, ) }, modifier = Modifier.clickable { onLeaveRoomClicked(contextMenu.roomId) }, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledTextField.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledTextField.kt index 71a41c2460..cc1d92ccd8 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledTextField.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledTextField.kt @@ -23,13 +23,13 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.TextField +import io.element.android.libraries.theme.ElementTheme @Composable fun LabelledTextField( @@ -47,8 +47,7 @@ fun LabelledTextField( ) { Text( modifier = Modifier.padding(horizontal = 16.dp), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.Normal, + style = ElementTheme.typography.fontBodyMdRegular, color = MaterialTheme.colorScheme.primary, text = label ) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt index a7c5ab2507..d9d2847bcf 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt @@ -60,8 +60,6 @@ fun Text( fontSize: TextUnit = TextUnit.Unspecified, fontStyle: FontStyle? = null, // Will be removed, only style should be used - fontWeight: FontWeight? = null, - // Will be removed, only style should be used fontFamily: FontFamily? = null, // Will be removed, only style should be used letterSpacing: TextUnit = TextUnit.Unspecified, @@ -82,7 +80,6 @@ fun Text( color = color, fontSize = fontSize, fontStyle = fontStyle, - fontWeight = fontWeight, fontFamily = fontFamily, letterSpacing = letterSpacing, textDecoration = textDecoration, diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt index 6be8c375b5..6eacd89325 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt @@ -41,6 +41,7 @@ import io.element.android.libraries.designsystem.theme.noFontPadding import io.element.android.libraries.matrix.api.user.MatrixUser import io.element.android.libraries.matrix.ui.model.getAvatarData import io.element.android.libraries.matrix.ui.model.getBestName +import io.element.android.libraries.theme.ElementTheme @Composable fun MatrixUserRow( @@ -75,23 +76,20 @@ fun UserRow( ) { // Name Text( - fontSize = 16.sp, - fontWeight = FontWeight.Normal, text = name, maxLines = 1, overflow = TextOverflow.Ellipsis, color = MaterialTheme.colorScheme.primary, - style = noFontPadding, + style = ElementTheme.typography.fontBodyLgRegular, ) // Id subtext?.let { Text( text = subtext, color = MaterialTheme.colorScheme.secondary, - fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis, - style = noFontPadding, + style = ElementTheme.typography.fontBodySmRegular, ) } } diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt index 71998cc79e..7bbcdeab52 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt @@ -47,6 +47,7 @@ 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.noFontPadding import io.element.android.libraries.matrix.ui.model.getAvatarData +import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings @Composable @@ -70,13 +71,11 @@ fun UnresolvedUserRow( ) { // ID Text( - fontSize = 16.sp, - fontWeight = FontWeight.SemiBold, text = id, maxLines = 1, overflow = TextOverflow.Ellipsis, color = MaterialTheme.colorScheme.primary, - style = noFontPadding, + style = ElementTheme.typography.fontBodyLgMedium, ) // Warning