diff --git a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift index 15b8e05b5e..d7255c954b 100644 --- a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift +++ b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift @@ -70,18 +70,18 @@ struct SimpleXInfo: View { .multilineTextAlignment(.center) .fixedSize(horizontal: false, vertical: true) - if onboarding { - Spacer(minLength: 0) + Spacer(minLength: 0) + if onboarding { createFirstProfileButton() .padding(.vertical, 10) + } - Button { - showWhyBuilt = true - } label: { - Label("Why SimpleX is built.", systemImage: "info.circle") - .font(.headline) - } + Button { + showWhyBuilt = true + } label: { + Label("Why SimpleX is built.", systemImage: "info.circle") + .font(.headline) } } .padding(.horizontal, 25) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/HowItWorks.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/HowItWorks.kt index a205a11145..99f8543b73 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/HowItWorks.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/HowItWorks.kt @@ -15,6 +15,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import chat.simplex.common.model.* +import chat.simplex.common.model.ChatController.appPrefs import chat.simplex.common.platform.* import chat.simplex.common.ui.theme.* import chat.simplex.common.views.chat.item.MarkdownText @@ -37,6 +38,7 @@ fun HowItWorks(user: User?, onboardingStage: SharedPreference? ReadableText(MR.strings.why_built_p6, padding = paraPadding) ReadableText(MR.strings.why_built_p7, padding = paraPadding) ReadableText(MR.strings.why_built_tagline, padding = paraPadding) + if (onboardingStage == null && appPrefs.oneHandUI.state.value) Spacer(Modifier.height(AppBarHeight * fontSizeSqrtMultiplier)) } if (onboardingStage != null) { Column( diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.kt index 41229037b5..4c16d8afc1 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.kt @@ -106,8 +106,10 @@ fun SimpleXInfoLayout( onboardingStage: SharedPreference? ) { val topBar = onboardingStage == null && !appPrefs.oneHandUI.state.value + val bottomBar = onboardingStage == null && appPrefs.oneHandUI.state.value + val barHeight = AppBarHeight * fontSizeSqrtMultiplier val modifier = Modifier.fillMaxSize().systemBarsPadding().padding(horizontal = DEFAULT_ONBOARDING_HORIZONTAL_PADDING) - Column(if (topBar) modifier.padding(top = AppBarHeight * fontSizeSqrtMultiplier) else modifier, horizontalAlignment = Alignment.CenterHorizontally) { + Column(modifier.padding(top = if (topBar) barHeight else 0.dp, bottom = if (bottomBar) barHeight else 0.dp), horizontalAlignment = Alignment.CenterHorizontally) { Box(Modifier.padding(top = DEFAULT_PADDING * 2).widthIn(max = if (appPlatform.isAndroid) 185.dp else 160.dp), contentAlignment = Alignment.Center) { SimpleXLogo() } @@ -151,15 +153,13 @@ fun SimpleXInfoLayout( } }, button = { - if (onboardingStage != null) { - Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp), horizontalAlignment = Alignment.CenterHorizontally) { + Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp), horizontalAlignment = Alignment.CenterHorizontally) { + if (onboardingStage != null) { OnboardingActionButton(user, onboardingStage) - TextButtonBelowOnboardingButton(stringResource(MR.strings.why_simplex_is_built), icon = painterResource(MR.images.ic_info), onClick = { - ModalManager.fullscreen.showModal { HowItWorks(user, onboardingStage) } - }) } - } else { - Spacer(Modifier) + TextButtonBelowOnboardingButton(stringResource(MR.strings.why_simplex_is_built), icon = painterResource(MR.images.ic_info), onClick = { + ModalManager.fullscreen.showModal { HowItWorks(user, onboardingStage) } + }) } } ) diff --git a/apps/multiplatform/common/src/desktopTest/snapshots/SimpleXInfo.PreviewSimpleXInfo-dark-font-100.png b/apps/multiplatform/common/src/desktopTest/snapshots/SimpleXInfo.PreviewSimpleXInfo-dark-font-100.png index 91a973dcd8..5f8892e866 100644 Binary files a/apps/multiplatform/common/src/desktopTest/snapshots/SimpleXInfo.PreviewSimpleXInfo-dark-font-100.png and b/apps/multiplatform/common/src/desktopTest/snapshots/SimpleXInfo.PreviewSimpleXInfo-dark-font-100.png differ diff --git a/apps/multiplatform/common/src/desktopTest/snapshots/SimpleXInfo.PreviewSimpleXInfo-light-font-100.png b/apps/multiplatform/common/src/desktopTest/snapshots/SimpleXInfo.PreviewSimpleXInfo-light-font-100.png index 346f09c00c..c881f5a126 100644 Binary files a/apps/multiplatform/common/src/desktopTest/snapshots/SimpleXInfo.PreviewSimpleXInfo-light-font-100.png and b/apps/multiplatform/common/src/desktopTest/snapshots/SimpleXInfo.PreviewSimpleXInfo-light-font-100.png differ