Skip to content

Commit 6cc7f6d

Browse files
authored
Merge pull request #5470 from element-hq/feature/bma/betaWording
Use "BETA" word from Localazy and ensure layout is correct
2 parents 9714abe + 2bb3508 commit 6cc7f6d

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/BetaLabel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ import androidx.compose.foundation.layout.padding
1313
import androidx.compose.foundation.shape.RoundedCornerShape
1414
import androidx.compose.runtime.Composable
1515
import androidx.compose.ui.Modifier
16+
import androidx.compose.ui.res.stringResource
1617
import androidx.compose.ui.unit.dp
1718
import io.element.android.compound.theme.ElementTheme
1819
import io.element.android.libraries.designsystem.preview.ElementPreview
1920
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
2021
import io.element.android.libraries.designsystem.theme.components.Text
22+
import io.element.android.libraries.ui.strings.CommonStrings
2123

2224
@Composable
2325
fun BetaLabel(
@@ -36,7 +38,7 @@ fun BetaLabel(
3638
shape = shape,
3739
)
3840
.padding(horizontal = 8.dp, vertical = 4.dp),
39-
text = "BETA",
41+
text = stringResource(CommonStrings.common_beta).uppercase(),
4042
style = ElementTheme.typography.fontBodySmMedium,
4143
color = ElementTheme.colors.textInfoPrimary,
4244
)

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package io.element.android.libraries.designsystem.atomic.molecules
99

1010
import androidx.compose.foundation.layout.Arrangement
1111
import androidx.compose.foundation.layout.Column
12-
import androidx.compose.foundation.layout.Row
12+
import androidx.compose.foundation.layout.FlowRow
1313
import androidx.compose.foundation.layout.Spacer
1414
import androidx.compose.foundation.layout.fillMaxWidth
1515
import androidx.compose.foundation.layout.height
@@ -51,10 +51,11 @@ fun IconTitleSubtitleMolecule(
5151
style = iconStyle,
5252
)
5353
Spacer(modifier = Modifier.height(16.dp))
54-
Row(
54+
FlowRow(
5555
modifier = Modifier.fillMaxWidth(),
56-
verticalAlignment = Alignment.CenterVertically,
57-
horizontalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterHorizontally)
56+
itemVerticalAlignment = Alignment.CenterVertically,
57+
horizontalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterHorizontally),
58+
verticalArrangement = Arrangement.spacedBy(4.dp),
5859
) {
5960
Text(
6061
text = title,

0 commit comments

Comments
 (0)