Merge pull request #840 from vector-im/feature/bma/cleanupText

Cleanup text
element-hq · Jul 11, 2023 · e308b1d · e308b1d
2 parents 419a00b + b871136
commit e308b1d
Show file tree

Hide file tree

Showing 459 changed files with 1,109 additions and 1,455 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
@@ -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/...ics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt b/...ics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
@@ -41,14 +41,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 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.analytics.api.AnalyticsOptInEvents
-import io.element.android.libraries.designsystem.ElementTextStyles
 import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
 import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
 import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
@@ -59,6 +56,7 @@ import io.element.android.libraries.designsystem.theme.components.Button
 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.TextButton
+import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
 import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -109,7 +107,7 @@ private fun AnalyticsOptInHeader(
                 .clip(shape = RoundedCornerShape(8.dp))
                 .clickable { onClickTerms() }
                 .padding(8.dp),
-            style = ElementTextStyles.Regular.subheadline,
+            style = ElementTheme.typography.fontBodyMdRegular,
             textAlign = TextAlign.Center,
             color = MaterialTheme.colorScheme.secondary,
         )
@@ -162,7 +160,7 @@ private fun AnalyticsOptInContentRow(
         modifier = modifier
             .fillMaxWidth()
             .background(
-                color = ElementTheme.legacyColors.quinary,
+                color = ElementTheme.colors.temporaryColorBgSpecial,
                 shape = bgShape,
             )
             .padding(vertical = 12.dp, horizontal = 20.dp),
@@ -179,8 +177,7 @@ private fun AnalyticsOptInContentRow(
         Text(
             modifier = Modifier.padding(start = 16.dp),
             text = text,
-            fontSize = 14.sp,
-            fontWeight = FontWeight.SemiBold,
+            style = ElementTheme.typography.fontBodyMdMedium,
             color = MaterialTheme.colorScheme.primary,
         )
     }

diff --git a/...pl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt b/...pl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
@@ -26,22 +26,23 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 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.features.createroom.impl.userlist.UserListEvents
 import io.element.android.features.createroom.impl.userlist.UserListState
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.aliasButtonText
+import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @OptIn(ExperimentalLayoutApi::class)
@@ -97,8 +98,7 @@ fun AddPeopleViewTopBar(
         title = {
             Text(
                 text = stringResource(id = R.string.screen_create_room_add_people_title),
-                fontSize = 16.sp,
-                fontWeight = FontWeight.SemiBold,
+                style = ElementTheme.typography.aliasScreenTitle
             )
         },
         navigationIcon = { BackButton(onClick = onBackPressed) },
@@ -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.aliasButtonText,
                 )
             }
         }

