style: Clean OnboardingScreen

Infomaniak · Dec 4, 2024 · 16be839 · 16be839
1 parent 6f4cbe5
commit 16be839
Showing 1 changed file with 11 additions and 16 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/onboarding/OnboardingScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/onboarding/OnboardingScreen.kt
@@ -67,19 +67,17 @@ fun OnboardingScreen(goToMainActivity: () -> Unit) {
     }
 
     val onboardingPages = buildList {
-        Page.entries.forEach { page ->
-            add(page.toOnboardingPage(isHighlighted))
-        }
+        Page.entries.forEach { page -> add(page.toOnboardingPage(isHighlighted)) }
     }
 
     OnboardingScaffold(
         pagerState = pagerState,
         onboardingPages = onboardingPages,
-        bottomContent = {
+        bottomContent = { paddingValues ->
             BottomContent(
                 modifier = Modifier
-                    .padding(it)
-                    .consumeWindowInsets(it),
+                    .padding(paddingValues)
+                    .consumeWindowInsets(paddingValues),
                 isLastPage = { isLastPage },
                 startMainActivity = goToMainActivity,
                 goToNextPage = { coroutineScope.launch { pagerState.animateScrollToPage(pagerState.currentPage + 1) } },
@@ -91,7 +89,7 @@ fun OnboardingScreen(goToMainActivity: () -> Unit) {
 @Composable
 private fun Page.toOnboardingPage(isHighlighted: Map<Page, MutableState<Boolean>>) = OnboardingPage(
     background = background.image(),
-    illustration = { Illustration(illustration) },
+    illustration = { Image(illustration.image(), contentDescription = null) },
     text = {
         TitleAndDescription(
             page = this,
@@ -100,11 +98,6 @@ private fun Page.toOnboardingPage(isHighlighted: Map<Page, MutableState<Boolean>
     }
 )
 
-@Composable
-private fun Illustration(illustration: ThemedImage) {
-    Image(illustration.image(), contentDescription = null)
-}
-
 @Composable
 private fun TitleAndDescription(page: Page, isHighlighted: () -> Boolean) {
     Column(horizontalAlignment = Alignment.CenterHorizontally) {
@@ -132,7 +125,7 @@ private fun BottomContent(
     modifier: Modifier = Modifier,
     isLastPage: () -> Boolean,
     startMainActivity: () -> Unit,
-    goToNextPage: () -> Unit
+    goToNextPage: () -> Unit,
 ) {
     Box(
         contentAlignment = Alignment.Center,
@@ -147,6 +140,8 @@ private fun BottomContent(
     }
 }
 
+private const val HIGHLIGHT_ANGLE = 3.0
+
 private enum class Page(
     val background: ThemedImage,
     val illustration: ThemedImage,
@@ -161,23 +156,23 @@ private enum class Page(
         titleRes = R.string.onboardingStorageTitle,
         subtitleTemplateRes = R.string.onboardingStorageSubtitleTemplate,
         subtitleArgumentRes = R.string.onboardingStorageSubtitleArgument,
-        highlightAngleDegree = -3.0,
+        highlightAngleDegree = -HIGHLIGHT_ANGLE,
     ),
     EXPIRATION(
         background = AppIllus.RadialGradientCornerTopLeft,
         illustration = AppIllus.ThreeCardsTransferType,
         titleRes = R.string.onboardingExpirationTitle,
         subtitleTemplateRes = R.string.onboardingExpirationSubtitleTemplate,
         subtitleArgumentRes = R.string.onboardingExpirationSubtitleArgument,
-        highlightAngleDegree = -3.0,
+        highlightAngleDegree = -HIGHLIGHT_ANGLE,
     ),
     PASSWORD(
         background = AppIllus.RadialGradientCornerTopRight,
         illustration = AppIllus.TwoPadlocksIntertwinedStars,
         titleRes = R.string.onboardingPasswordTitle,
         subtitleTemplateRes = R.string.onboardingPasswordSubtitleTemplate,
         subtitleArgumentRes = R.string.onboardingPasswordSubtitleArgument,
-        highlightAngleDegree = 3.0,
+        highlightAngleDegree = HIGHLIGHT_ANGLE,
     ),
 }