Merge pull request #7157 from element-hq/feature/bma/updateOnboarding
Update onboarding screen text style
This commit is contained in:
+7
-10
@@ -30,7 +30,6 @@ import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.tooling.preview.PreviewParameter
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import io.element.android.compound.theme.ElementTheme
|
||||
import io.element.android.compound.tokens.generated.CompoundIcons
|
||||
import io.element.android.features.login.impl.R
|
||||
@@ -55,11 +54,9 @@ import io.element.android.libraries.testtags.TestTags
|
||||
import io.element.android.libraries.testtags.testTag
|
||||
import io.element.android.libraries.ui.strings.CommonStrings
|
||||
|
||||
// Refs:
|
||||
// FTUE:
|
||||
// - https://www.figma.com/file/o9p34zmiuEpZRyvZXJZAYL/FTUE?type=design&node-id=133-5427&t=5SHVppfYzjvkEywR-0
|
||||
// ElementX:
|
||||
// - https://www.figma.com/file/0MMNu7cTOzLOlWb7ctTkv3/Element-X?type=design&node-id=1816-97419
|
||||
/**
|
||||
* Ref: https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=41-6503
|
||||
*/
|
||||
@Composable
|
||||
fun OnBoardingView(
|
||||
state: OnBoardingState,
|
||||
@@ -223,14 +220,14 @@ private fun OnBoardingContent(state: OnBoardingState) {
|
||||
text = stringResource(id = R.string.screen_onboarding_welcome_title),
|
||||
color = ElementTheme.colors.textPrimary,
|
||||
style = ElementTheme.typography.fontHeadingLgBold,
|
||||
textAlign = TextAlign.Center
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
Text(
|
||||
text = stringResource(id = R.string.screen_onboarding_welcome_message, state.productionApplicationName),
|
||||
color = ElementTheme.colors.textSecondary,
|
||||
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = 17.sp),
|
||||
textAlign = TextAlign.Center
|
||||
color = ElementTheme.colors.textPrimary,
|
||||
style = ElementTheme.typography.fontBodyLgRegular,
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:81507775dafb6d842b65a66f2982ae7816ffca1f9e96b912af85bb0c50002e28
|
||||
size 310974
|
||||
oid sha256:d774f17a24d0270c5cb8419dddef5c9e77ba0fa26c8b87e8131387b262a844c7
|
||||
size 312065
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0cab598df1a80c51051338f60a2c7a5cfccd9b8288225f54271586aba15d22cb
|
||||
size 305113
|
||||
oid sha256:73d531b662c5ee7371306d2da90cb349b742b3e9e955696d0e7ba4dda435aba4
|
||||
size 306772
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c9ab8bdb21369e9342fb173ba2656d54e3617bffab16113635b35bc99d47e2c7
|
||||
size 308609
|
||||
oid sha256:12eb9a70791bfca39057aedf11abdf10da3970fd7405ca3ece1a0fa3d67529df
|
||||
size 310310
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:238fdee61834dda91ffd837f5e4a347387635e107897a444331df5ab2939027e
|
||||
size 303967
|
||||
oid sha256:47a450cc178bd56240ee5eabf1259cfb43986f9bcd2fbf5e4e54c54b845a401f
|
||||
size 305482
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a9238fe3e6c1cfd42171274979243bdf2cb6faccd7e871a479f635c90b180f51
|
||||
size 304533
|
||||
oid sha256:c05e6d1bcc7c807895bb77a361ca399ce9db24457d5b0802697bebdcee71f53f
|
||||
size 306019
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ebae03319afc453b93df8b2d93f386fd9113dc3cbd20c63778f5b508895ecda5
|
||||
size 313101
|
||||
oid sha256:4bcae33b6171c0deb02af46618a5b00b30d3dac4495657e0e1bf2f0b1c03d7e1
|
||||
size 314201
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:01fa1c9b917b65afc2d1464fad177f7420dea1625eeb7c8335d8105664134e67
|
||||
size 312145
|
||||
oid sha256:ac09917f10fdcab0f54dc23bcf6189c8db3a0ed47bcf6f8db549cfa19409b2cf
|
||||
size 313453
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c14a3ae87a82f7dbed4af6bd355abe604b335abf1004ad3bcb787088512ba697
|
||||
size 391109
|
||||
oid sha256:4c9cccb5ed04a6de52ae035fb9b83747919509ebbc7c4460a37d39751c9ca389
|
||||
size 392252
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ec2d91d4731bd62a711a565a6882d77ba6ecb1261e0cabe3ef436d57655a267d
|
||||
size 377944
|
||||
oid sha256:c1d280175bb5ec48d9400a42664fe00e15c0f4486802c2d9e48e8cb2b2ecb345
|
||||
size 379460
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a4aace29676743e516388ff9dd32ff2a953b07275edf72f76f0ad7aaf8d60e45
|
||||
size 381186
|
||||
oid sha256:3f6e1ae050b534c4b9bc8c8848dde8bab3ef49ea81132d19329e243050175439
|
||||
size 382668
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b5400be8c794a8a538683f1e0c1161cd516c4834edd8f139d0fe7f64279295c8
|
||||
size 361782
|
||||
oid sha256:2eb90fb042e21f10d37f8b3b19782572ccb91b2c3a551637627d919286d8bf66
|
||||
size 363642
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:71654cce259c93af99e655285a481f8cb1648841a908553779fcc9b5fa0c53b2
|
||||
size 362262
|
||||
oid sha256:4a44c03264570519c99172075992e9c3bedd3a6be211b56f05837c6e0ddd8e94
|
||||
size 364135
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eb971b62230078e00c1ba9c04d8b18d1419c1665c4f8f092daf111a739e1d269
|
||||
size 393095
|
||||
oid sha256:aea3574fcb361509f2c8c035fb5e5f7ebd7cafcf5e91197347f2ed24f3e45a84
|
||||
size 394253
|
||||
|
||||
+2
-2
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7e622d9b43664c5a31b83b41801ed07769384ab9ab84aad57605cdb67b16c58d
|
||||
size 392254
|
||||
oid sha256:13f5758d4b51dfb31dc028f17b3f847d6779339aaae5fdee3a1856daff1c7328
|
||||
size 393429
|
||||
|
||||
Reference in New Issue
Block a user