Split onboarding into multiple modules

app-feature-preview/build.gradle.kts

@@ -60,7 +60,7 @@ dependencies {
     implementation(projects.core.common)
     implementation(projects.mail.common)
 
-    implementation(projects.feature.onboarding)
+    implementation(projects.feature.onboarding.main)
     implementation(projects.feature.account.setup)
     implementation(projects.feature.account.edit)
 

app-feature-preview/src/main/java/app/k9mail/feature/preview/navigation/FeatureNavHost.kt

@@ -8,9 +8,9 @@ import app.k9mail.feature.account.edit.navigation.accountEditRoute
 import app.k9mail.feature.account.edit.navigation.navigateToAccountEditIncomingServerSettings
 import app.k9mail.feature.account.setup.navigation.accountSetupRoute
 import app.k9mail.feature.account.setup.navigation.navigateToAccountSetup
-import app.k9mail.feature.onboarding.navigation.NAVIGATION_ROUTE_ONBOARDING
+import app.k9mail.feature.onboarding.main.navigation.NAVIGATION_ROUTE_ONBOARDING
-import app.k9mail.feature.onboarding.navigation.navigateToOnboarding
+import app.k9mail.feature.onboarding.main.navigation.navigateToOnboarding
-import app.k9mail.feature.onboarding.navigation.onboardingRoute
+import app.k9mail.feature.onboarding.main.navigation.onboardingRoute
 
 @Composable
 fun FeatureNavHost(

feature/launcher/build.gradle.kts

@@ -19,7 +19,7 @@ android {
 dependencies {
     implementation(projects.core.ui.compose.designsystem)
     implementation(projects.app.ui.base)
-    implementation(projects.feature.onboarding)
+    implementation(projects.feature.onboarding.main)
     implementation(projects.feature.account.setup)
     implementation(projects.feature.account.edit)
 

feature/launcher/src/main/kotlin/app/k9mail/feature/launcher/FeatureLauncherActivity.kt

@@ -11,7 +11,7 @@ import app.k9mail.feature.account.edit.navigation.NAVIGATION_ROUTE_ACCOUNT_EDIT_
 import app.k9mail.feature.account.edit.navigation.withAccountUuid
 import app.k9mail.feature.account.setup.navigation.NAVIGATION_ROUTE_ACCOUNT_SETUP
 import app.k9mail.feature.launcher.ui.FeatureLauncherApp
-import app.k9mail.feature.onboarding.navigation.NAVIGATION_ROUTE_ONBOARDING
+import app.k9mail.feature.onboarding.main.navigation.NAVIGATION_ROUTE_ONBOARDING
 import com.fsck.k9.ui.base.K9Activity
 
 class FeatureLauncherActivity : K9Activity() {

feature/launcher/src/main/kotlin/app/k9mail/feature/launcher/navigation/FeatureLauncherNavHost.kt

@@ -10,8 +10,8 @@ import app.k9mail.feature.account.setup.navigation.accountSetupRoute
 import app.k9mail.feature.account.setup.navigation.navigateToAccountSetup
 import app.k9mail.feature.launcher.FeatureLauncherExternalContract.AccountSetupFinishedLauncher
 import app.k9mail.feature.launcher.FeatureLauncherExternalContract.ImportSettingsLauncher
-import app.k9mail.feature.onboarding.navigation.NAVIGATION_ROUTE_ONBOARDING
+import app.k9mail.feature.onboarding.main.navigation.NAVIGATION_ROUTE_ONBOARDING
-import app.k9mail.feature.onboarding.navigation.onboardingRoute
+import app.k9mail.feature.onboarding.main.navigation.onboardingRoute
 import org.koin.compose.koinInject
 
 @Composable

feature/onboarding/main/build.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+    id(ThunderbirdPlugins.Library.androidCompose)
+}
+
+android {
+    namespace = "app.k9mail.feature.onboarding.main"
+    resourcePrefix = "onboarding_main_"
+}
+
+dependencies {
+    implementation(projects.core.ui.compose.designsystem)
+    implementation(projects.feature.onboarding.welcome)
+}

feature/onboarding/main/src/main/kotlin/app/k9mail/feature/onboarding/main/navigation/OnboardingNavigation.kt

@@ -1,10 +1,10 @@
-package app.k9mail.feature.onboarding.navigation
+package app.k9mail.feature.onboarding.main.navigation
 
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import app.k9mail.core.ui.compose.common.navigation.deepLinkComposable
-import app.k9mail.feature.onboarding.ui.OnboardingScreen
+import app.k9mail.feature.onboarding.welcome.ui.OnboardingScreen
 
 const val NAVIGATION_ROUTE_ONBOARDING = "onboarding"
 

feature/onboarding/welcome/build.gradle.kts

@@ -3,8 +3,8 @@ plugins {
 }
 
 android {
-    namespace = "app.k9mail.feature.onboarding"
+    namespace = "app.k9mail.feature.onboarding.welcome"
-    resourcePrefix = "onboarding_"
+    resourcePrefix = "onboarding_welcome_"
 }
 
 dependencies {

feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/OnboardingContent.kt

@@ -1,4 +1,4 @@
-package app.k9mail.feature.onboarding.ui
+package app.k9mail.feature.onboarding.welcome.ui
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -23,7 +23,7 @@ import app.k9mail.core.ui.compose.designsystem.template.ResponsiveContent
 import app.k9mail.core.ui.compose.theme.K9Theme
 import app.k9mail.core.ui.compose.theme.MainTheme
 import app.k9mail.core.ui.compose.theme.ThunderbirdTheme
-import app.k9mail.feature.onboarding.R
+import app.k9mail.feature.onboarding.welcome.R
 
 @Composable
 internal fun OnboardingContent(

feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/OnboardingScreen.kt

@@ -1,4 +1,4 @@
-package app.k9mail.feature.onboarding.ui
+package app.k9mail.feature.onboarding.welcome.ui
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview

settings.gradle.kts

@@ -39,7 +39,11 @@ include(
 
 include(
     ":feature:launcher",
-    ":feature:onboarding",
+)
+
+include(
+    ":feature:onboarding:main",
+    ":feature:onboarding:welcome",
 )
 
 include(