온보딩 마지막 수정

app/src/main/java/com/teampatch/harmony/MainNavHost.kt

@@ -1,5 +1,6 @@
 package com.teampatch.harmony
 
+import android.net.Uri
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -21,8 +22,12 @@ import com.teampatch.feature.memorycard.registration.addMemoryCardRegistrationSc
 import com.teampatch.feature.memorycard.registration.navigateToMemoryCardRegistrationScreen
 import com.teampatch.feature.memorystorage.addMemoryStorageScreen
 import com.teampatch.feature.onboarding.enter.addOnboardingEnterInvitationCodeScreen
+import com.teampatch.feature.onboarding.enter.addOnboardingEnterProfileSettingsScreen
+import com.teampatch.feature.onboarding.enter.addOnboardingEnterRelationScreen
 import com.teampatch.feature.onboarding.enter.addOnboardingEnterSpaceScreen
 import com.teampatch.feature.onboarding.enter.navigateToEnterInvitationCodeScreen
+import com.teampatch.feature.onboarding.enter.navigateToEnterProfileSettingsScreen
+import com.teampatch.feature.onboarding.enter.navigateToEnterRelationScreen
 import com.teampatch.feature.onboarding.enter.navigateToEnterSpaceScreen
 import com.teampatch.feature.onboarding.login.ui.OnboardingRoute
 import com.teampatch.feature.onboarding.login.ui.OnboardingStartRoute
@@ -31,12 +36,14 @@ import com.teampatch.feature.onboarding.login.ui.addOnboardingScreen
 import com.teampatch.feature.onboarding.login.ui.addOnboardingStartScreen
 import com.teampatch.feature.onboarding.login.ui.navigateToPermissionNotificationScreen
 import com.teampatch.feature.onboarding.login.ui.navigateToStartScreen
+import com.teampatch.feature.onboarding.make.addOnboardingMakeInviteGrandParentsScreen
 import com.teampatch.feature.onboarding.make.addOnboardingMakeParentsNameScreen
 import com.teampatch.feature.onboarding.make.addOnboardingMakeProfileSettingsScreen
 import com.teampatch.feature.onboarding.make.addOnboardingMakeRelationScreen
 import com.teampatch.feature.onboarding.make.navigateToMakeGroupScreen
 import com.teampatch.feature.onboarding.make.navigateToMakeProfileSettingsScreen
 import com.teampatch.feature.onboarding.make.navigateToMakeRelationScreen
+import com.teampatch.feature.onboarding.make.navigateToShareInvitationScreen
 import com.teampatch.feature.profile.edit.addProfileEditScreen
 import com.teampatch.feature.profile.edit.navigateToProfileEditScreen
 import com.teampatch.feature.question.addQuestionScreen
@@ -104,17 +111,17 @@ fun MainNavHost(
             onShareInvitationScreenRequest = navController::navigateToMakeRelationScreen
         )
 
-//        addOnboardingMakeInviteGrandParentsScreen(
-//            onBackRequest = navController::navigateUp,
-//            onRelationScreenRequest = { navController.navigateToMakeRelationScreen() }
-//        )
-
         addOnboardingMakeRelationScreen(
             onBackRequest = navController::navigateUp,
             onProfileSettingsScreenRequest = navController::navigateToMakeProfileSettingsScreen
         )
 
         addOnboardingMakeProfileSettingsScreen(
+            onBackRequest = navController::navigateUp,
+            onHomeRouteRequest = { navController.navigateToShareInvitationScreen() }
+        )
+
+        addOnboardingMakeInviteGrandParentsScreen(
             onBackRequest = navController::navigateUp,
             onHomeRouteRequest = { navController.navigateToHomeScreen() }
         )
