From 628eb759bb19c58bce7a2c408ab4ccc1ad10e119 Mon Sep 17 00:00:00 2001 From: Kr0sFyr3 Date: Wed, 13 Nov 2024 14:25:02 +0100 Subject: [PATCH] REFACTOR package structure of onboarding feature Onboarding-Package-Structure-Fix --- app/src/main/kotlin/nl/q42/template/navigation/NavGraphs.kt | 2 +- .../onboarding/presentation/start/OnboardingStartViewState.kt | 3 --- .../start => start/presentation}/OnboardingStartViewModel.kt | 2 +- .../onboarding/start/presentation/OnboardingStartViewState.kt | 3 +++ .../{ui/start => start/ui}/OnboardingStartScreen.kt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/presentation/start/OnboardingStartViewState.kt rename feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/{presentation/start => start/presentation}/OnboardingStartViewModel.kt (93%) create mode 100644 feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/start/presentation/OnboardingStartViewState.kt rename feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/{ui/start => start/ui}/OnboardingStartScreen.kt (92%) diff --git a/app/src/main/kotlin/nl/q42/template/navigation/NavGraphs.kt b/app/src/main/kotlin/nl/q42/template/navigation/NavGraphs.kt index 4a50c8c..fe7e03a 100644 --- a/app/src/main/kotlin/nl/q42/template/navigation/NavGraphs.kt +++ b/app/src/main/kotlin/nl/q42/template/navigation/NavGraphs.kt @@ -4,7 +4,7 @@ import com.ramcosta.composedestinations.spec.DestinationSpec import com.ramcosta.composedestinations.spec.NavGraphSpec import nl.q42.template.home.destinations.HomeScreenDestination import nl.q42.template.home.destinations.HomeSecondScreenDestination -import nl.q42.template.onboarding.ui.start.destinations.OnboardingStartScreenDestination +import nl.q42.template.onboarding.start.ui.destinations.OnboardingStartScreenDestination /** * diff --git a/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/presentation/start/OnboardingStartViewState.kt b/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/presentation/start/OnboardingStartViewState.kt deleted file mode 100644 index 3d90fbc..0000000 --- a/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/presentation/start/OnboardingStartViewState.kt +++ /dev/null @@ -1,3 +0,0 @@ -package nl.q42.template.onboarding.presentation.start - -class OnboardingStartViewState(val title: String) diff --git a/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/presentation/start/OnboardingStartViewModel.kt b/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/start/presentation/OnboardingStartViewModel.kt similarity index 93% rename from feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/presentation/start/OnboardingStartViewModel.kt rename to feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/start/presentation/OnboardingStartViewModel.kt index 37c5acc..d60582f 100644 --- a/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/presentation/start/OnboardingStartViewModel.kt +++ b/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/start/presentation/OnboardingStartViewModel.kt @@ -1,4 +1,4 @@ -package nl.q42.template.onboarding.presentation.start +package nl.q42.template.onboarding.start.presentation import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel diff --git a/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/start/presentation/OnboardingStartViewState.kt b/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/start/presentation/OnboardingStartViewState.kt new file mode 100644 index 0000000..559c3dc --- /dev/null +++ b/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/start/presentation/OnboardingStartViewState.kt @@ -0,0 +1,3 @@ +package nl.q42.template.onboarding.start.presentation + +class OnboardingStartViewState(val title: String) diff --git a/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/ui/start/OnboardingStartScreen.kt b/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/start/ui/OnboardingStartScreen.kt similarity index 92% rename from feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/ui/start/OnboardingStartScreen.kt rename to feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/start/ui/OnboardingStartScreen.kt index 6d6b3e5..45eb647 100644 --- a/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/ui/start/OnboardingStartScreen.kt +++ b/feature/onboarding/src/main/kotlin/nl/q42/template/onboarding/start/ui/OnboardingStartScreen.kt @@ -1,4 +1,4 @@ -package nl.q42.template.onboarding.ui.start +package nl.q42.template.onboarding.start.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -15,7 +15,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator import nl.q42.template.navigation.viewmodel.InitNavigator -import nl.q42.template.onboarding.presentation.start.OnboardingStartViewModel +import nl.q42.template.onboarding.start.presentation.OnboardingStartViewModel @Destination @Composable