SCRUM-270 SCRUM-271 feat: add terms webview

app/build.gradle.kts

@@ -92,6 +92,7 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.webkit)
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)

app/src/main/java/com/lyrics/feelin/core/designsystem/icon/Icons.kt

@@ -108,3 +108,7 @@ val WritingIcon: ImageVector
 val FindSquareIcon: ImageVector
     @Composable
     get() = ImageVector.vectorResource(id = R.drawable.find_square)
+
+val RefreshIcon: ImageVector
+    @Composable
+    get() = ImageVector.vectorResource(id = R.drawable.refresh)

app/src/main/java/com/lyrics/feelin/core/domain/model/SignUpTerm.kt

@@ -8,7 +8,20 @@ package com.lyrics.feelin.core.domain.model
  */
 enum class SignUpTerm(
     val title: String,
+    /**
+     * 서버가 전달받는, 사용자가 동의한 약관의 URL
+     *
+     * 서버 약관 동의 payload는 기존 Notion 원본 URL 계약을 유지한다.
+     * */
     val agreement: String,
+    /**
+     * 실제로 웹뷰에 표시하는 URL
+     *
+     * WebView에 WebViewClient를 할당해도
+     * Notion 원본 URL을 직접 열면 리다이렉트 안내 화면이 간헐적으로 노출될 수 있어,
+     * 서버 전송용 agreement와 화면 표시용 URL을 분리한다.
+     * */
+    val webViewUrl: String = agreement,
     val required: Boolean = true,
 ) {
     AGE_AGREEMENT(
@@ -18,10 +31,12 @@ enum class SignUpTerm(
     SERVICE_USAGE(
         title = "서비스 이용약관 동의",
         agreement = "https://www.notion.so/Feelin-424aa52fb951444fa95f3966672ec670?pvs=4",
+        webViewUrl = "https://zircon-taste-62f.notion.site/Feelin-424aa52fb951444fa95f3966672ec670",
     ),
     PERSONAL_INFO(
         title = "개인정보처리방침 동의",
         agreement = "https://www.notion.so/Feelin-2f586ef1b7c947d89ad8cac8a83b61d1?pvs=4",
+        webViewUrl = "https://zircon-taste-62f.notion.site/Feelin-2f586ef1b7c947d89ad8cac8a83b61d1",
     );
 
     fun toAgreementStatus(agree: Boolean): TermAgreementStatus {

app/src/main/java/com/lyrics/feelin/navigation/FeelinDestination.kt

@@ -1,8 +1,14 @@
 package com.lyrics.feelin.navigation
 
+import android.net.Uri
+
 sealed class FeelinDestination(
     val route: String,
 ) {
+    companion object {
+        private const val WEB_VIEW_URL_ARGUMENT = "url"
+    }
+
     // Navigation Graph Routes
     object OnboardingGraph : FeelinDestination(route = "onboarding_graph")
     object MainGraph : FeelinDestination(route = "main_graph")
@@ -24,4 +30,14 @@ sealed class FeelinDestination(
     object MyPage : FeelinDestination(route = "my_page")
     object Setting : FeelinDestination(route = "setting")
     object UserInfo : FeelinDestination(route = "user_info")
+
+    object InternalWebView : FeelinDestination(
+        route = "internal_webview?$WEB_VIEW_URL_ARGUMENT={$WEB_VIEW_URL_ARGUMENT}"
+    ) {
+        const val UrlArgument = WEB_VIEW_URL_ARGUMENT
+
+        fun createRoute(url: String): String {
+            return "internal_webview?$UrlArgument=${Uri.encode(url)}"
+        }
+    }
 }

app/src/main/java/com/lyrics/feelin/navigation/FeelinNavHost.kt

@@ -18,14 +18,17 @@ import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
+import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
 import androidx.navigation.navigation
 import com.lyrics.feelin.core.designsystem.component.BottomNavItem
 import com.lyrics.feelin.core.designsystem.component.FeelinBottomNavigation
@@ -35,6 +38,7 @@ import com.lyrics.feelin.core.designsystem.icon.MyPageActiveIcon
 import com.lyrics.feelin.core.designsystem.icon.MyPageInactiveIcon
 import com.lyrics.feelin.core.designsystem.icon.NoteSearchingActiveIcon
 import com.lyrics.feelin.core.designsystem.icon.NoteSearchingInactiveIcon
+import com.lyrics.feelin.presentation.util.openExternalBrowser
 import com.lyrics.feelin.presentation.view.community.CommunityMainScreen
 import com.lyrics.feelin.presentation.view.login.LoginScreen
 import com.lyrics.feelin.presentation.view.mypage.MyPageScreen
@@ -48,6 +52,7 @@ import com.lyrics.feelin.presentation.view.onboarding.genderage.OnboardingGender
 import com.lyrics.feelin.presentation.view.onboarding.profile.ProfileScreen
 import com.lyrics.feelin.presentation.view.onboarding.terms.OnboardingTermsScreen
 import com.lyrics.feelin.presentation.view.onboarding.welcome.WelcomeScreen
+import com.lyrics.feelin.presentation.view.webview.InternalWebViewScreen
 
 @Composable
 fun FeelinNavHost(
@@ -63,6 +68,8 @@ fun FeelinNavHost(
         onboardingNavGraph(navController)
 
         mainNavGraph(navController)
+
+        internalWebViewScreen(navController)
     }
 }
 
@@ -113,7 +120,9 @@ private fun NavGraphBuilder.onboardingTermsScreen(navController: NavHostControll
                 termAgreements = onboardingState.termAgreements,
                 onAllCheckedChange = viewModel::setAllTermsAgreed,
                 onTermCheckedChange = viewModel::setTermAgreed,
-                onDetailClick = {},
+                onDetailClick = { term ->
+                    navController.navigate(FeelinDestination.InternalWebView.createRoute(term.webViewUrl))
+                },
             )
         }
     }
@@ -236,33 +245,66 @@ private fun NavGraphBuilder.mainNavGraph(navController: NavHostController) {
             }
         }
 
-        navigation(startDestination = FeelinDestination.MyPage.route, route = FeelinDestination.MyPageGraph.route) {
-            composable(FeelinDestination.MyPage.route) {
-                MainScaffold(navController = navController, selectedIndex = 2) {
-                    MyPageScreen(
-                        onSettingClick = { navController.navigate(FeelinDestination.Setting.route) }
-                    )
-                }
+        myPageNavGraph(navController)
+    }
+}
+
+private fun NavGraphBuilder.myPageNavGraph(navController: NavHostController) {
+    navigation(startDestination = FeelinDestination.MyPage.route, route = FeelinDestination.MyPageGraph.route) {
+        composable(FeelinDestination.MyPage.route) {
+            MainScaffold(navController = navController, selectedIndex = 2) {
+                MyPageScreen(
+                    onSettingClick = { navController.navigate(FeelinDestination.Setting.route) }
+                )
             }
+        }
 
-            composable(FeelinDestination.Setting.route) {
-                MainScaffold(navController = navController, selectedIndex = 2) {
-                    SettingScreen(
-                        onBackClick = { navController.popBackStack() },
-                        onUserInfoClick = { navController.navigate(FeelinDestination.UserInfo.route) }
-                    )
-                }
+        composable(FeelinDestination.Setting.route) {
+            val context = LocalContext.current
+
+            MainScaffold(navController = navController, selectedIndex = 2) {
+                SettingScreen(
+                    onBackClick = { navController.popBackStack() },
+                    onUserInfoClick = { navController.navigate(FeelinDestination.UserInfo.route) },
+                    onInternalWebViewClick = { url ->
+                        navController.navigate(FeelinDestination.InternalWebView.createRoute(url))
+                    },
+                    onExternalBrowserClick = { url ->
+                        context.openExternalBrowser(url)
+                    },
+                )
             }
+        }
 
-            composable(FeelinDestination.UserInfo.route) {
-                MainScaffold(navController = navController, selectedIndex = 2) {
-                    UserInfoScreen(onBackClick = { navController.popBackStack() })
-                }
+        composable(FeelinDestination.UserInfo.route) {
+            MainScaffold(navController = navController, selectedIndex = 2) {
+                UserInfoScreen(onBackClick = { navController.popBackStack() })
             }
         }
     }
 }
 
+private fun NavGraphBuilder.internalWebViewScreen(navController: NavHostController) {
+    composable(
+        route = FeelinDestination.InternalWebView.route,
+        arguments = listOf(
+            navArgument(FeelinDestination.InternalWebView.UrlArgument) {
+                type = NavType.StringType
+                defaultValue = ""
+            }
+        ),
+    ) { backStackEntry ->
+        val url = backStackEntry.arguments
+            ?.getString(FeelinDestination.InternalWebView.UrlArgument)
+            .orEmpty()
+
+        InternalWebViewScreen(
+            url = url,
+            onCloseClick = { navController.popBackStack() },
+        )
+    }
+}
+
 @Composable
 private fun MainScaffold(
     navController: NavHostController,

app/src/main/java/com/lyrics/feelin/presentation/util/ExternalBrowserLauncher.kt

@@ -0,0 +1,23 @@
+package com.lyrics.feelin.presentation.util
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import android.widget.Toast
+import androidx.core.net.toUri
+
+private const val EXTERNAL_BROWSER_LAUNCHER_TAG = "ExternalBrowserLauncher"
+
+fun Context.openExternalBrowser(url: String) {
+    runCatching {
+        startActivity(Intent(Intent.ACTION_VIEW, url.toUri()))
+    }.onFailure { throwable ->
+        if (throwable is ActivityNotFoundException) {
+            Log.w(EXTERNAL_BROWSER_LAUNCHER_TAG, "No browser found for url: $url", throwable)
+            Toast.makeText(this, "링크를 띄울 웹 브라우저를 설치해주세요.", Toast.LENGTH_SHORT).show()
+        } else {
+            throw throwable
+        }
+    }
+}

app/src/main/java/com/lyrics/feelin/presentation/view/mypage/setting/SettingInfoLink.kt

@@ -0,0 +1,28 @@
+package com.lyrics.feelin.presentation.view.mypage.setting
+
+enum class SettingInfoLink(
+    val title: String,
+    val url: String,
+    val opensInternally: Boolean,
+) {
+    SERVICE_USAGE(
+        title = "서비스 이용 약관",
+        url = "https://zircon-taste-62f.notion.site/Feelin-424aa52fb951444fa95f3966672ec670",
+        opensInternally = true,
+    ),
+    PERSONAL_INFO(
+        title = "개인정보처리방침",
+        url = "https://zircon-taste-62f.notion.site/Feelin-2f586ef1b7c947d89ad8cac8a83b61d1",
+        opensInternally = true,
+    ),
+    FAQ(
+        title = "자주 묻는 질문",
+        url = "https://noon-spaghetti-8cf.notion.site/357546f268d580d18a56ded47121c7ab",
+        opensInternally = true
+    ),
+    SERVICE_INQUIRY(
+        title = "서비스 문의하기",
+        url = "https://docs.google.com/forms/d/1ottTpPuoiDfQnZaMYwwi75WXdEInq6KHN8jY4L9Qc00/viewform",
+        opensInternally = false,
+    )
+}

app/src/main/java/com/lyrics/feelin/presentation/view/mypage/setting/SettingScreen.kt

@@ -31,6 +31,8 @@ import com.lyrics.feelin.presentation.view.mypage.component.SettingMenuItem
 fun SettingScreen(
     onBackClick: () -> Unit,
     onUserInfoClick: () -> Unit,
+    onInternalWebViewClick: (String) -> Unit,
+    onExternalBrowserClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val feelinColors = LocalFeelinColors.current
@@ -58,11 +60,21 @@ fun SettingScreen(
 
             SettingCategoryDivider()
 
-            SettingMenuItem(title = "서비스 이용 약관", onClick = {})
-            Spacer(modifier = Modifier.height(16.dp))
-            SettingMenuItem(title = "개인정보처리방침", onClick = {})
-            Spacer(modifier = Modifier.height(16.dp))
-            SettingMenuItem(title = "서비스 문의하기", onClick = {})
+            SettingInfoLink.entries.forEachIndexed { index, link ->
+                SettingMenuItem(
+                    title = link.title,
+                    onClick = {
+                        if (link.opensInternally) {
+                            onInternalWebViewClick(link.url)
+                        } else {
+                            onExternalBrowserClick(link.url)
+                        }
+                    },
+                )
+                if (index < SettingInfoLink.entries.lastIndex) {
+                    Spacer(modifier = Modifier.height(16.dp))
+                }
+            }
 
             SettingCategoryDivider()
 
@@ -107,6 +119,8 @@ private fun SettingScreenPreview() {
         SettingScreen(
             onBackClick = {},
             onUserInfoClick = {},
+            onInternalWebViewClick = {},
+            onExternalBrowserClick = {},
         )
     }
 }