Remove fontWeight parameter. Must use style only.

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,
+            style = ElementTheme.typography.fontBodyLgRegular,
-            fontWeight = FontWeight.Normal
         )
     }
 }

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,
+                    style = ElementTheme.typography.fontBodyMdRegular,
-                    fontWeight = FontWeight.Normal,
                     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,
         )
     }
 }

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,
+                style = ElementTheme.typography.fontBodyLgRegular,
-                fontWeight = FontWeight.SemiBold,
                 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
             )

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 {

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,
         )
     }

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,
+            style = ElementTheme.typography.fontBodyMdRegular,
-            fontWeight = FontWeight.Normal,
             color = MaterialTheme.colorScheme.primary,
             text = title,
         )

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",
+                text = stringResource(id = CommonStrings.common_search_results),
-                fontWeight = FontWeight.Medium,
+                style = ElementTheme.typography.fontBodyLgMedium,
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(start = 16.dp, top = 12.dp, end = 16.dp, bottom = 8.dp)

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) },

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,
+            style = ElementTheme.typography.fontBodyMdRegular,
-            fontWeight = FontWeight.Normal,
             color = MaterialTheme.colorScheme.primary,
             text = label
         )

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,

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,
                 )
             }
         }

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