Taki/onboarding UI

build-logic/convention/src/main/kotlin/dev/yaseyo/AndroidLibraryConventionPlugin.kt

@@ -17,8 +17,6 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
             }
         }
 
-        target.enforceInternalModuleBoundaries()
-
         val libs =
             target
                 .extensions

build-logic/convention/src/main/kotlin/dev/yaseyo/KmpLibraryConventionPlugin.kt

@@ -43,8 +43,6 @@ class KmpLibraryConventionPlugin : Plugin<Project> {
                 )
             }
 
-        target.enforceInternalModuleBoundaries()
-
         target.afterEvaluate {
             val frameworkName = extension.iosFrameworkName.orNull
 

composeApp/build.gradle.kts

@@ -11,14 +11,15 @@ plugins {
 kotlin {
     androidTarget {
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_11)
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
 
     sourceSets {
         androidMain.dependencies {
             // Libs
             implementation(projects.libs.di)
+            implementation(projects.libs.design)
 
             // Dependencies
             implementation(libs.androidx.startup.runtime)
@@ -78,8 +79,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 

composeApp/src/androidMain/kotlin/dev/yaseyo/App.kt

@@ -3,39 +3,65 @@ package dev.yaseyo
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
+import dev.yaseyo.design.LocalSnackBarHostState
+import dev.yaseyo.design.YaseyoTheme
 import dev.yaseyo.navigation.AppRoute
+import dev.yaseyo.navigation.AppRouter
+import dev.yaseyo.navigation.BottomSheetSceneStrategy
 import dev.yaseyo.navigation.FeatureNavigation
+import dev.yaseyo.navigation.NavigationEvent
 import dev.yaseyo.navigation.Navigator
 import org.koin.compose.getKoin
+import org.koin.compose.koinInject
 import org.koin.core.annotation.KoinExperimentalAPI
 
 @OptIn(KoinExperimentalAPI::class)
 @Composable
-fun App(navigator: Navigator) {
-    val allFeatureNavigation = getKoin().getAll<FeatureNavigation>()
+fun App(navigator: Navigator) =
+    YaseyoTheme {
+        val appRouter = koinInject<AppRouter>()
+        val allFeatureNavigation = getKoin().getAll<FeatureNavigation>()
+        val bottomSheetStrategy = remember { BottomSheetSceneStrategy<AppRoute>() }
 
-    MaterialTheme {
-        Scaffold { padding ->
-            NavDisplay(
-                backStack = navigator.backStack,
-                modifier = Modifier.padding(padding),
-                onBack = { navigator.goBack() },
-                entryDecorators = listOf(
-                    rememberSaveableStateHolderNavEntryDecorator(),
-                    rememberViewModelStoreNavEntryDecorator(),
-                ),
-                entryProvider = allFeatureNavigation.registerAll(),
-            )
+        LaunchedEffect(appRouter) {
+            appRouter.events.collect { event ->
+                when (event) {
+                    is NavigationEvent.GoTo -> navigator.goTo(event.route)
+                    is NavigationEvent.GoBack -> navigator.goBack()
+                }
+            }
+        }
+
+        MaterialTheme {
+            Scaffold(
+                snackbarHost = {
+                    SnackbarHost(hostState = LocalSnackBarHostState.current)
+                },
+            ) { padding ->
+                NavDisplay(
+                    backStack = navigator.backStack,
+                    modifier = Modifier.padding(padding),
+                    onBack = { navigator.goBack() },
+                    entryDecorators = listOf(
+                        rememberSaveableStateHolderNavEntryDecorator(),
+                        rememberViewModelStoreNavEntryDecorator(),
+                    ),
+                    entryProvider = allFeatureNavigation.registerAll(),
+                    sceneStrategies = listOf(bottomSheetStrategy),
+                )
+            }
         }
     }
-}
 
 private fun List<FeatureNavigation>.registerAll(): (AppRoute) -> NavEntry<AppRoute> =
     entryProvider {

composeApp/src/androidMain/kotlin/dev/yaseyo/MainViewModel.kt

@@ -3,32 +3,17 @@ package dev.yaseyo
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dev.yaseyo.navigation.AppRoute
-import dev.yaseyo.navigation.Home
-import dev.yaseyo.onboarding.api.ResolveAppStateUseCase
-import dev.yaseyo.onboarding.api.model.AppState
-import dev.yaseyo.onboarding.api.navigation.OnboardingRoutes
+import dev.yaseyo.onboarding.ResolveStartDestinationUseCase
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.stateIn
 
 class MainViewModel(
-    private val resolveAppStateUseCase: ResolveAppStateUseCase,
+    private val resolveStartDestinationUseCase: ResolveStartDestinationUseCase,
 ) : ViewModel() {
     val startDestination: StateFlow<AppRoute?> = flow {
-        val appState = resolveAppStateUseCase.execute()
-
-        emit(
-            value = appState.let {
-                when (it) {
-                    AppState.FullySetup -> Home
-
-                    AppState.RequiresLogin -> OnboardingRoutes.Auth
-
-                    AppState.RequiresProfileSetup -> OnboardingRoutes.ProfileSetup
-                }
-            },
-        )
+        emit(resolveStartDestinationUseCase.execute())
     }.stateIn(
         scope = viewModelScope,
         initialValue = null,

feature/onboarding/build.gradle.kts

@@ -1,15 +1,74 @@
 plugins {
     id("yaseyo.kmp.library")
+    alias(libs.plugins.composeMultiplatform)
+    alias(libs.plugins.composeCompiler)
 }
 
 kotlin {
-    androidLibrary {
+    android {
         namespace = "dev.yaseyo.onboarding"
+
+        withHostTestBuilder {
+        }
+
+        withDeviceTestBuilder {
+            sourceSetTreeName = "test"
+        }.configure {
+            instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        }
     }
 
     sourceSets {
-        commonMain.dependencies {
-            api(projects.feature.onboarding.api)
+        commonMain {
+            dependencies {
+                implementation(libs.kotlin.stdlib)
+                implementation(libs.koin.core)
+                implementation(libs.koin.core.viewmodel)
+                implementation(libs.koin.compose)
+                implementation(libs.koin.compose.viewmodel)
+                api(libs.kotlinx.coroutines.core)
+                implementation(libs.ktor.client.core)
+
+                implementation(projects.libs.auth)
+                implementation(projects.libs.user)
+                api(projects.libs.navigation)
+                implementation(projects.libs.design)
+
+                implementation(libs.androidx.lifecycle.viewmodel)
+                implementation(libs.compose.runtime)
+                implementation(libs.compose.foundation)
+                implementation(libs.compose.material3)
+                implementation(libs.compose.uiToolingPreview)
+                implementation(libs.compose.material.icons.extended)
+                implementation(libs.compose.navigationevent)
+            }
+        }
+
+        commonTest {
+            dependencies {
+                implementation(libs.kotlin.test)
+            }
+        }
+
+        androidMain {
+            dependencies {
+                implementation(libs.koin.android)
+                implementation(libs.koin.compose.nav3)
+                implementation(libs.androidx.ui.tooling)
+            }
+        }
+
+        getByName("androidDeviceTest") {
+            dependencies {
+                implementation(libs.androidx.runner)
+                implementation(libs.androidx.core)
+                implementation(libs.androidx.testExt.junit)
+            }
+        }
+
+        iosMain {
+            dependencies {
+            }
         }
     }
 }