From 2844dee6d2dd9eaa8f7d40e2d6991042cdbb4969 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 10 Jul 2023 17:30:42 +0200 Subject: [PATCH] Remove `fontSize` parameter. Must use `style` only. --- .../element/android/appnav/room/LoadingRoomNodeView.kt | 2 +- .../createroom/impl/addpeople/AddPeopleView.kt | 2 +- .../createroom/impl/components/RoomPrivacyOption.kt | 2 +- .../createroom/impl/configureroom/ConfigureRoomView.kt | 4 +--- .../messages/impl/media/local/LocalMediaView.kt | 5 +++-- .../messages/impl/timeline/components/EmojiPicker.kt | 7 +++++-- .../impl/timeline/components/MessageEventBubble.kt | 4 ++-- .../impl/timeline/components/MessagesReactionButton.kt | 2 +- .../impl/timeline/components/TimelineItemEventRow.kt | 3 +-- .../timeline/components/event/TimelineItemFileView.kt | 4 ++-- .../components/event/TimelineItemInformativeView.kt | 3 ++- .../timeline/components/event/TimelineItemStateView.kt | 4 ++-- .../impl/timeline/components/group/GroupHeaderView.kt | 3 ++- .../roomdetails/impl/edit/RoomDetailsEditView.kt | 2 +- .../roomdetails/impl/members/RoomMemberListView.kt | 2 +- .../verifysession/impl/VerifySelfSessionView.kt | 10 ++++++++-- .../libraries/designsystem/components/avatar/Avatar.kt | 2 +- .../libraries/designsystem/theme/components/Text.kt | 3 --- .../matrix/ui/components/AvatarActionBottomSheet.kt | 4 ++-- 19 files changed, 37 insertions(+), 31 deletions(-) diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt index 362767e12d..e8d68a3e94 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt @@ -81,7 +81,7 @@ fun LoadingRoomNodeView( Text( text = stringResource(id = CommonStrings.error_unknown), color = ElementTheme.colors.textSecondary, - fontSize = 14.sp, + style = ElementTheme.typography.fontBodyMdRegular, ) } else { CircularProgressIndicator() diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt index b8e8726483..acbccff791 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt @@ -110,7 +110,7 @@ fun AddPeopleViewTopBar( val textActionResId = if (hasSelectedUsers) CommonStrings.action_next else CommonStrings.action_skip Text( text = stringResource(id = textActionResId), - fontSize = 16.sp, + style = ElementTheme.typography.fontBodyLgMedium, ) } } diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt index 6cebb7d0c6..ee664673f8 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt @@ -71,7 +71,7 @@ fun RoomPrivacyOption( ) { Text( text = roomPrivacyItem.title, - fontSize = 16.sp, + style = ElementTheme.typography.fontBodyLgRegular, color = MaterialTheme.colorScheme.primary, ) Spacer(Modifier.size(3.dp)) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt index f61cb500cf..3e11a0b465 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt @@ -43,11 +43,9 @@ import androidx.compose.ui.focus.FocusManager import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalFocusManager 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.RoomPrivacyOption import io.element.android.libraries.architecture.Async @@ -199,7 +197,7 @@ fun ConfigureRoomToolbar( ) { Text( text = stringResource(CommonStrings.action_create), - fontSize = 16.sp, + style = ElementTheme.typography.fontBodyLgMedium, ) } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaView.kt index e912e8fefc..3d2b1da222 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaView.kt @@ -66,6 +66,7 @@ import io.element.android.libraries.designsystem.R import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.utils.OnLifecycleEvent +import io.element.android.libraries.theme.ElementTheme import me.saket.telephoto.zoomable.ZoomSpec import me.saket.telephoto.zoomable.ZoomableState import me.saket.telephoto.zoomable.coil.ZoomableAsyncImage @@ -238,7 +239,7 @@ fun MediaFileView( Text( text = info.name, maxLines = 2, - fontSize = 16.sp, + style = ElementTheme.typography.fontBodyLgRegular, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center, color = MaterialTheme.colorScheme.primary @@ -246,7 +247,7 @@ fun MediaFileView( Spacer(modifier = Modifier.height(4.dp)) Text( text = formatFileExtensionAndSize(info.fileExtension, info.formattedFileSize), - fontSize = 14.sp, + style = ElementTheme.typography.fontBodyMdRegular, maxLines = 1, overflow = TextOverflow.Ellipsis, color = MaterialTheme.colorScheme.primary diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/EmojiPicker.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/EmojiPicker.kt index 8c1d5e2f31..182965a4e5 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/EmojiPicker.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/EmojiPicker.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.Icon import io.element.android.libraries.designsystem.theme.components.Text +import io.element.android.libraries.theme.ElementTheme import kotlinx.coroutines.launch @OptIn(ExperimentalFoundationApi::class) @@ -105,8 +106,10 @@ fun EmojiPicker( ), contentAlignment = Alignment.Center ) { - Text(text = item.unicode, fontSize = 20.sp) - } + Text( + text = item.unicode, + style = ElementTheme.typography.fontHeadingSmRegular, + ) } } } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt index 1c8523c3a6..339b6a3415 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt @@ -163,8 +163,8 @@ private fun ContentToPreview(state: BubbleState) { contentAlignment = Alignment.Center, ) { Text( - fontSize = 10.sp, - text = "${state.groupPosition.javaClass.simpleName} m:${state.isMine.to01()} h:${state.isHighlighted.to01()}" + text = "${state.groupPosition.javaClass.simpleName} m:${state.isMine.to01()} h:${state.isHighlighted.to01()}", + style = ElementTheme.typography.fontBodyXsRegular, ) } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt index c3a058b551..8d2eb06f99 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt @@ -151,7 +151,7 @@ private fun ReactionContent( Text( text = reaction.count.toString(), color = if (reaction.isHighlighted) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.secondary, - fontSize = 14.sp, + style = ElementTheme.typography.fontBodyMdRegular, ) } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt index 4f6854409e..8d7ff263e8 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt @@ -336,9 +336,8 @@ private fun MessageSenderInformation( Spacer(modifier = Modifier.width(4.dp)) Text( text = sender, - fontSize = 14.sp, color = MaterialTheme.colorScheme.primary, - style = MaterialTheme.typography.titleMedium, + style = ElementTheme.typography.fontBodyMdMedium, ) } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt index dc77faae52..edc2c37aab 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt @@ -75,13 +75,13 @@ fun TimelineItemFileView( text = content.body, color = ElementTheme.materialColors.primary, maxLines = 2, - fontSize = 16.sp, + style = ElementTheme.typography.fontBodyLgRegular, overflow = TextOverflow.Ellipsis ) Text( text = content.fileExtensionAndSize + extraPadding.getStr(12.sp), color = ElementTheme.materialColors.secondary, - fontSize = 12.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/event/TimelineItemInformativeView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt index fbc58a0044..83635ff7d8 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt @@ -35,6 +35,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.Icon import io.element.android.libraries.designsystem.theme.components.Text +import io.element.android.libraries.theme.ElementTheme @Composable fun TimelineItemInformativeView( @@ -58,7 +59,7 @@ fun TimelineItemInformativeView( Text( fontStyle = FontStyle.Italic, color = MaterialTheme.colorScheme.secondary, - fontSize = 14.sp, + style = ElementTheme.typography.fontBodyMdRegular, text = text + extraPadding.getStr(14.sp) ) } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStateView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStateView.kt index 1402d59fd6..461cd13cee 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStateView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStateView.kt @@ -21,12 +21,12 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.sp import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent 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 fun TimelineItemStateView( @@ -36,7 +36,7 @@ fun TimelineItemStateView( Text( modifier = modifier, color = MaterialTheme.colorScheme.secondary, - fontSize = 13.sp, + style = ElementTheme.typography.fontBodyMdRegular, text = content.body, textAlign = TextAlign.Center, ) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt index f79778c42f..b2d5dbc7f6 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt @@ -41,6 +41,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.Surface import io.element.android.libraries.designsystem.theme.components.Text +import io.element.android.libraries.theme.ElementTheme private val CORNER_RADIUS = 8.dp @@ -76,7 +77,7 @@ fun GroupHeaderView( Text( text = text, color = MaterialTheme.colorScheme.secondary, - fontSize = 13.sp + style = ElementTheme.typography.fontBodyMdRegular, ) val icon = if (isExpanded) { Icons.Default.ExpandLess 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 ddec4752db..0b4ad4527a 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 @@ -121,7 +121,7 @@ fun RoomDetailsEditView( ) { Text( text = stringResource(CommonStrings.action_save), - fontSize = 16.sp, + style = ElementTheme.typography.fontBodyLgMedium, ) } } diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt index 029742f5e7..0cb02668db 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt @@ -218,7 +218,7 @@ private fun RoomMemberListTopBar( ) { Text( text = stringResource(CommonStrings.action_invite), - fontSize = 16.sp, + style = ElementTheme.typography.fontBodyLgMedium, ) } } diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt index 6d1e4a39e9..7f811defc4 100644 --- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt +++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt @@ -158,7 +158,10 @@ internal fun ContentVerifying(verificationFlowStep: FlowStep.Verifying, modifier @Composable internal fun EmojiItemView(emoji: VerificationEmoji, modifier: Modifier = Modifier) { Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier) { - Text(emoji.code, fontSize = 34.sp) + Text( + text = emoji.code, + style = ElementTheme.typography.fontBodyMdRegular.copy(fontSize = 34.sp), + ) Spacer(modifier = Modifier.height(16.dp)) Text( emoji.name, @@ -227,7 +230,10 @@ internal fun BottomMenu(screenState: VerifySelfSessionState, goBack: () -> Unit) onClick = negativeButtonCallback, enabled = negativeButtonEnabled, ) { - Text(stringResource(negativeButtonTitle), fontSize = 16.sp) + Text( + text = stringResource(negativeButtonTitle), + style = ElementTheme.typography.fontBodyLgMedium, + ) } } } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt index 2c1169160f..b28e52a5ff 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt @@ -94,7 +94,7 @@ private fun InitialsAvatar( Text( modifier = Modifier.align(Alignment.Center), text = avatarData.initial, - fontSize = avatarData.size.dp.toSp() / 2, + style = ElementTheme.typography.fontBodyMdRegular.copy(fontSize = avatarData.size.dp.toSp() / 2), color = Color.White, ) } 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 d6b9e53fef..c9b9fb65db 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 @@ -56,8 +56,6 @@ fun Text( text: String, modifier: Modifier = Modifier, color: Color = Color.Unspecified, - // Will be removed, only style should be used - fontSize: TextUnit = TextUnit.Unspecified, fontStyle: FontStyle? = null, textDecoration: TextDecoration? = null, textAlign: TextAlign? = null, @@ -72,7 +70,6 @@ fun Text( text = text, modifier = modifier, color = color, - fontSize = fontSize, fontStyle = fontStyle, textDecoration = textDecoration, textAlign = textAlign, diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt index 7f988e8b54..b12f577c36 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt @@ -34,13 +34,13 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.sp import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.ModalBottomSheetLayout import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.matrix.ui.media.AvatarAction +import io.element.android.libraries.theme.ElementTheme import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.coroutines.launch @@ -93,7 +93,7 @@ private fun AvatarActionBottomSheetContent( headlineContent = { Text( text = stringResource(action.titleResId), - fontSize = 16.sp, + style = ElementTheme.typography.fontBodyLgRegular, color = if (action.destructive) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary, ) },