1616
1717package io.element.android.features.onboarding.impl
1818
19- import androidx.compose.foundation.Image
2019import androidx.compose.foundation.layout.Box
2120import androidx.compose.foundation.layout.Column
2221import androidx.compose.foundation.layout.Spacer
2322import androidx.compose.foundation.layout.fillMaxSize
2423import androidx.compose.foundation.layout.fillMaxWidth
2524import androidx.compose.foundation.layout.height
2625import androidx.compose.foundation.layout.padding
27- import androidx.compose.foundation.layout.size
2826import androidx.compose.foundation.layout.width
2927import androidx.compose.material.icons.Icons
3028import androidx.compose.material.icons.filled.QrCode
@@ -33,12 +31,13 @@ import androidx.compose.runtime.Composable
3331import androidx.compose.ui.Alignment.Companion.CenterHorizontally
3432import androidx.compose.ui.BiasAlignment
3533import androidx.compose.ui.Modifier
36- import androidx.compose.ui.res.painterResource
3734import androidx.compose.ui.res.stringResource
3835import androidx.compose.ui.text.style.TextAlign
3936import androidx.compose.ui.tooling.preview.PreviewParameter
4037import androidx.compose.ui.unit.dp
4138import androidx.compose.ui.unit.sp
39+ import io.element.android.libraries.designsystem.atomic.atoms.ElementLogoAtom
40+ import io.element.android.libraries.designsystem.atomic.atoms.ElementLogoAtomSize
4241import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
4342import io.element.android.libraries.designsystem.atomic.pages.OnBoardingPage
4443import io.element.android.libraries.designsystem.preview.DayNightPreviews
@@ -84,10 +83,6 @@ fun OnBoardingView(
8483
8584@Composable
8685private fun OnBoardingContent (modifier : Modifier = Modifier ) {
87- // Note: having a night variant of R.drawable.onboarding_icon in the folder `drawable-night` is working
88- // at runtime, but is not in Android Studio Preview. So I prefer to handle this manually.
89- val isLight = ElementTheme .colors.isLight
90- val iconDrawableRes = if (isLight) R .drawable.onboarding_icon_light else R .drawable.onboarding_icon_dark
9186 Box (
9287 modifier = modifier.fillMaxSize(),
9388 ) {
@@ -98,14 +93,9 @@ private fun OnBoardingContent(modifier: Modifier = Modifier) {
9893 verticalBias = - 0.4f
9994 )
10095 ) {
101- // Dark and light icon does not have the same size, add padding to the smaller one
102- val imagePadding = if (isLight) 28 .dp else 0 .dp
103- Image (
104- modifier = Modifier
105- .size(278 .dp)
106- .padding(imagePadding),
107- painter = painterResource(id = iconDrawableRes),
108- contentDescription = null ,
96+ ElementLogoAtom (
97+ size = ElementLogoAtomSize .Huge ,
98+ modifier = Modifier .padding(top = ElementLogoAtomSize .Huge .shadowRadius / 2 )
10999 )
110100 }
111101 Box (
0 commit comments