온보딩 data 로직 연결

app/build.gradle.kts

@@ -24,6 +24,7 @@ android {
     packaging {
         resources.excludes.apply {
             add("/META-INF/{AL2.0,LGPL2.1}")
+            add("META-INF/**")
         }
     }
 }

app/src/main/kotlin/com/chipichipi/dobedobe/onboarding/OnboardingScreen.kt

@@ -7,43 +7,61 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.chipichipi.dobedobe.R
 import com.chipichipi.dobedobe.core.designsystem.component.DobeDobeBackground
 import com.chipichipi.dobedobe.core.designsystem.component.DobeDobeTextButton
 import com.chipichipi.dobedobe.core.designsystem.component.DobeDobeTextField
 import com.chipichipi.dobedobe.core.designsystem.theme.DobeDobeTheme
+import com.chipichipi.dobedobe.feature.goal.errorMessage
 import org.koin.androidx.compose.koinViewModel
 
 @Composable
 internal fun OnboardingRoute(
     modifier: Modifier = Modifier,
     viewModel: OnboardingViewModel = koinViewModel(),
 ) {
+    val titleValidResult by viewModel.titleValidResult.collectAsStateWithLifecycle()
+    val errorMessage =
+        titleValidResult.errorMessage()
+            ?.let { stringResource(id = it) }
+
     OnboardingScreen(
+        errorMessage = errorMessage,
         modifier = modifier,
         completeOnboarding = viewModel::completeOnboarding,
+        onChangeTitle = viewModel::changeGoalTitle,
     )
 }
 
 @Composable
 private fun OnboardingScreen(
+    errorMessage: String?,
     completeOnboarding: () -> Unit,
+    onChangeTitle: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
         modifier = modifier.onboardingModifier(),
         horizontalAlignment = Alignment.Start,
     ) {
-        val textState = rememberTextFieldState()
+        val titleState = rememberTextFieldState()
+
+        LaunchedEffect(titleState.text) {
+            onChangeTitle(titleState.text.toString())
+        }
 
         Text(
             text = stringResource(R.string.onboarding_goal_prompt),
@@ -54,14 +72,14 @@ private fun OnboardingScreen(
         Spacer(modifier = Modifier.height(48.dp))
 
         DobeDobeTextField(
-            state = textState,
+            state = titleState,
             hint = stringResource(R.string.onboarding_goal_hint),
             supportMessage = stringResource(R.string.onboarding_goal_support_message),
+            errorMessage = errorMessage,
         )
 
         Spacer(modifier = Modifier.weight(1f))
 
-        // TODO : 클릭 시 Goal DB에 저장 필요
         DobeDobeTextButton(
             modifier = Modifier
                 .fillMaxWidth()
@@ -83,6 +101,7 @@ private fun Modifier.onboardingModifier() =
             .fillMaxSize()
             .padding(horizontal = 24.dp)
             .padding(top = 72.dp, bottom = 32.dp)
+            .navigationBarsPadding()
             .imePadding(),
     )
 
@@ -92,7 +111,10 @@ private fun OnboardingScreenPreview() {
     DobeDobeTheme {
         DobeDobeBackground {
             OnboardingScreen(
+                modifier = Modifier.fillMaxSize(),
+                errorMessage = "10글자 이상 입력해주세요",
                 completeOnboarding = {},
+                onChangeTitle = {},
             )
         }
     }

app/src/main/kotlin/com/chipichipi/dobedobe/onboarding/OnboardingViewModel.kt

@@ -2,15 +2,42 @@ package com.chipichipi.dobedobe.onboarding
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.chipichipi.dobedobe.core.data.repository.GoalRepository
 import com.chipichipi.dobedobe.core.data.repository.UserRepository
+import com.chipichipi.dobedobe.core.model.Goal
+import com.chipichipi.dobedobe.core.model.GoalTitleValidResult
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
 class OnboardingViewModel(
     private val userRepository: UserRepository,
+    private val goalRepository: GoalRepository,
 ) : ViewModel() {
+    private val title: MutableStateFlow<String> = MutableStateFlow("")
+    val titleValidResult: StateFlow<GoalTitleValidResult> =
+        title.map(Goal::validateTitle)
+            .stateIn(
+                scope = viewModelScope,
+                started = SharingStarted.Eagerly,
+                initialValue = GoalTitleValidResult.Empty,
+            )
+
+    fun changeGoalTitle(newTitle: String) {
+        title.value = newTitle
+    }
+
     fun completeOnboarding() {
         viewModelScope.launch {
-            userRepository.completeOnBoarding()
+            if (titleValidResult.value.isValid()) {
+                goalRepository.addGoal(title.value)
+                    .onSuccess {
+                        userRepository.completeOnBoarding()
+                    }
+            }
         }
     }
 }

core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/theme/Type.kt

@@ -5,6 +5,7 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.LineHeightStyle
 import androidx.compose.ui.unit.sp
 
 @Immutable
@@ -27,62 +28,98 @@ data class DobeDobeTypography internal constructor(
             fontSize = 28.sp,
             lineHeight = 42.sp,
             letterSpacing = -(0.504).sp,
+            lineHeightStyle = LineHeightStyle(
+                alignment = LineHeightStyle.Alignment.Proportional,
+                trim = LineHeightStyle.Trim.None,
+            ),
         ),
         title2: TextStyle = TextStyle(
             fontFamily = systemFontFamily,
             fontWeight = FontWeight.Bold,
             fontSize = 24.sp,
             lineHeight = 36.sp,
             letterSpacing = -(0.432).sp,
+            lineHeightStyle = LineHeightStyle(
+                alignment = LineHeightStyle.Alignment.Proportional,
+                trim = LineHeightStyle.Trim.None,
+            ),
         ),
         heading1: TextStyle = TextStyle(
             fontFamily = systemFontFamily,
             fontWeight = FontWeight.SemiBold,
             fontSize = 22.sp,
             lineHeight = 33.sp,
             letterSpacing = -(0.396).sp,
+            lineHeightStyle = LineHeightStyle(
+                alignment = LineHeightStyle.Alignment.Proportional,
+                trim = LineHeightStyle.Trim.None,
+            ),
         ),
         heading2: TextStyle = TextStyle(
             fontFamily = systemFontFamily,
             fontWeight = FontWeight.SemiBold,
             fontSize = 17.sp,
             lineHeight = 25.5.sp,
             letterSpacing = -(0.306).sp,
+            lineHeightStyle = LineHeightStyle(
+                alignment = LineHeightStyle.Alignment.Proportional,
+                trim = LineHeightStyle.Trim.None,
+            ),
         ),
         body1: TextStyle = TextStyle(
             fontFamily = systemFontFamily,
             fontWeight = FontWeight.Normal,
             fontSize = 16.sp,
             lineHeight = 24.sp,
             letterSpacing = -(0.288).sp,
+            lineHeightStyle = LineHeightStyle(
+                alignment = LineHeightStyle.Alignment.Proportional,
+                trim = LineHeightStyle.Trim.None,
+            ),
         ),
         body2: TextStyle = TextStyle(
             fontFamily = systemFontFamily,
             fontWeight = FontWeight.Normal,
             fontSize = 15.sp,
             lineHeight = 22.5.sp,
             letterSpacing = -(0.27).sp,
+            lineHeightStyle = LineHeightStyle(
+                alignment = LineHeightStyle.Alignment.Proportional,
+                trim = LineHeightStyle.Trim.None,
+            ),
         ),
         body3: TextStyle = TextStyle(
             fontFamily = systemFontFamily,
             fontWeight = FontWeight.Normal,
             fontSize = 14.sp,
             lineHeight = 21.sp,
             letterSpacing = -(0.252).sp,
+            lineHeightStyle = LineHeightStyle(
+                alignment = LineHeightStyle.Alignment.Proportional,
+                trim = LineHeightStyle.Trim.None,
+            ),
         ),
         caption1: TextStyle = TextStyle(
             fontFamily = systemFontFamily,
             fontWeight = FontWeight.Normal,
             fontSize = 12.sp,
             lineHeight = 18.sp,
             letterSpacing = -(0.216).sp,
+            lineHeightStyle = LineHeightStyle(
+                alignment = LineHeightStyle.Alignment.Proportional,
+                trim = LineHeightStyle.Trim.None,
+            ),
         ),
         caption2: TextStyle = TextStyle(
             fontFamily = systemFontFamily,
             fontWeight = FontWeight.Normal,
             fontSize = 10.sp,
             lineHeight = 15.sp,
             letterSpacing = -(0.18).sp,
+            lineHeightStyle = LineHeightStyle(
+                alignment = LineHeightStyle.Alignment.Proportional,
+                trim = LineHeightStyle.Trim.None,
+            ),
         ),
     ) : this(
         title1 = title1,