Feat: 약관 동의 화면 웹뷰 연동

- 약관 동의 화면에서 '더보기' 버튼 클릭 시 웹뷰로 이동하도록 구현

Author: wjdrjs00

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

@@ -4,11 +4,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.toRoute
 import com.threegap.bitnagil.presentation.home.HomeScreen
 import com.threegap.bitnagil.presentation.intro.IntroScreenContainer
 import com.threegap.bitnagil.presentation.login.LoginScreenContainer
 import com.threegap.bitnagil.presentation.splash.SplashScreenContainer
 import com.threegap.bitnagil.presentation.terms.TermsAgreementScreenContainer
+import com.threegap.bitnagil.presentation.webview.BitnagilWebViewScreen
 
 @Composable
 fun MainNavHost(
@@ -42,6 +44,22 @@ fun MainNavHost(
 
         composable<Route.TermsAgreement> {
             TermsAgreementScreenContainer(
+                navigateToTermsOfService = {
+                    navigator.navController.navigate(
+                        Route.WebView(
+                            title = "약관 동의",
+                            url = "https://wooded-damselfly-4cc.notion.site/22fa2c11608680668ed7e3227b69812a",
+                        ),
+                    )
+                },
+                navigateToPrivacyPolicy = {
+                    navigator.navController.navigate(
+                        Route.WebView(
+                            title = "약관 동의",
+                            url = "https://wooded-damselfly-4cc.notion.site/22fa2c11608680668ed7e3227b69812a",
+                        ),
+                    )
+                },
                 navigateToOnBoarding = { },
                 navigateToBack = { navigator.navController.popBackStack() },
             )
@@ -50,5 +68,14 @@ fun MainNavHost(
         composable<Route.Home> {
             HomeScreen()
         }
+
+        composable<Route.WebView> {
+            val webViewRoute = it.toRoute<Route.WebView>()
+            BitnagilWebViewScreen(
+                title = webViewRoute.title,
+                url = webViewRoute.url,
+                onBackClick = { navigator.navController.popBackStack() },
+            )
+        }
     }
 }

app/src/main/java/com/threegap/bitnagil/Route.kt

@@ -18,4 +18,10 @@ sealed interface Route {
 
     @Serializable
     data object Home : Route
+
+    @Serializable
+    data class WebView(
+        val title: String,
+        val url: String,
+    ) : Route
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementScreen.kt

@@ -36,6 +36,8 @@ import org.orbitmvi.orbit.compose.collectSideEffect
 
 @Composable
 fun TermsAgreementScreenContainer(
+    navigateToTermsOfService: () -> Unit,
+    navigateToPrivacyPolicy: () -> Unit,
     navigateToOnBoarding: () -> Unit,
     navigateToBack: () -> Unit,
     viewmodel: TermsAgreementViewModel = hiltViewModel(),
@@ -44,6 +46,14 @@ fun TermsAgreementScreenContainer(
 
     viewmodel.collectSideEffect { sideEffect ->
         when (sideEffect) {
+            is TermsAgreementSideEffect.NavigateToPrivacyPolicy -> {
+                navigateToPrivacyPolicy()
+            }
+
+            is TermsAgreementSideEffect.NavigateToTermsOfService -> {
+                navigateToTermsOfService()
+            }
+
             is TermsAgreementSideEffect.NavigateToOnBoarding -> {
                 navigateToOnBoarding()
             }
@@ -68,6 +78,12 @@ fun TermsAgreementScreenContainer(
         onToggleOverFourteen = {
             viewmodel.sendIntent(TermsAgreementIntent.ToggleOverFourteen(it))
         },
+        onShowTermsOfService = {
+            viewmodel.sendIntent(TermsAgreementIntent.ShowTermsOfService)
+        },
+        onShowPrivacyPolicy = {
+            viewmodel.sendIntent(TermsAgreementIntent.ShowPrivacyPolicy)
+        },
         onStartButtonClick = {
             viewmodel.submitTermsAgreement()
         },
@@ -84,6 +100,8 @@ private fun TermsAgreementScreen(
     onToggleTermsOfService: (Boolean) -> Unit,
     onTogglePrivacyPolicy: (Boolean) -> Unit,
     onToggleOverFourteen: (Boolean) -> Unit,
+    onShowTermsOfService: () -> Unit,
+    onShowPrivacyPolicy: () -> Unit,
     onStartButtonClick: () -> Unit,
     onBackButtonClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -162,13 +180,15 @@ private fun TermsAgreementScreen(
                 onCheckedChange = { onToggleTermsOfService(!uiState.agreedTermsOfService) },
                 isChecked = uiState.agreedTermsOfService,
                 showMore = true,
+                onClickShowMore = onShowTermsOfService,
             )
 
             TermsAgreementItem(
                 title = "(필수) 개인정보 수집·이용 동의",
                 onCheckedChange = { onTogglePrivacyPolicy(!uiState.agreedPrivacyPolicy) },
                 isChecked = uiState.agreedPrivacyPolicy,
                 showMore = true,
+                onClickShowMore = onShowPrivacyPolicy,
             )
 
             TermsAgreementItem(
@@ -202,6 +222,8 @@ private fun TermsAgreementScreenPreview() {
         onToggleTermsOfService = {},
         onTogglePrivacyPolicy = {},
         onToggleOverFourteen = {},
+        onShowTermsOfService = {},
+        onShowPrivacyPolicy = {},
         onStartButtonClick = {},
         onBackButtonClick = {},
     )

presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementViewModel.kt

@@ -66,6 +66,16 @@ class TermsAgreementViewModel @Inject constructor(
             }
         }
 
+        is TermsAgreementIntent.ShowTermsOfService -> {
+            sendSideEffect(TermsAgreementSideEffect.NavigateToTermsOfService)
+            null
+        }
+
+        is TermsAgreementIntent.ShowPrivacyPolicy -> {
+            sendSideEffect(TermsAgreementSideEffect.NavigateToPrivacyPolicy)
+            null
+        }
+
         is TermsAgreementIntent.SubmitSuccess -> {
             sendSideEffect(TermsAgreementSideEffect.NavigateToOnBoarding)
             state.copy(isLoading = false)

presentation/src/main/java/com/threegap/bitnagil/presentation/terms/model/TermsAgreementIntent.kt

@@ -4,18 +4,13 @@ import com.threegap.bitnagil.presentation.common.mviviewmodel.MviIntent
 
 sealed class TermsAgreementIntent : MviIntent {
     data class SetLoading(val isLoading: Boolean) : TermsAgreementIntent()
-
     data class ToggleAllAgreements(val agreed: Boolean) : TermsAgreementIntent()
-
     data class ToggleTermsOfService(val agreed: Boolean) : TermsAgreementIntent()
-
     data class TogglePrivacyPolicy(val agreed: Boolean) : TermsAgreementIntent()
-
     data class ToggleOverFourteen(val agreed: Boolean) : TermsAgreementIntent()
-
+    data object ShowTermsOfService : TermsAgreementIntent()
+    data object ShowPrivacyPolicy : TermsAgreementIntent()
     data object SubmitSuccess : TermsAgreementIntent()
-
     data object SubmitFailure : TermsAgreementIntent()
-
     data object BackButtonClick : TermsAgreementIntent()
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/terms/model/TermsAgreementSideEffect.kt

@@ -3,7 +3,8 @@ package com.threegap.bitnagil.presentation.terms.model
 import com.threegap.bitnagil.presentation.common.mviviewmodel.MviSideEffect
 
 sealed interface TermsAgreementSideEffect : MviSideEffect {
+    data object NavigateToTermsOfService : TermsAgreementSideEffect
+    data object NavigateToPrivacyPolicy : TermsAgreementSideEffect
     data object NavigateToOnBoarding : TermsAgreementSideEffect
-
     data object NavigateToBack : TermsAgreementSideEffect
 }