Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Create alias for typography (more semantic name). aliasButtonText

Browse source
This commit is contained in:
Benoit Marty 2023-07-11 09:43:29 +02:00 • committed by Benoit Marty
parent 529f6d681e
commit 84fad3e7f3
11 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
View file

@ -43,6 +43,7 @@ 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.TextButton
import io.element.android.libraries.designsystem.theme.components.TopAppBar import io.element.android.libraries.designsystem.theme.components.TopAppBar
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
import io.element.android.libraries.theme.aliasScreenTitle import io.element.android.libraries.theme.aliasScreenTitle
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
@ -111,7 +112,7 @@ fun AddPeopleViewTopBar(
val textActionResId = if (hasSelectedUsers) CommonStrings.action_next else CommonStrings.action_skip val textActionResId = if (hasSelectedUsers) CommonStrings.action_next else CommonStrings.action_skip
Text( Text(
text = stringResource(id = textActionResId), text = stringResource(id = textActionResId),
style = ElementTheme.typography.fontBodyLgMedium, style = ElementTheme.typography.aliasButtonText,
) )
} }
} }

3
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
View file

@ -64,6 +64,7 @@ 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.SelectedUsersList
import io.element.android.libraries.matrix.ui.components.UnsavedAvatar import io.element.android.libraries.matrix.ui.components.UnsavedAvatar
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
import io.element.android.libraries.theme.aliasScreenTitle import io.element.android.libraries.theme.aliasScreenTitle
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -198,7 +199,7 @@ fun ConfigureRoomToolbar(
) { ) {
Text( Text(
text = stringResource(CommonStrings.action_create), text = stringResource(CommonStrings.action_create),
style = ElementTheme.typography.fontBodyLgMedium, style = ElementTheme.typography.aliasButtonText,
) )
} }
} }

5
features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
View file

@ -53,6 +53,7 @@ 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.OutlinedButton
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
private val minHeight = 72.dp private val minHeight = 72.dp
@ -132,7 +133,7 @@ internal fun DefaultInviteSummaryRow(
// CTAs // CTAs
Row(Modifier.padding(top = 12.dp)) { Row(Modifier.padding(top = 12.dp)) {
OutlinedButton( OutlinedButton(
content = { Text(stringResource(CommonStrings.action_decline), style = ElementTheme.typography.fontBodyLgMedium) }, content = { Text(stringResource(CommonStrings.action_decline), style = ElementTheme.typography.aliasButtonText) },
onClick = onDeclineClicked, onClick = onDeclineClicked,
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
@ -143,7 +144,7 @@ internal fun DefaultInviteSummaryRow(
Spacer(modifier = Modifier.width(12.dp)) Spacer(modifier = Modifier.width(12.dp))
Button( Button(
content = { Text(stringResource(CommonStrings.action_accept), style = ElementTheme.typography.fontBodyLgMedium) }, content = { Text(stringResource(CommonStrings.action_accept), style = ElementTheme.typography.aliasButtonText) },
onClick = onAcceptClicked, onClick = onAcceptClicked,
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)

5
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListView.kt
View file

@ -58,6 +58,7 @@ 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.TextButton
import io.element.android.libraries.designsystem.utils.OnLifecycleEvent import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
// Ref: https://www.figma.com/file/0MMNu7cTOzLOlWb7ctTkv3/Element-X?type=design&node-id=6761-148425 // Ref: https://www.figma.com/file/0MMNu7cTOzLOlWb7ctTkv3/Element-X?type=design&node-id=6761-148425
@ -151,7 +152,7 @@ private fun WaitListContent(
) { ) {
Text( Text(
text = stringResource(CommonStrings.action_cancel), text = stringResource(CommonStrings.action_cancel),
style = ElementTheme.typography.fontBodyLgMedium, style = ElementTheme.typography.aliasButtonText,
) )
} }
} }
@ -222,7 +223,7 @@ private fun WaitListContent(
) { ) {
Text( Text(
text = stringResource(id = CommonStrings.action_continue), text = stringResource(id = CommonStrings.action_continue),
style = ElementTheme.typography.fontBodyLgMedium, style = ElementTheme.typography.aliasButtonText,
) )
} }
} }

7
features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt
View file

@ -51,6 +51,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.testtags.TestTags import io.element.android.libraries.testtags.TestTags
import io.element.android.libraries.testtags.testTag import io.element.android.libraries.testtags.testTag
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
// Refs: // Refs:
@ -166,7 +167,7 @@ private fun OnBoardingButtons(
Spacer(Modifier.width(14.dp)) Spacer(Modifier.width(14.dp))
Text( Text(
text = stringResource(id = R.string.screen_onboarding_sign_in_with_qr_code), text = stringResource(id = R.string.screen_onboarding_sign_in_with_qr_code),
style = ElementTheme.typography.fontBodyLgMedium, style = ElementTheme.typography.aliasButtonText,
) )
} }
} }
@ -179,7 +180,7 @@ private fun OnBoardingButtons(
) { ) {
Text( Text(
text = stringResource(id = signInButtonStringRes), text = stringResource(id = signInButtonStringRes),
style = ElementTheme.typography.fontBodyLgMedium, style = ElementTheme.typography.aliasButtonText,
) )
} }
if (state.canCreateAccount) { if (state.canCreateAccount) {
@ -191,7 +192,7 @@ private fun OnBoardingButtons(
) { ) {
Text( Text(
text = stringResource(id = R.string.screen_onboarding_sign_up), text = stringResource(id = R.string.screen_onboarding_sign_up),
style = ElementTheme.typography.fontBodyLgMedium, style = ElementTheme.typography.aliasButtonText,
) )
} }
} }