@@ -123,7 +130,21 @@ fun MainNavHost(
 
         addOnboardingEnterInvitationCodeScreen(
             onBackRequest = navController::navigateUp,
-            onEnterSpaceScreenRequest = { navController.navigateToEnterSpaceScreen() }
+            onEnterRelationScreenRequest = navController::navigateToEnterRelationScreen
+        )
+
+        addOnboardingEnterRelationScreen(
+            onBackRequest = navController::navigateUp,
+            onEnterProfileSettingsScreenRequest = navController::navigateToEnterProfileSettingsScreen
+        )
+
+        addOnboardingEnterProfileSettingsScreen(
+            onBackRequest = navController::navigateUp,
+            onEnterSpaceScreenRequest = { uris: List<Uri> ->
+                // uris는 List<Uri> 타입
+                val uriStrings = uris.map { it.toString() } // List<Uri> -> List<String>
+                navController.navigateToEnterSpaceScreen(urisAsStrings = uriStrings) // 수정된 함수 호출
+            }
         )
 
         addOnboardingEnterSpaceScreen(

core/designsystem/src/main/java/com/teampatch/core/designsystem/component/SpeechBubble.kt

@@ -15,6 +15,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.CornerRadius
 import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.text.TextStyle
@@ -31,6 +32,8 @@ import com.teampatch.core.designsystem.theme.PretendardFontFamily
 @Composable
 fun SpeechBubble(
     modifier: Modifier = Modifier,
+    backgroundColor: Color = G1,
+    borderColor: Color = G3,
     contentAlignment: Alignment = Alignment.Center,
     propagateMinConstraints: Boolean = false,
     content: @Composable (BoxScope.() -> Unit),
@@ -43,12 +46,12 @@ fun SpeechBubble(
             .padding(top = 32.dp, start = 20.dp, end = 20.dp)
             .drawBehind {
                 drawRoundRect(
-                    color = G1,
+                    color = backgroundColor,
                     size = size,
                     cornerRadius = CornerRadius(20.dp.toPx())
                 )
                 drawRoundRect(
-                    color = G3,
+                    color = borderColor,
                     size = size,
                     cornerRadius = CornerRadius(20.dp.toPx()),
                     style = Stroke(1.dp.toPx())
@@ -60,16 +63,16 @@ fun SpeechBubble(
                         lineTo((size.width / 2) - 24.dp.toPx(), size.height - 20.dp.toPx())
                         close()
                     },
-                    color = G1
+                    color = backgroundColor
                 )
                 drawLine(
-                    color = G3,
+                    color = borderColor,
                     start = Offset(size.width / 2, size.height + 20.dp.toPx()),
                     end = Offset((size.width / 2) + 12.dp.toPx(), size.height),
                     strokeWidth = 1.dp.toPx()
                 )
                 drawLine(
-                    color = G3,
+                    color = borderColor,
                     start = Offset(size.width / 2, size.height + 20.dp.toPx()),
                     end = Offset((size.width / 2) - 12.dp.toPx(), size.height),
                     strokeWidth = 1.dp.toPx()

feature/onboarding-enter/build.gradle.kts

@@ -18,6 +18,8 @@ dependencies {
     implementation(libs.androidx.paging.runtime)
     implementation(libs.androidx.paging.compose)
 
+    implementation(libs.coil.compose)
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

feature/onboarding-enter/src/main/java/com/teampatch/feature/onboarding/enter/OnboardingEnterInvitationCodeScreen.kt

@@ -60,7 +60,7 @@ private const val MAX_LENGTH = 5
 @Composable
 internal fun OnboardingEnterInvitationCodeRoute(
     onBackRequest: () -> Unit,
-    onEnterSpaceScreenRequest: () -> Unit,
+    onEnterRelationScreenRequest: () -> Unit,
     viewModel: OnboardingEnterInvitationCodeViewModel = hiltViewModel(),
 ) {
     val lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current
@@ -70,7 +70,7 @@ internal fun OnboardingEnterInvitationCodeRoute(
 
     OnboardingEnterInvitationCodeScreen(
         onBackRequest = onBackRequest,
-        onEnterSpaceScreenRequest = { viewModel.joinGroup() },
+        onEnterSpaceScreenRequest = onEnterRelationScreenRequest,
         onInviteCodeChange = viewModel::updateInviteCode,
         uiState = uiState
     )
@@ -85,7 +85,7 @@ internal fun OnboardingEnterInvitationCodeRoute(
                     }
 
                     OnboardingEnterInvitationCodeEvent.Success -> {
-                        onEnterSpaceScreenRequest()
+                        onEnterRelationScreenRequest()
                     }
                 }
             }

feature/onboarding-enter/src/main/java/com/teampatch/feature/onboarding/enter/OnboardingEnterNavigation.kt

@@ -1,5 +1,6 @@
 package com.teampatch.feature.onboarding.enter
 
+import android.net.Uri
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
@@ -19,32 +20,86 @@ fun NavController.navigateToEnterInvitationCodeScreen(
 
 fun NavGraphBuilder.addOnboardingEnterInvitationCodeScreen(
     onBackRequest: () -> Unit,
-    onEnterSpaceScreenRequest: () -> Unit,
+    onEnterRelationScreenRequest: () -> Unit,
 ) {
     composable<OnboardingEnterInvitationCodeRoute> {
         OnboardingEnterInvitationCodeRoute(
             onBackRequest = onBackRequest,
-            onEnterSpaceScreenRequest = onEnterSpaceScreenRequest
+            onEnterRelationScreenRequest = onEnterRelationScreenRequest
+        )
+    }
+}
+
+@Serializable
+data object OnboardingEnterRelationRoute
+
+fun NavController.navigateToEnterRelationScreen(
+    navOptions: NavOptions? = null,
+    navigatorExtras: Navigator.Extras? = null,
+) {
+    navigate(OnboardingEnterRelationRoute, navOptions, navigatorExtras)
+}
+
+fun NavGraphBuilder.addOnboardingEnterRelationScreen(
+    onBackRequest: () -> Unit,
+    onEnterProfileSettingsScreenRequest: () -> Unit,
+) {
+    composable<OnboardingEnterRelationRoute> {
+        OnboardingEnterRelationRoute(
+            onBackRequest = onBackRequest,
+            onEnterProfileSettingsScreenRequest = onEnterProfileSettingsScreenRequest
         )
     }
 }
 
 @Serializable
-data object OnboardingEnterSpaceRoute
+data object OnboardingEnterProfileSettingsRoute // 기존과 동일
 
+fun NavController.navigateToEnterProfileSettingsScreen(
+    navOptions: NavOptions? = null,
+    navigatorExtras: Navigator.Extras? = null,
+) {
+    navigate(OnboardingEnterProfileSettingsRoute, navOptions, navigatorExtras)
+}
+
+// OnboardingEnterSpaceRoute 수정: data object -> data class
+@Serializable
+data class OnboardingEnterSpaceRoute(
+    val profileImageUrisAsStrings: List<String>, // Uri 문자열 리스트를 저장할 프로퍼티
+)
+
+// navigateToEnterSpaceScreen 함수 시그니처 및 호출 방식 수정
 fun NavController.navigateToEnterSpaceScreen(
+    urisAsStrings: List<String>, // List<String>을 파라미터로 받도록 변경
     navOptions: NavOptions? = null,
     navigatorExtras: Navigator.Extras? = null,
 ) {
-    navigate(OnboardingEnterSpaceRoute, navOptions, navigatorExtras)
+    // 수정된 Route 객체를 생성하여 navigate 호출
+    navigate(OnboardingEnterSpaceRoute(profileImageUrisAsStrings = urisAsStrings), navOptions, navigatorExtras)
+}
+
+// NavGraphBuilder 확장 함수들은 시그니처 변경 없이 내부 로직은 그대로 유지될 수 있습니다.
+// 타입 추론에 의해 composable<T>의 T가 data class로 변경됩니다.
+
+fun NavGraphBuilder.addOnboardingEnterProfileSettingsScreen(
+    onBackRequest: () -> Unit,
+    onEnterSpaceScreenRequest: (List<Uri>) -> Unit, // 이 콜백은 List<Uri>를 전달
+) {
+    composable<OnboardingEnterProfileSettingsRoute> {
+        OnboardingEnterProfileSettingsRoute( // 이 Composable 내부에서 onEnterSpaceScreenRequest 호출
+            onBackRequest = onBackRequest,
+            onEnterSpaceScreenRequest = onEnterSpaceScreenRequest
+        )
+    }
 }
 
 fun NavGraphBuilder.addOnboardingEnterSpaceScreen(
     onBackRequest: () -> Unit,
     onHomeRouteRequest: () -> Unit,
 ) {
     composable<OnboardingEnterSpaceRoute> {
-        OnboardingEnterSpaceScreen(
+        // T가 OnboardingEnterSpaceRoute (data class)로 변경됨
+        OnboardingEnterSpaceRoute( // 이 Composable 내부의 ViewModel이 SavedStateHandle을 통해 인자를 받음
             onBackRequest = onBackRequest,
             onHomeRouteRequest = onHomeRouteRequest
         )