mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-19 19:52:14 +02:00
Code

Remove TextSubtitle2 and replace by TextTitleSmall

Browse Source
This commit is contained in:
Wolf-Martell Montwé 2024-04-22 14:59:36 +02:00
parent 55d6725df5
commit 8e0500e6b0
No known key found for this signature in database
GPG Key ID: 6D45B21512ACBF72
3 changed files with 7 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/TypographyItems.kt
View File

@ -10,7 +10,6 @@ import androidx.compose.ui.text.withStyle
import app.k9mail.core.ui.compose.designsystem.atom.text.TextButton
import app.k9mail.core.ui.compose.designsystem.atom.text.TextHeadline1
import app.k9mail.core.ui.compose.designsystem.atom.text.TextHeadline3
import app.k9mail.core.ui.compose.designsystem.atom.text.TextSubtitle2
import app.k9mail.ui.catalog.ui.common.list.itemDefaultPadding
import app.k9mail.ui.catalog.ui.common.list.sectionHeaderItem
@ -44,13 +43,6 @@ private fun LazyGridScope.textItems(
color = color,
)
}
item {
TextSubtitle2(
text = annotatedString("Subtitle2", isAnnotated),
modifier = Modifier.itemDefaultPadding(),
color = color,
)
}
item {
TextButton(
text = annotatedString("Button", isAnnotated),

70
core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/text/TextSubtitle2.kt
View File

@ -1,70 +0,0 @@
package app.k9mail.core.ui.compose.designsystem.atom.text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.tooling.preview.Preview
import app.k9mail.core.ui.compose.theme.MainTheme
import app.k9mail.core.ui.compose.theme.PreviewWithThemes
import androidx.compose.material.Text as MaterialText
@Composable
fun TextSubtitle2(
text: String,
modifier: Modifier = Modifier,
color: Color = Color.Unspecified,
textAlign: TextAlign? = null,
) {
MaterialText(
text = text,
modifier = modifier,
color = color,
textAlign = textAlign,
style = MainTheme.typography.subtitle2,
)
}
@Composable
fun TextSubtitle2(
text: AnnotatedString,
modifier: Modifier = Modifier,
color: Color = Color.Unspecified,
textAlign: TextAlign? = null,
) {
MaterialText(
text = text,
modifier = modifier,
color = color,
textAlign = textAlign,
style = MainTheme.typography.subtitle2,
)
}
@Preview(showBackground = true)
@Composable
internal fun TextSubtitle2Preview() {
PreviewWithThemes {
TextSubtitle2(text = "TextSubtitle2")
}
}
@Preview(showBackground = true)
@Composable
internal fun TextSubtitle2WithAnnotatedStringPreview() {
PreviewWithThemes {
TextSubtitle2(
text = buildAnnotatedString {
append("Normal")
withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
append("Annotated")
}
},
)
}
}

14
feature/account/server/certificate/src/main/kotlin/app/k9mail/feature/account/server/certificate/ui/ServerCertificateView.kt
View File

@ -12,8 +12,8 @@ import androidx.compose.ui.tooling.preview.Preview
import app.k9mail.core.ui.compose.common.koin.koinPreview
import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodyLarge
import app.k9mail.core.ui.compose.designsystem.atom.text.TextLabelSmall
import app.k9mail.core.ui.compose.designsystem.atom.text.TextSubtitle2
import app.k9mail.core.ui.compose.designsystem.atom.text.TextTitleLarge
import app.k9mail.core.ui.compose.designsystem.atom.text.TextTitleSmall
import app.k9mail.core.ui.compose.theme.K9Theme
import app.k9mail.core.ui.compose.theme.MainTheme
import app.k9mail.feature.account.server.certificate.R
@ -40,7 +40,7 @@ internal fun ServerCertificateView(
Spacer(modifier = Modifier.height(MainTheme.spacings.double))
if (serverCertificateProperties.subjectAlternativeNames.isNotEmpty()) {
TextSubtitle2(stringResource(R.string.account_server_certificate_subject_alternative_names))
TextTitleSmall(stringResource(R.string.account_server_certificate_subject_alternative_names))
for (subjectAlternativeName in serverCertificateProperties.subjectAlternativeNames) {
BulletedListItem(serverNameFormatter.format(subjectAlternativeName))
}
@ -48,22 +48,22 @@ internal fun ServerCertificateView(
Spacer(modifier = Modifier.height(MainTheme.spacings.double))
}
TextSubtitle2(stringResource(R.string.account_server_certificate_not_valid_before))
TextTitleSmall(stringResource(R.string.account_server_certificate_not_valid_before))
TextBodyLarge(text = serverCertificateProperties.notValidBefore)
Spacer(modifier = Modifier.height(MainTheme.spacings.default))
TextSubtitle2(stringResource(R.string.account_server_certificate_not_valid_after))
TextTitleSmall(stringResource(R.string.account_server_certificate_not_valid_after))
TextBodyLarge(text = serverCertificateProperties.notValidAfter)
Spacer(modifier = Modifier.height(MainTheme.spacings.double))
TextSubtitle2(stringResource(R.string.account_server_certificate_subject))
TextTitleSmall(stringResource(R.string.account_server_certificate_subject))
TextBodyLarge(text = serverCertificateProperties.subject)
Spacer(modifier = Modifier.height(MainTheme.spacings.double))
TextSubtitle2(stringResource(R.string.account_server_certificate_issuer))
TextTitleSmall(stringResource(R.string.account_server_certificate_issuer))
TextBodyLarge(text = serverCertificateProperties.issuer)
Spacer(modifier = Modifier.height(MainTheme.spacings.double))
@ -89,7 +89,7 @@ private fun Fingerprint(
)
Column {
TextSubtitle2(text = title)
TextTitleSmall(text = title)
TextBodyLarge(text = formattedFingerprint)
Spacer(modifier = Modifier.height(MainTheme.spacings.double))
}