From 85eaf2f34d08425712724339bf20430e1063975e Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Wed, 3 Dec 2025 11:49:40 +0800 Subject: [PATCH] compose: onboarding: Rename child screens to pages Signed-off-by: Aayush Gupta --- .../store/compose/ui/onboarding/OnboardingScreen.kt | 4 ++-- .../{PermissionsScreen.kt => PermissionsPage.kt} | 10 +++++----- .../ui/onboarding/{WelcomeScreen.kt => WelcomePage.kt} | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) rename app/src/main/java/com/aurora/store/compose/ui/onboarding/{PermissionsScreen.kt => PermissionsPage.kt} (94%) rename app/src/main/java/com/aurora/store/compose/ui/onboarding/{WelcomeScreen.kt => WelcomePage.kt} (96%) diff --git a/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt index 136c1c824..ea4104a01 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt @@ -80,8 +80,8 @@ private fun ScreenContent( verticalAlignment = Alignment.Top ) { page -> when (pages[page]) { - ExtraScreen.Welcome -> WelcomeScreen() - ExtraScreen.Permissions -> PermissionsScreen() + ExtraScreen.Welcome -> WelcomePage() + ExtraScreen.Permissions -> PermissionsPage() } } diff --git a/app/src/main/java/com/aurora/store/compose/ui/onboarding/PermissionsScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/onboarding/PermissionsPage.kt similarity index 94% rename from app/src/main/java/com/aurora/store/compose/ui/onboarding/PermissionsScreen.kt rename to app/src/main/java/com/aurora/store/compose/ui/onboarding/PermissionsPage.kt index e0479a90f..21062f16e 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/onboarding/PermissionsScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/onboarding/PermissionsPage.kt @@ -30,17 +30,17 @@ import com.aurora.store.viewmodel.commons.PermissionRationaleViewModel import kotlin.random.Random @Composable -fun PermissionsScreen(viewModel: PermissionRationaleViewModel = hiltViewModel()) { +fun PermissionsPage(viewModel: PermissionRationaleViewModel = hiltViewModel()) { val permissions by viewModel.permissions.collectAsStateWithLifecycle() - ScreenContent( + PageContent( permissions = permissions, onPermissionCallback = { viewModel.refreshPermissionsList() } ) } @Composable -private fun ScreenContent( +private fun PageContent( permissions: List = emptyList(), onPermissionCallback: (type: PermissionType) -> Unit = {} ) { @@ -73,7 +73,7 @@ private fun ScreenContent( @Preview(showBackground = true) @Composable -private fun PermissionsScreenPreview() { +private fun PermissionsPagePreview() { val permissions = PermissionType.entries.map { type -> Permission( type = type, @@ -84,7 +84,7 @@ private fun PermissionsScreenPreview() { ) } PreviewTemplate { - ScreenContent( + PageContent( permissions = permissions ) } diff --git a/app/src/main/java/com/aurora/store/compose/ui/onboarding/WelcomeScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/onboarding/WelcomePage.kt similarity index 96% rename from app/src/main/java/com/aurora/store/compose/ui/onboarding/WelcomeScreen.kt rename to app/src/main/java/com/aurora/store/compose/ui/onboarding/WelcomePage.kt index e9dca0e09..ac10f2d07 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/onboarding/WelcomeScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/onboarding/WelcomePage.kt @@ -35,18 +35,18 @@ import com.aurora.store.compose.ui.about.AboutDialog import com.aurora.store.data.model.Link @Composable -fun WelcomeScreen() { +fun WelcomePage() { var shouldShowAboutDialog by rememberSaveable { mutableStateOf(false) } if (shouldShowAboutDialog) { AboutDialog(onDismiss = { shouldShowAboutDialog = false }) } - ScreenContent(onAboutAurora = { shouldShowAboutDialog = true }) + PageContent(onAboutAurora = { shouldShowAboutDialog = true }) } @Composable -private fun ScreenContent(onAboutAurora: () -> Unit = {}) { +private fun PageContent(onAboutAurora: () -> Unit = {}) { val context = LocalContext.current val links = listOf( @@ -137,8 +137,8 @@ private fun ScreenContent(onAboutAurora: () -> Unit = {}) { @Preview(showBackground = true) @Composable -private fun WelcomeScreenPreview() { +private fun WelcomePagePreview() { PreviewTemplate { - ScreenContent() + PageContent() } }