Skip to content

fix: onboarding padding #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
poula22 merged 1 commit into from
Jun 26, 2025
Merged

fix: onboarding padding #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 45 additions & 42 deletions app/src/main/java/com/moscow/tudee/presentation/screen/onboarding/OnboardingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ package com.moscow.tudee.presentation.screen.onboarding

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
Expand Down Expand Up @@ -42,56 +44,57 @@ fun OnboardingScreen(

val pages = provideOnboardingPages()

val pagerState = rememberPagerState(pageCount = { pages.size })
val pagerState = rememberPagerState(initialPage = 0, pageCount = { pages.size })

Box(
Box(
modifier = Modifier
.fillMaxSize()
.statusBarsPadding()
.navigationBarsPadding()
) {
Column(
modifier = Modifier
.fillMaxSize()
.background(colors.surface)
.background(colors.overlay)
) {
Column(
modifier = Modifier
.fillMaxSize()
.background(colors.surface)
.background(colors.overlay)
) {
if (pagerState.currentPage != pages.lastIndex) {
TextButton(
modifier = Modifier
.padding(top = 56.dp)
.align(Alignment.Start),
onClick = onFinish
) {
TudeeText(
text = stringResource(R.string.skip),
style = Theme.textStyle.label.large,
color = colors.primary
)
OnboardingPager(
pages = pages,
pagerState = pagerState,
onComplete = {
scope.launch {
viewModel.setOnboardingSeen(true)
onFinish()
}
}
)
}

OnboardingPager(
pages = pages,
onComplete = {
scope.launch {
viewModel.setOnboardingSeen(true)
onFinish()
}
}
)
}
Image(
painter = painterResource(
id = if (state.isSystemDark ?: isSystemInDarkTheme()) {
R.drawable.background_splash_dark
} else {
R.drawable.background_splash_light
}
),
contentDescription = stringResource(R.string.splash_background),
contentScale = ContentScale.Crop,
modifier = Modifier.fillMaxSize()
Image(
painter = painterResource(
id = if (state.isSystemDark ?: isSystemInDarkTheme()) {
R.drawable.background_splash_dark
} else {
R.drawable.background_splash_light
}
),
contentDescription = stringResource(R.string.splash_background),
contentScale = ContentScale.Crop,
modifier = Modifier.fillMaxSize()
)

if (pagerState.currentPage != pages.lastIndex) {
TudeeText(
text = stringResource(R.string.skip),
style = Theme.textStyle.label.large,
color = colors.primary,
modifier = Modifier
.padding(top = 16.dp, start = 16.dp)
.align(Alignment.TopStart)
.clickable(onClick = onFinish)
)
}
}
}

@Preview
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/com/moscow/tudee/presentation/screen/onboarding/components/DotsIndicator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand Down Expand Up @@ -39,7 +39,7 @@ fun DotsIndicator(
modifier = Modifier
.weight(1f)
.height(dotHeight)
.clip(RoundedCornerShape(100.dp))
.clip(CircleShape)
.background(if (index == selectedIndex) selectedColor else unSelectedColor)
)
}
Expand Down
11 changes: 8 additions & 3 deletions ...c/main/java/com/moscow/tudee/presentation/screen/onboarding/components/OnboardingPager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package com.moscow.tudee.presentation.screen.onboarding.components

import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.pager.PagerState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
Expand All @@ -15,10 +18,10 @@ import kotlinx.coroutines.launch
@Composable
fun OnboardingPager(
pages: List<OnboardingData>,
pagerState: PagerState,
onComplete: () -> Unit
) {
val scope = rememberCoroutineScope()
val pagerState = rememberPagerState(initialPage = 0) { pages.size }

Column {
HorizontalPager(
Expand All @@ -29,6 +32,7 @@ fun OnboardingPager(
page = pages[index],
)
}

OnboardingItem(
data = pages[pagerState.currentPage],
onNext = {
Expand All @@ -42,6 +46,7 @@ fun OnboardingPager(
}
}
)

Row(
modifier = Modifier
.fillMaxWidth()
Expand Down
Loading