TextStyle again.

2023-07-10 16:34:58 +02:00
parent 7be0e3ea4b
commit 247348b372
13 changed files with 33 additions and 29 deletions
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
@@ -41,12 +41,10 @@ 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.atomic.molecules.ButtonColumnMolecule
 import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
@@ -178,8 +176,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,
        )
    }
--- 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
@@ -42,6 +42,7 @@ 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.fontHeadingSmMedium
            )
        },
        navigationIcon = { BackButton(onClick = onBackPressed) },
--- 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
@@ -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.fontHeadingSmMedium,
            )
        },
        navigationIcon = { BackButton(onClick = onBackPressed) },
--- 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
@@ -54,6 +54,7 @@ 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 +139,7 @@ fun CreateRoomRootViewTopBar(
        title = {
            Text(
                text = stringResource(id = CommonStrings.action_start_chat),
-                fontSize = 16.sp,
-                fontWeight = FontWeight.SemiBold,
+                style = ElementTheme.typography.fontHeadingSmMedium,
            )
        },
        navigationIcon = {
--- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListView.kt
+++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListView.kt
@@ -47,6 +47,7 @@ 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 +125,10 @@ fun InviteListContent(
                    BackButton(onClick = onBackClicked)
                },
                title = {
-                    Text(text = stringResource(CommonStrings.action_invites_list))
+                    Text(
+                        text = stringResource(CommonStrings.action_invites_list),
+                        style = ElementTheme.typography.fontHeadingSmMedium,
+                    )
                }
            )
        },
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt
@@ -51,6 +51,7 @@ import io.element.android.libraries.designsystem.theme.components.BottomSheetSca
 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 +96,7 @@ fun SendLocationView(
                title = {
                    Text(
                        text = stringResource(CommonStrings.screen_share_location_title),
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.SemiBold,
+                        style = ElementTheme.typography.fontHeadingSmMedium,
                    )
                },
                navigationIcon = {
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
@@ -44,6 +44,7 @@ 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 +66,7 @@ fun ShowLocationView(
                title = {
                    Text(
                        text = stringResource(CommonStrings.screen_view_location_title),
-                        style = TypographyTokens.fontBodyLgMedium,
+                        style = ElementTheme.typography.fontHeadingSmMedium,
                    )
                },
                navigationIcon = {
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -79,6 +79,7 @@ import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.designsystem.utils.rememberSnackbarHostState
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
+import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 import timber.log.Timber
@@ -307,9 +308,8 @@ fun MessagesViewTopBar(
                Avatar(roomAvatar)
                Spacer(modifier = Modifier.width(8.dp))
                Text(
-                    fontSize = 16.sp,
-                    fontWeight = FontWeight.SemiBold,
                    text = roomTitle,
+                    style = ElementTheme.typography.fontBodyLgMedium,
                    maxLines = 1,
                    overflow = TextOverflow.Ellipsis
                )
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
@@ -62,6 +62,7 @@ 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.EventId
+import io.element.android.libraries.theme.ElementTheme

 /**
 * Screen used to display debug info for events.
@@ -83,7 +84,10 @@ fun EventDebugInfoView(
        topBar = {
            TopAppBar(
                title = {
-                    Text("Debug event info")
+                    Text(
+                        text = "Debug event info",
+                        style = ElementTheme.typography.fontHeadingSmMedium,
+                    )
                },
                navigationIcon = { BackButton(onClick = onBackPressed) }
            )
--- 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
@@ -75,6 +75,7 @@ import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.ui.components.AvatarActionBottomSheet
 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

@@ -106,8 +107,7 @@ fun RoomDetailsEditView(
                title = {
                    Text(
                        text = stringResource(id = R.string.screen_room_details_edit_room_title),
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.SemiBold,
+                        style = ElementTheme.typography.fontHeadingSmMedium,
                    )
                },
                navigationIcon = { BackButton(onClick = onBackPressed) },
--- 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
@@ -52,6 +52,7 @@ import io.element.android.libraries.matrix.ui.components.CheckableUserRow
 import io.element.android.libraries.matrix.ui.components.SelectedUsersList
 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
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList

@@ -122,8 +123,7 @@ fun RoomInviteMembersTopBar(
        title = {
            Text(
                text = stringResource(R.string.screen_room_details_invite_people_title),
-                fontSize = 16.sp,
-                fontWeight = FontWeight.SemiBold,
+                style = ElementTheme.typography.fontHeadingSmMedium,
            )
        },
        navigationIcon = { BackButton(onClick = onBackPressed) },
--- 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
@@ -206,8 +206,7 @@ private fun RoomMemberListTopBar(
        title = {
            Text(
                text = stringResource(R.string.screen_room_details_people_title),
-                fontSize = 16.sp,
-                fontWeight = FontWeight.SemiBold,
+                style = ElementTheme.typography.fontHeadingSmMedium,
            )
        },
        navigationIcon = { BackButton(onClick = onBackPressed) },
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt
@@ -24,7 +24,6 @@ import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.outlined.BugReport
 import androidx.compose.material.icons.outlined.Share
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.material3.rememberTopAppBarState
@@ -37,10 +36,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import io.element.android.features.roomlist.impl.R
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
@@ -113,10 +110,12 @@ private fun DefaultRoomListTopBar(
        modifier = modifier
            .nestedScroll(scrollBehavior.nestedScrollConnection),
        title = {
-            val fontSize = if (scrollBehavior.state.collapsedFraction > 0.5) 20.sp else 22.sp
+            val fontStyle = if (scrollBehavior.state.collapsedFraction > 0.5)
+                ElementTheme.typography.fontHeadingSmMedium
+            else
+                ElementTheme.typography.fontHeadingLgBold
            Text(
-                fontWeight = FontWeight.Bold,
-                style = MaterialTheme.typography.headlineMedium.copy(fontSize = fontSize),
+                style = fontStyle,
                text = stringResource(id = R.string.screen_roomlist_main_space_title)
            )
        },