Taki/onboarding 2

.gitignore

@@ -19,4 +19,5 @@ captures
 !*.xcworkspace/contents.xcworkspacedata
 **/xcshareddata/WorkspaceSettings.xcsettings
 node_modules/
-CLAUDE.md
+CLAUDE.md
+.hotswan/

composeApp/build.gradle.kts

@@ -82,6 +82,12 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+    sourceSets {
+        getByName("debug") {
+            manifest.srcFile("src/androidDebug/AndroidManifest.xml")
+            res.srcDirs("src/androidDebug/res")
+        }
+    }
 }
 
 dependencies {

composeApp/src/androidDebug/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config"
+        tools:node="merge" />
+
+</manifest>

composeApp/src/androidDebug/res/xml/network_security_config.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="false">10.0.2.2</domain>
+    </domain-config>
+</network-security-config>

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

@@ -37,6 +37,7 @@ fun App(navigator: Navigator) =
             appRouter.events.collect { event ->
                 when (event) {
                     is NavigationEvent.GoTo -> navigator.goTo(event.route)
+                    is NavigationEvent.ClearBackStackAndGoTo -> navigator.clearAndGoTo(event.route)
                     is NavigationEvent.GoBack -> navigator.goBack()
                 }
             }

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

@@ -11,6 +11,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import dev.yaseyo.navigation.FinishHandler
 import dev.yaseyo.navigation.Navigator
 import org.koin.android.scope.AndroidScopeComponent
 import org.koin.androidx.scope.activityRetainedScope
@@ -19,7 +20,8 @@ import org.koin.core.scope.Scope
 
 class MainActivity :
     ComponentActivity(),
-    AndroidScopeComponent {
+    AndroidScopeComponent,
+    FinishHandler {
     override val scope: Scope by activityRetainedScope()
 
     private val viewModel: MainViewModel by viewModel()
@@ -30,6 +32,8 @@ class MainActivity :
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
+        scope.declare(this as FinishHandler, allowOverride = true)
+
         splashScreen.setKeepOnScreenCondition {
             viewModel.startDestination.value == null
         }

feature/home/build.gradle.kts

@@ -0,0 +1,74 @@
+plugins {
+    id("yaseyo.kmp.library")
+    alias(libs.plugins.composeMultiplatform)
+    alias(libs.plugins.composeCompiler)
+}
+
+kotlin {
+    android {
+        namespace = "dev.yaseyo.home"
+
+        withHostTestBuilder {
+            sourceSetTreeName = "test"
+        }
+
+        withDeviceTestBuilder {
+        }.configure {
+            instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        }
+    }
+
+    sourceSets {
+        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(projects.libs.coroutines)
+                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)
+                implementation(libs.turbine)
+                implementation(projects.libs.coroutines.testing)
+            }
+        }
+
+        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 {
+            }
+        }
+    }
+}

feature/onboarding/build.gradle.kts

