Skip to content

Commit e308b1d

Browse files
bmartybmarty
authored
Merge pull request #840 from vector-im/feature/bma/cleanupText
Cleanup text
2 parents 419a00b + b871136 commit e308b1d

File tree

459 files changed

+1109
-1455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

459 files changed

+1109
-1455
lines changed

‎appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fun LoadingRoomNodeView(
8181
Text(
8282
text = stringResource(id = CommonStrings.error_unknown),
8383
color = ElementTheme.colors.textSecondary,
84-
fontSize = 14.sp,
84+
style = ElementTheme.typography.fontBodyMdRegular,
8585
)
8686
} else {
8787
CircularProgressIndicator()

‎features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,11 @@ import androidx.compose.ui.Modifier
4141
import androidx.compose.ui.draw.clip
4242
import androidx.compose.ui.graphics.Color
4343
import androidx.compose.ui.res.stringResource
44-
import androidx.compose.ui.text.font.FontWeight
4544
import androidx.compose.ui.text.style.TextAlign
4645
import androidx.compose.ui.tooling.preview.Preview
4746
import androidx.compose.ui.tooling.preview.PreviewParameter
4847
import androidx.compose.ui.unit.dp
49-
import androidx.compose.ui.unit.sp
5048
import io.element.android.features.analytics.api.AnalyticsOptInEvents
51-
import io.element.android.libraries.designsystem.ElementTextStyles
5249
import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
5350
import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
5451
import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
@@ -59,6 +56,7 @@ import io.element.android.libraries.designsystem.theme.components.Button
5956
import io.element.android.libraries.designsystem.theme.components.Icon
6057
import io.element.android.libraries.designsystem.theme.components.Text
6158
import io.element.android.libraries.designsystem.theme.components.TextButton
59+
import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
6260
import io.element.android.libraries.designsystem.utils.LogCompositions
6361
import io.element.android.libraries.theme.ElementTheme
6462
import io.element.android.libraries.ui.strings.CommonStrings
@@ -109,7 +107,7 @@ private fun AnalyticsOptInHeader(
109107
.clip(shape = RoundedCornerShape(8.dp))
110108
.clickable { onClickTerms() }
111109
.padding(8.dp),
112-
style = ElementTextStyles.Regular.subheadline,
110+
style = ElementTheme.typography.fontBodyMdRegular,
113111
textAlign = TextAlign.Center,
114112
color = MaterialTheme.colorScheme.secondary,
115113
)
@@ -162,7 +160,7 @@ private fun AnalyticsOptInContentRow(
162160
modifier = modifier
163161
.fillMaxWidth()
164162
.background(
165-
color = ElementTheme.legacyColors.quinary,
163+
color = ElementTheme.colors.temporaryColorBgSpecial,
166164
shape = bgShape,
167165
)
168166
.padding(vertical = 12.dp, horizontal = 20.dp),
@@ -179,8 +177,7 @@ private fun AnalyticsOptInContentRow(
179177
Text(
180178
modifier = Modifier.padding(start = 16.dp),
181179
text = text,
182-
fontSize = 14.sp,
183-
fontWeight = FontWeight.SemiBold,
180+
style = ElementTheme.typography.fontBodyMdMedium,
184181
color = MaterialTheme.colorScheme.primary,
185182
)
186183
}

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,23 @@ import androidx.compose.material3.ExperimentalMaterial3Api
2626
import androidx.compose.runtime.Composable
2727
import androidx.compose.ui.Modifier
2828
import androidx.compose.ui.res.stringResource
29-
import androidx.compose.ui.text.font.FontWeight
3029
import androidx.compose.ui.tooling.preview.Preview
3130
import androidx.compose.ui.tooling.preview.PreviewParameter
3231
import androidx.compose.ui.unit.dp
33-
import androidx.compose.ui.unit.sp
3432
import io.element.android.features.createroom.impl.R
3533
import io.element.android.features.createroom.impl.components.UserListView
3634
import io.element.android.features.createroom.impl.userlist.UserListEvents
3735
import io.element.android.features.createroom.impl.userlist.UserListState
3836
import io.element.android.libraries.designsystem.components.button.BackButton
3937
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
4038
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
39+
import io.element.android.libraries.designsystem.theme.aliasButtonText
40+
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
4141
import io.element.android.libraries.designsystem.theme.components.Scaffold
4242
import io.element.android.libraries.designsystem.theme.components.Text
4343
import io.element.android.libraries.designsystem.theme.components.TextButton
4444
import io.element.android.libraries.designsystem.theme.components.TopAppBar
45+
import io.element.android.libraries.theme.ElementTheme
4546
import io.element.android.libraries.ui.strings.CommonStrings
4647

4748
@OptIn(ExperimentalLayoutApi::class)
@@ -97,8 +98,7 @@ fun AddPeopleViewTopBar(
9798
title = {
9899
Text(
99100
text = stringResource(id = R.string.screen_create_room_add_people_title),
100-
fontSize = 16.sp,
101-
fontWeight = FontWeight.SemiBold,
101+
style = ElementTheme.typography.aliasScreenTitle
102102
)
103103
},
104104
navigationIcon = { BackButton(onClick = onBackPressed) },
@@ -110,7 +110,7 @@ fun AddPeopleViewTopBar(
110110
val textActionResId = if (hasSelectedUsers) CommonStrings.action_next else CommonStrings.action_skip
111111
Text(
112112
text = stringResource(id = textActionResId),
113-
fontSize = 16.sp,
113+
style = ElementTheme.typography.aliasButtonText,
114114
)
115115
}
116116
}

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewLight
3838
import io.element.android.libraries.designsystem.theme.components.Icon
3939
import io.element.android.libraries.designsystem.theme.components.RadioButton
4040
import io.element.android.libraries.designsystem.theme.components.Text
41+
import io.element.android.libraries.theme.ElementTheme
4142

4243
@Composable
4344
fun RoomPrivacyOption(
@@ -70,14 +71,13 @@ fun RoomPrivacyOption(
7071
) {
7172
Text(
7273
text = roomPrivacyItem.title,
73-
fontSize = 16.sp,
74+
style = ElementTheme.typography.fontBodyLgRegular,
7475
color = MaterialTheme.colorScheme.primary,
7576
)
7677
Spacer(Modifier.size(3.dp))
7778
Text(
7879
text = roomPrivacyItem.description,
79-
fontSize = 12.sp,
80-
lineHeight = 17.sp,
80+
style = ElementTheme.typography.fontBodySmRegular,
8181
color = MaterialTheme.colorScheme.tertiary,
8282
)
8383
}

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,9 @@ import androidx.compose.ui.focus.FocusManager
4343
import androidx.compose.ui.input.pointer.pointerInput
4444
import androidx.compose.ui.platform.LocalFocusManager
4545
import androidx.compose.ui.res.stringResource
46-
import androidx.compose.ui.text.font.FontWeight
4746
import androidx.compose.ui.tooling.preview.Preview
4847
import androidx.compose.ui.tooling.preview.PreviewParameter
4948
import androidx.compose.ui.unit.dp
50-
import androidx.compose.ui.unit.sp
5149
import io.element.android.features.createroom.impl.R
5250
import io.element.android.features.createroom.impl.components.RoomPrivacyOption
5351
import io.element.android.libraries.architecture.Async
@@ -57,6 +55,8 @@ import io.element.android.libraries.designsystem.components.button.BackButton
5755
import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
5856
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
5957
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
58+
import io.element.android.libraries.designsystem.theme.aliasButtonText
59+
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
6060
import io.element.android.libraries.designsystem.theme.components.Scaffold
6161
import io.element.android.libraries.designsystem.theme.components.Text
6262
import io.element.android.libraries.designsystem.theme.components.TextButton
@@ -65,6 +65,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
6565
import io.element.android.libraries.matrix.ui.components.AvatarActionBottomSheet
6666
import io.element.android.libraries.matrix.ui.components.SelectedUsersList
6767
import io.element.android.libraries.matrix.ui.components.UnsavedAvatar
68+
import io.element.android.libraries.theme.ElementTheme
6869
import io.element.android.libraries.ui.strings.CommonStrings
6970
import kotlinx.coroutines.launch
7071

@@ -186,8 +187,7 @@ fun ConfigureRoomToolbar(
186187
title = {
187188
Text(
188189
text = stringResource(R.string.screen_create_room_title),
189-
fontSize = 16.sp,
190-
fontWeight = FontWeight.SemiBold,
190+
style = ElementTheme.typography.aliasScreenTitle,
191191
)
192192
},
193193
navigationIcon = { BackButton(onClick = onBackPressed) },
@@ -199,7 +199,7 @@ fun ConfigureRoomToolbar(
199199
) {
200200
Text(
201201
text = stringResource(CommonStrings.action_create),
202-
fontSize = 16.sp,
202+
style = ElementTheme.typography.aliasButtonText,
203203
)
204204
}
205205
}

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,24 @@ import androidx.compose.runtime.LaunchedEffect
3636
import androidx.compose.ui.Alignment
3737
import androidx.compose.ui.Modifier
3838
import androidx.compose.ui.res.stringResource
39-
import androidx.compose.ui.text.font.FontWeight
4039
import androidx.compose.ui.tooling.preview.Preview
4140
import androidx.compose.ui.tooling.preview.PreviewParameter
4241
import androidx.compose.ui.unit.dp
43-
import androidx.compose.ui.unit.sp
4442
import io.element.android.features.createroom.impl.R
4543
import io.element.android.features.createroom.impl.components.UserListView
4644
import io.element.android.libraries.architecture.Async
4745
import io.element.android.libraries.designsystem.components.ProgressDialog
4846
import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
4947
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
5048
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
49+
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
5150
import io.element.android.libraries.designsystem.theme.components.Icon
5251
import io.element.android.libraries.designsystem.theme.components.IconButton
5352
import io.element.android.libraries.designsystem.theme.components.Scaffold
5453
import io.element.android.libraries.designsystem.theme.components.Text
5554
import io.element.android.libraries.designsystem.theme.components.TopAppBar
5655
import io.element.android.libraries.matrix.api.core.RoomId
56+
import io.element.android.libraries.theme.ElementTheme
5757
import io.element.android.libraries.ui.strings.CommonStrings
5858
import io.element.android.libraries.designsystem.R as DrawableR
5959

@@ -138,8 +138,7 @@ fun CreateRoomRootViewTopBar(
138138
title = {
139139
Text(
140140
text = stringResource(id = CommonStrings.action_start_chat),
141-
fontSize = 16.sp,
142-
fontWeight = FontWeight.SemiBold,
141+
style = ElementTheme.typography.aliasScreenTitle,
143142
)
144143
},
145144
navigationIcon = {
@@ -199,8 +198,7 @@ fun CreateRoomActionButton(
199198
)
200199
Text(
201200
text = text,
202-
fontSize = 16.sp,
203-
fontWeight = FontWeight.Normal
201+
style = ElementTheme.typography.fontBodyLgRegular,
204202
)
205203
}
206204
}

‎features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListView.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ import io.element.android.libraries.designsystem.components.dialogs.Confirmation
4242
import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
4343
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
4444
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
45+
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
4546
import io.element.android.libraries.designsystem.theme.components.Divider
4647
import io.element.android.libraries.designsystem.theme.components.Scaffold
4748
import io.element.android.libraries.designsystem.theme.components.Text
4849
import io.element.android.libraries.designsystem.theme.components.TopAppBar
4950
import io.element.android.libraries.matrix.api.core.RoomId
51+
import io.element.android.libraries.theme.ElementTheme
5052
import io.element.android.libraries.ui.strings.CommonStrings
5153

5254
@Composable
@@ -124,7 +126,10 @@ fun InviteListContent(
124126
BackButton(onClick = onBackClicked)
125127
},
126128
title = {
127-
Text(text = stringResource(CommonStrings.action_invites_list))
129+
Text(
130+
text = stringResource(CommonStrings.action_invites_list),
131+
style = ElementTheme.typography.aliasScreenTitle,
132+
)
128133
}
129134
)
130135
},

‎features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,19 @@ import androidx.compose.ui.text.style.TextOverflow
4141
import androidx.compose.ui.tooling.preview.Preview
4242
import androidx.compose.ui.tooling.preview.PreviewParameter
4343
import androidx.compose.ui.unit.dp
44-
import androidx.compose.ui.unit.sp
4544
import io.element.android.features.invitelist.impl.R
4645
import io.element.android.features.invitelist.impl.model.InviteListInviteSummary
4746
import io.element.android.features.invitelist.impl.model.InviteListInviteSummaryProvider
4847
import io.element.android.features.invitelist.impl.model.InviteSender
49-
import io.element.android.libraries.designsystem.ElementTextStyles
5048
import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
5149
import io.element.android.libraries.designsystem.components.avatar.Avatar
5250
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
5351
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
52+
import io.element.android.libraries.designsystem.theme.aliasButtonText
5453
import io.element.android.libraries.designsystem.theme.components.Button
5554
import io.element.android.libraries.designsystem.theme.components.OutlinedButton
5655
import io.element.android.libraries.designsystem.theme.components.Text
57-
import io.element.android.libraries.designsystem.theme.noFontPadding
56+
import io.element.android.libraries.theme.ElementTheme
5857
import io.element.android.libraries.ui.strings.CommonStrings
5958

6059
private val minHeight = 72.dp
@@ -106,21 +105,18 @@ internal fun DefaultInviteSummaryRow(
106105

107106
// Name
108107
Text(
109-
fontSize = 16.sp,
110-
fontWeight = FontWeight.Medium,
111108
text = invite.roomName,
112109
color = MaterialTheme.colorScheme.primary,
113110
maxLines = 1,
114111
overflow = TextOverflow.Ellipsis,
115-
style = noFontPadding,
112+
style = ElementTheme.typography.fontBodyLgMedium,
116113
modifier = Modifier.padding(end = bonusPadding),
117114
)
118115

119116
// ID or Alias
120117
invite.roomAlias?.let {
121118
Text(
122-
fontSize = 14.sp,
123-
fontWeight = FontWeight.Normal,
119+
style = ElementTheme.typography.fontBodyMdRegular,
124120
text = it,
125121
color = MaterialTheme.colorScheme.secondary,
126122
maxLines = 1,
@@ -137,7 +133,7 @@ internal fun DefaultInviteSummaryRow(
137133
// CTAs
138134
Row(Modifier.padding(top = 12.dp)) {
139135
OutlinedButton(
140-
content = { Text(stringResource(CommonStrings.action_decline), style = ElementTextStyles.Button) },
136+
content = { Text(stringResource(CommonStrings.action_decline), style = ElementTheme.typography.aliasButtonText) },
141137
onClick = onDeclineClicked,
142138
modifier = Modifier
143139
.weight(1f)
@@ -148,7 +144,7 @@ internal fun DefaultInviteSummaryRow(
148144
Spacer(modifier = Modifier.width(12.dp))
149145

150146
Button(
151-
content = { Text(stringResource(CommonStrings.action_accept), style = ElementTextStyles.Button) },
147+
content = { Text(stringResource(CommonStrings.action_accept), style = ElementTheme.typography.aliasButtonText) },
152148
onClick = onAcceptClicked,
153149
modifier = Modifier
154150
.weight(1f)
@@ -188,10 +184,8 @@ private fun SenderRow(sender: InviteSender) {
188184
)
189185
)
190186
},
191-
style = noFontPadding,
187+
style = ElementTheme.typography.fontBodyMdRegular,
192188
color = MaterialTheme.colorScheme.secondary,
193-
fontSize = 14.sp,
194-
fontWeight = FontWeight.Normal,
195189
)
196190
}
197191
}

‎features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ import androidx.compose.ui.Alignment
3636
import androidx.compose.ui.Modifier
3737
import androidx.compose.ui.graphics.Color
3838
import androidx.compose.ui.res.stringResource
39-
import androidx.compose.ui.text.font.FontWeight
4039
import androidx.compose.ui.tooling.preview.Preview
4140
import androidx.compose.ui.tooling.preview.PreviewParameter
4241
import androidx.compose.ui.unit.IntOffset
4342
import androidx.compose.ui.unit.dp
44-
import androidx.compose.ui.unit.sp
4543
import io.element.android.features.location.impl.map.MapView
4644
import io.element.android.features.location.impl.map.rememberMapState
4745
import io.element.android.libraries.designsystem.components.button.BackButton
4846
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
4947
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
48+
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
5049
import io.element.android.libraries.designsystem.theme.components.BottomSheetScaffold
5150
import io.element.android.libraries.designsystem.theme.components.Icon
5251
import io.element.android.libraries.designsystem.theme.components.Text
5352
import io.element.android.libraries.designsystem.theme.components.TopAppBar
53+
import io.element.android.libraries.theme.ElementTheme
5454
import io.element.android.libraries.ui.strings.CommonStrings
5555
import io.element.android.libraries.designsystem.R as DesignSystemR
5656

@@ -95,8 +95,7 @@ fun SendLocationView(
9595
title = {
9696
Text(
9797
text = stringResource(CommonStrings.screen_share_location_title),
98-
fontSize = 16.sp,
99-
fontWeight = FontWeight.SemiBold,
98+
style = ElementTheme.typography.aliasScreenTitle,
10099
)
101100
},
102101
navigationIcon = {

‎features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@ import io.element.android.features.location.impl.map.rememberMapState
3939
import io.element.android.libraries.designsystem.components.button.BackButton
4040
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
4141
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
42+
import io.element.android.libraries.designsystem.theme.aliasScreenTitle
4243
import io.element.android.libraries.designsystem.theme.components.Icon
4344
import io.element.android.libraries.designsystem.theme.components.IconButton
4445
import io.element.android.libraries.designsystem.theme.components.Scaffold
4546
import io.element.android.libraries.designsystem.theme.components.Text
4647
import io.element.android.libraries.designsystem.theme.components.TopAppBar
48+
import io.element.android.libraries.theme.ElementTheme
4749
import io.element.android.libraries.theme.compound.generated.TypographyTokens
4850
import io.element.android.libraries.ui.strings.CommonStrings
4951

@@ -65,7 +67,7 @@ fun ShowLocationView(
6567
title = {
6668
Text(
6769
text = stringResource(CommonStrings.screen_view_location_title),
68-
style = TypographyTokens.fontBodyLgMedium,
70+
style = ElementTheme.typography.aliasScreenTitle,
6971
)
7072
},
7173
navigationIcon = {

0 commit comments

Comments
 (0)