3
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
View file

@ -76,6 +76,7 @@ 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.AvatarActionBottomSheet
import io.element.android.libraries.matrix.ui.components.UnsavedAvatar import io.element.android.libraries.matrix.ui.components.UnsavedAvatar
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
import io.element.android.libraries.theme.aliasScreenTitle import io.element.android.libraries.theme.aliasScreenTitle
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -122,7 +123,7 @@ fun RoomDetailsEditView(
) { ) {
Text( Text(
text = stringResource(CommonStrings.action_save), text = stringResource(CommonStrings.action_save),
style = ElementTheme.typography.fontBodyLgMedium, style = ElementTheme.typography.aliasButtonText,
) )
} }
} }

3
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
View file

@ -60,6 +60,7 @@ import io.element.android.libraries.matrix.api.room.RoomMember
import io.element.android.libraries.matrix.api.user.MatrixUser import io.element.android.libraries.matrix.api.user.MatrixUser
import io.element.android.libraries.matrix.ui.components.MatrixUserRow import io.element.android.libraries.matrix.ui.components.MatrixUserRow
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
import io.element.android.libraries.theme.aliasScreenTitle import io.element.android.libraries.theme.aliasScreenTitle
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
@ -219,7 +220,7 @@ private fun RoomMemberListTopBar(
) { ) {
Text( Text(
text = stringResource(CommonStrings.action_invite), text = stringResource(CommonStrings.action_invite),
style = ElementTheme.typography.fontBodyLgMedium, style = ElementTheme.typography.aliasButtonText,
) )
} }
} }

3
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RequestVerificationHeader.kt
View file

@ -42,6 +42,7 @@ 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.Surface
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
@Composable @Composable
@ -88,7 +89,7 @@ internal fun RequestVerificationHeader(
) { ) {
Text( Text(
stringResource(CommonStrings.action_continue), stringResource(CommonStrings.action_continue),
style = ElementTheme.typography.fontBodyLgMedium style = ElementTheme.typography.aliasButtonText
) )
} }
} }

3
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
View file

@ -51,6 +51,7 @@ import io.element.android.libraries.designsystem.theme.components.CircularProgre
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.matrix.api.verification.VerificationEmoji import io.element.android.libraries.matrix.api.verification.VerificationEmoji
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
import io.element.android.features.verifysession.impl.VerifySelfSessionState.VerificationStep as FlowStep import io.element.android.features.verifysession.impl.VerifySelfSessionState.VerificationStep as FlowStep
@ -232,7 +233,7 @@ internal fun BottomMenu(screenState: VerifySelfSessionState, goBack: () -> Unit)
) { ) {
Text( Text(
text = stringResource(negativeButtonTitle), text = stringResource(negativeButtonTitle),
style = ElementTheme.typography.fontBodyLgMedium, style = ElementTheme.typography.aliasButtonText,
) )
} }
} }

5
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/ButtonWithProgress.kt
View file

@ -39,6 +39,7 @@ import io.element.android.libraries.designsystem.theme.components.CircularProgre
import io.element.android.libraries.designsystem.theme.components.ElementButtonDefaults import io.element.android.libraries.designsystem.theme.components.ElementButtonDefaults
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.theme.aliasButtonText
/** /**
* A component that will display a button with an indeterminate circular progressbar. * A component that will display a button with an indeterminate circular progressbar.
@ -87,10 +88,10 @@ fun ButtonWithProgress(
) )
if (progressText != null) { if (progressText != null) {
Spacer(Modifier.width(10.dp)) Spacer(Modifier.width(10.dp))
Text(progressText, style = ElementTheme.typography.fontBodyLgMedium) Text(progressText, style = ElementTheme.typography.aliasButtonText)
} }
} else if (text != null) { } else if (text != null) {
Text(text, style = ElementTheme.typography.fontBodyLgMedium) Text(text, style = ElementTheme.typography.aliasButtonText)
} }
} }
} }

3
libraries/theme/src/main/kotlin/io/element/android/libraries/theme/TypographyAliases.kt
View file

@ -25,3 +25,6 @@ import io.element.android.libraries.theme.compound.generated.TypographyTokens
val TypographyTokens.aliasScreenTitle: TextStyle val TypographyTokens.aliasScreenTitle: TextStyle
get() = fontHeadingSmMedium get() = fontHeadingSmMedium
val TypographyTokens.aliasButtonText: TextStyle
get() = fontBodyLgMedium