@@ -9,10 +9,10 @@ kotlin {
         namespace = "dev.yaseyo.onboarding"
 
         withHostTestBuilder {
+            sourceSetTreeName = "test"
         }
 
         withDeviceTestBuilder {
-            sourceSetTreeName = "test"
         }.configure {
             instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         }
@@ -31,8 +31,10 @@ kotlin {
 
                 implementation(projects.libs.auth)
                 implementation(projects.libs.user)
+                implementation(projects.libs.coroutines)
                 api(projects.libs.navigation)
                 implementation(projects.libs.design)
+                implementation(projects.libs.datastore)
 
                 implementation(libs.androidx.lifecycle.viewmodel)
                 implementation(libs.compose.runtime)
@@ -47,6 +49,8 @@ kotlin {
         commonTest {
             dependencies {
                 implementation(libs.kotlin.test)
+                implementation(libs.turbine)
+                implementation(projects.libs.coroutines.testing)
             }
         }
 

feature/onboarding/src/commonMain/kotlin/dev/yaseyo/onboarding/datasource/OnboardingLocalDataSource.kt

@@ -0,0 +1,12 @@
+package dev.yaseyo.onboarding.datasource
+
+import dev.yaseyo.onboarding.model.OnboardingDraft
+import kotlinx.coroutines.flow.Flow
+
+internal interface OnboardingLocalDataSource {
+    val draft: Flow<OnboardingDraft>
+
+    suspend fun saveDraft(draft: OnboardingDraft)
+
+    suspend fun clearDraft()
+}

feature/onboarding/src/commonMain/kotlin/dev/yaseyo/onboarding/datasource/OnboardingLocalDataSourceImpl.kt

@@ -0,0 +1,92 @@
+package dev.yaseyo.onboarding.datasource
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
+import dev.yaseyo.onboarding.model.OnboardingDraft
+import dev.yaseyo.user.api.ActivityLevel
+import dev.yaseyo.user.api.Sex
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+internal class OnboardingLocalDataSourceImpl(
+    private val dataStore: DataStore<Preferences>,
+) : OnboardingLocalDataSource {
+    override val draft: Flow<OnboardingDraft> = dataStore.data.map { prefs ->
+        OnboardingDraft(
+            currentStepIndex = prefs[Keys.CURRENT_STEP_INDEX] ?: 0,
+            name = prefs[Keys.NAME] ?: "",
+            sex = prefs[Keys.SEX]?.toSex(),
+            dobDay = prefs[Keys.DOB_DAY] ?: 1,
+            dobMonth = prefs[Keys.DOB_MONTH] ?: 1,
+            dobYear = prefs[Keys.DOB_YEAR] ?: 1990,
+            heightCm = prefs[Keys.HEIGHT_CM] ?: 170,
+            currentWeightKg = prefs[Keys.CURRENT_WEIGHT_KG] ?: 70,
+            activityLevel = prefs[Keys.ACTIVITY_LEVEL]?.toActivityLevel(),
+            targetWeightKg = prefs[Keys.TARGET_WEIGHT_KG] ?: 70,
+            dailyDeficitKcal = prefs[Keys.DAILY_DEFICIT_KCAL] ?: 500,
+        )
+    }
+
+    override suspend fun saveDraft(draft: OnboardingDraft) {
+        dataStore.edit { prefs ->
+            prefs[Keys.CURRENT_STEP_INDEX] = draft.currentStepIndex
+            prefs[Keys.NAME] = draft.name
+            draft.sex?.let { prefs[Keys.SEX] = it.toStorageValue() } ?: prefs.remove(Keys.SEX)
+            prefs[Keys.DOB_DAY] = draft.dobDay
+            prefs[Keys.DOB_MONTH] = draft.dobMonth
+            prefs[Keys.DOB_YEAR] = draft.dobYear
+            prefs[Keys.HEIGHT_CM] = draft.heightCm
+            prefs[Keys.CURRENT_WEIGHT_KG] = draft.currentWeightKg
+            draft.activityLevel?.let { prefs[Keys.ACTIVITY_LEVEL] = it.toStorageValue() } ?: prefs.remove(Keys.ACTIVITY_LEVEL)
+            prefs[Keys.TARGET_WEIGHT_KG] = draft.targetWeightKg
+            prefs[Keys.DAILY_DEFICIT_KCAL] = draft.dailyDeficitKcal
+        }
+    }
+
+    override suspend fun clearDraft() {
+        dataStore.edit { it.clear() }
+    }
+
+    private fun String.toSex(): Sex? =
+        when (this) {
+            "MALE" -> Sex.Male
+            "FEMALE" -> Sex.Female
+            else -> null
+        }
+
+    private fun String.toActivityLevel(): ActivityLevel? =
+        when (this) {
+            "SEDENTARY" -> ActivityLevel.Sedentary
+            "LIGHTLY_ACTIVE" -> ActivityLevel.LightlyActive
+            else -> null
+        }
+
+    private fun Sex.toStorageValue() =
+        when (this) {
+            Sex.Male -> "MALE"
+            Sex.Female -> "FEMALE"
+        }
+
+    private fun ActivityLevel.toStorageValue() =
+        when (this) {
+            ActivityLevel.Sedentary -> "SEDENTARY"
+            ActivityLevel.LightlyActive -> "LIGHTLY_ACTIVE"
+        }
+
+    private object Keys {
+        val CURRENT_STEP_INDEX = intPreferencesKey("current_step_index")
+        val NAME = stringPreferencesKey("name")
+        val SEX = stringPreferencesKey("sex")
+        val DOB_DAY = intPreferencesKey("dob_day")
+        val DOB_MONTH = intPreferencesKey("dob_month")
+        val DOB_YEAR = intPreferencesKey("dob_year")
+        val HEIGHT_CM = intPreferencesKey("height_cm")
+        val CURRENT_WEIGHT_KG = intPreferencesKey("current_weight_kg")
+        val ACTIVITY_LEVEL = stringPreferencesKey("activity_level")
+        val TARGET_WEIGHT_KG = intPreferencesKey("target_weight_kg")
+        val DAILY_DEFICIT_KCAL = intPreferencesKey("daily_deficit_kcal")
+    }
+}

feature/onboarding/src/commonMain/kotlin/dev/yaseyo/onboarding/di/OnboardingModule.kt

@@ -1,18 +1,25 @@
 package dev.yaseyo.onboarding.di
 
 import dev.yaseyo.onboarding.ResolveStartDestinationUseCase
+import dev.yaseyo.onboarding.datasource.OnboardingLocalDataSource
+import dev.yaseyo.onboarding.datasource.OnboardingLocalDataSourceImpl
 import dev.yaseyo.onboarding.network.OnboardingApi
 import dev.yaseyo.onboarding.network.OnboardingApiImpl
+import dev.yaseyo.onboarding.repository.OnboardingRepository
+import dev.yaseyo.onboarding.repository.OnboardingRepositoryImpl
 import dev.yaseyo.onboarding.ui.auth.AuthViewModel
 import dev.yaseyo.onboarding.ui.profilesetup.ProfileSetupViewModel
 import org.koin.core.module.dsl.factoryOf
 import org.koin.core.module.dsl.viewModelOf
+import org.koin.dsl.bind
 import org.koin.dsl.module
 
 val onboardingModule = module {
     factoryOf(::ResolveStartDestinationUseCase)
     viewModelOf(::AuthViewModel)
 
     single<OnboardingApi> { OnboardingApiImpl(client = get()) }
+    single { OnboardingLocalDataSourceImpl(dataStore = get()) } bind OnboardingLocalDataSource::class
+    single { OnboardingRepositoryImpl(localDataSource = get(), api = get()) } bind OnboardingRepository::class
     viewModelOf(::ProfileSetupViewModel)
 }

feature/onboarding/src/commonMain/kotlin/dev/yaseyo/onboarding/model/ActivityLevelOption.kt

@@ -0,0 +1,9 @@
+package dev.yaseyo.onboarding.model
+
+import dev.yaseyo.user.api.ActivityLevel
+
+internal data class ActivityLevelOption(
+    val level: ActivityLevel,
+    val label: String,
+    val description: String,
+)

feature/onboarding/src/commonMain/kotlin/dev/yaseyo/onboarding/model/GoalSuggestion.kt

@@ -0,0 +1,8 @@
+package dev.yaseyo.onboarding.model
+
+internal data class GoalSuggestion(
+    val currentBmi: Double,
+    val currentBodyFatPct: Double?,
+    val currentBodyFatCategory: String?,
+    val suggestedTargetKg: Int,
+)

feature/onboarding/src/commonMain/kotlin/dev/yaseyo/onboarding/model/OnboardingDraft.kt

@@ -0,0 +1,18 @@
+package dev.yaseyo.onboarding.model
+
+import dev.yaseyo.user.api.ActivityLevel
+import dev.yaseyo.user.api.Sex
+
+internal data class OnboardingDraft(
+    val currentStepIndex: Int = 0,
+    val name: String = "",
+    val sex: Sex? = null,
+    val dobDay: Int = 1,
+    val dobMonth: Int = 1,
+    val dobYear: Int = 1990,
+    val heightCm: Int = 170,
+    val currentWeightKg: Int = 70,
+    val activityLevel: ActivityLevel? = null,
+    val targetWeightKg: Int = 70,
+    val dailyDeficitKcal: Int = 500,
+)

feature/onboarding/src/commonMain/kotlin/dev/yaseyo/onboarding/model/OnboardingSummary.kt

@@ -0,0 +1,10 @@
+package dev.yaseyo.onboarding.model
+
+internal data class OnboardingSummary(
+    val tdee: Int,
+    val dailyCalorieTarget: Int,
+    val weeklyLossKg: Double,
+    val proteinG: Int,
+    val carbsG: Int,
+    val fatG: Int,
+)

feature/onboarding/src/commonMain/kotlin/dev/yaseyo/onboarding/navigation/OnboardingRoutes.kt

@@ -1,11 +1,12 @@
 package dev.yaseyo.onboarding.navigation
 
+import dev.yaseyo.navigation.AppRootRoute
 import dev.yaseyo.navigation.AppRoute
 import dev.yaseyo.navigation.ModalRoute
 
 sealed interface OnboardingRoutes : AppRoute {
     data object Auth : OnboardingRoutes {
-        data object Landing : OnboardingRoutes
+        data object Landing : OnboardingRoutes, AppRootRoute
 
         data object SignIn : OnboardingRoutes, ModalRoute
 

feature/onboarding/src/commonMain/kotlin/dev/yaseyo/onboarding/network/ActivityLevelNet.kt

@@ -0,0 +1,11 @@
+package dev.yaseyo.onboarding.network
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ActivityLevelNet(
+    val level: String,
+    val label: String,
+    val description: String,
+    val multiplier: Double,
+)