diff --git a/...c/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt b/...c/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
@@ -38,6 +38,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.RadioButton
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.theme.ElementTheme
 
 @Composable
 fun RoomPrivacyOption(
@@ -70,14 +71,13 @@ fun RoomPrivacyOption(
         ) {
             Text(
                 text = roomPrivacyItem.title,
-                fontSize = 16.sp,
+                style = ElementTheme.typography.fontBodyLgRegular,
                 color = MaterialTheme.colorScheme.primary,
             )
             Spacer(Modifier.size(3.dp))
             Text(
                 text = roomPrivacyItem.description,
-                fontSize = 12.sp,
-                lineHeight = 17.sp,
+                style = ElementTheme.typography.fontBodySmRegular,
                 color = MaterialTheme.colorScheme.tertiary,
             )
         }

diff --git a/...ain/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt b/...ain/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
@@ -57,6 +55,8 @@ import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.aliasButtonText
+import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
@@ -65,6 +65,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.components.AvatarActionBottomSheet
 import io.element.android.libraries.matrix.ui.components.SelectedUsersList
 import io.element.android.libraries.matrix.ui.components.UnsavedAvatar
+import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.coroutines.launch
 
@@ -186,8 +187,7 @@ fun ConfigureRoomToolbar(
         title = {
             Text(
                 text = stringResource(R.string.screen_create_room_title),
-                fontSize = 16.sp,
-                fontWeight = FontWeight.SemiBold,
+                style = ElementTheme.typography.aliasScreenTitle,
             )
         },
         navigationIcon = { BackButton(onClick = onBackPressed) },
@@ -199,7 +199,7 @@ fun ConfigureRoomToolbar(
             ) {
                 Text(
                     text = stringResource(CommonStrings.action_create),
-                    fontSize = 16.sp,
+                    style = ElementTheme.typography.aliasButtonText,
                 )
             }
         }

diff --git a/...pl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/...pl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
@@ -36,24 +36,24 @@ 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
 import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 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
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.libraries.designsystem.R as DrawableR
 
@@ -138,8 +138,7 @@ fun CreateRoomRootViewTopBar(
         title = {
             Text(
                 text = stringResource(id = CommonStrings.action_start_chat),
-                fontSize = 16.sp,
-                fontWeight = FontWeight.SemiBold,
+                style = ElementTheme.typography.aliasScreenTitle,
             )
         },
         navigationIcon = {
@@ -199,8 +198,7 @@ fun CreateRoomActionButton(
         )
         Text(
             text = text,
-            fontSize = 16.sp,
-            fontWeight = FontWeight.Normal
+            style = ElementTheme.typography.fontBodyLgRegular,
         )
     }
 }

diff --git a/...telist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListView.kt b/...telist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListView.kt
@@ -42,11 +42,13 @@ import io.element.android.libraries.designsystem.components.dialogs.Confirmation
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 import io.element.android.libraries.designsystem.theme.components.Divider
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
@@ -124,7 +126,10 @@ fun InviteListContent(
                     BackButton(onClick = onBackClicked)
                 },
                 title = {
-                    Text(text = stringResource(CommonStrings.action_invites_list))
+                    Text(
+                        text = stringResource(CommonStrings.action_invites_list),
+                        style = ElementTheme.typography.aliasScreenTitle,
+                    )
                 }
             )
         },

diff --git a/...rc/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt b/...rc/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
@@ -41,20 +41,19 @@ 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
 import io.element.android.features.invitelist.impl.model.InviteSender
-import io.element.android.libraries.designsystem.ElementTextStyles
 import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.aliasButtonText
 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
 
 private val minHeight = 72.dp
@@ -106,21 +105,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,
@@ -137,7 +133,7 @@ internal fun DefaultInviteSummaryRow(
             // CTAs
             Row(Modifier.padding(top = 12.dp)) {
                 OutlinedButton(
-                    content = { Text(stringResource(CommonStrings.action_decline), style = ElementTextStyles.Button) },
+                    content = { Text(stringResource(CommonStrings.action_decline), style = ElementTheme.typography.aliasButtonText) },
                     onClick = onDeclineClicked,
                     modifier = Modifier
                         .weight(1f)
@@ -148,7 +144,7 @@ internal fun DefaultInviteSummaryRow(
                 Spacer(modifier = Modifier.width(12.dp))
 
                 Button(
-                    content = { Text(stringResource(CommonStrings.action_accept), style = ElementTextStyles.Button) },
+                    content = { Text(stringResource(CommonStrings.action_accept), style = ElementTheme.typography.aliasButtonText) },
                     onClick = onAcceptClicked,
                     modifier = Modifier
                         .weight(1f)
@@ -188,10 +184,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/...cation/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt b/...cation/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt
@@ -36,21 +36,21 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 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.IntOffset
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import io.element.android.features.location.impl.map.MapView
 import io.element.android.features.location.impl.map.rememberMapState
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 import io.element.android.libraries.designsystem.theme.components.BottomSheetScaffold
 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.TopAppBar
+import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.libraries.designsystem.R as DesignSystemR
 
@@ -95,8 +95,7 @@ fun SendLocationView(
                 title = {
                     Text(
                         text = stringResource(CommonStrings.screen_share_location_title),
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.SemiBold,
+                        style = ElementTheme.typography.aliasScreenTitle,
                     )
                 },
                 navigationIcon = {

diff --git a/...n/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt b/...n/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
@@ -39,11 +39,13 @@ import io.element.android.features.location.impl.map.rememberMapState
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 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
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.theme.compound.generated.TypographyTokens
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -65,7 +67,7 @@ fun ShowLocationView(
                 title = {
                     Text(
                         text = stringResource(CommonStrings.screen_view_location_title),
-                        style = TypographyTokens.fontBodyLgMedium,
+                        style = ElementTheme.typography.aliasScreenTitle,
                     )
                 },
                 navigationIcon = {