Merge pull request #61 from YAPP-Github/BOOK-155-feature/#60

feat: 서비스이용약관, 개인정보처리방침 웹뷰 환경 구성

Author: easyhooon

app/build.gradle.kts

@@ -53,6 +53,7 @@ dependencies {
         projects.feature.login,
         projects.feature.search,
         projects.feature.settings,
+        projects.feature.webview,
 
         libs.androidx.activity.compose,
         libs.androidx.startup,

app/src/main/kotlin/com/ninecraft/booket/di/CircuitModule.kt

@@ -28,6 +28,7 @@ abstract class CircuitModule {
         ): Circuit = Circuit.Builder()
             .addPresenterFactories(presenterFactories)
             .addUiFactories(uiFactories)
+            // .setAnimatedNavDecoratorFactory(CrossFadeNavDecoratorFactory())
             .build()
     }
 }

app/src/main/kotlin/com/ninecraft/booket/di/CrossFadeNavDecorator.kt

@@ -0,0 +1,29 @@
+package com.ninecraft.booket.di
+
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.ContentTransform
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
+import com.slack.circuit.backstack.NavArgument
+import com.slack.circuit.foundation.NavigatorDefaults
+import com.slack.circuit.foundation.animation.AnimatedNavDecorator
+import com.slack.circuit.foundation.animation.AnimatedNavEvent
+import com.slack.circuit.foundation.animation.AnimatedNavState
+
+data class CrossFadeNavDecoratorFactory(val durationMillis: Int = 300) :
+    AnimatedNavDecorator.Factory {
+    override fun <T : NavArgument> create(): AnimatedNavDecorator<T, *> =
+        CrossFadeNavDecorator(durationMillis)
+}
+
+class CrossFadeNavDecorator<T : NavArgument>(private val durationMillis: Int) :
+    AnimatedNavDecorator<T, NavigatorDefaults.DefaultDecorator.DefaultAnimatedState<T>> by NavigatorDefaults.DefaultDecorator<T>() {
+
+    override fun AnimatedContentTransitionScope<AnimatedNavState>.transitionSpec(
+        animatedNavEvent: AnimatedNavEvent,
+    ): ContentTransform {
+        return fadeIn(tween(durationMillis)) togetherWith fadeOut(tween(durationMillis))
+    }
+}

core/common/src/main/kotlin/com/ninecraft/booket/core/common/constants/WebViewConstants.kt

@@ -0,0 +1,6 @@
+package com.ninecraft.booket.core.common.constants
+
+enum class WebViewConstants(val url: String, val title: String) {
+    PRIVACY_POLICY("https://www.google.com", "개인정보처리방침"),
+    TERMS_OF_SERVICE("https://m.naver.com", "이용약관"),
+}

…ecraft/booket/feature/home/HomeScreen.kt …/ninecraft/booket/feature/home/HomeUi.ktfeature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeScreen.kt renamed to feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeScreen.kt renamed to feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt

@@ -19,7 +19,7 @@ import dagger.hilt.android.components.ActivityRetainedComponent
 
 @CircuitInject(HomeScreen::class, ActivityRetainedComponent::class)
 @Composable
-internal fun Home(
+internal fun HomeUi(
     state: HomeUiState,
     modifier: Modifier = Modifier,
 ) {
@@ -56,7 +56,7 @@ internal fun HomeContent(
 @Composable
 private fun HomePreview() {
     ReedTheme {
-        Home(
+        HomeUi(
             state = HomeUiState(
                 eventSink = {},
             ),

…/booket/feature/library/LibraryScreen.kt …raft/booket/feature/library/LibraryUi.ktfeature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryScreen.kt renamed to feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUi.kt feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryScreen.kt renamed to feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUi.kt

@@ -25,7 +25,7 @@ import dagger.hilt.android.components.ActivityRetainedComponent
 
 @CircuitInject(LibraryScreen::class, ActivityRetainedComponent::class)
 @Composable
-internal fun Library(
+internal fun LibraryUi(
     state: LibraryUiState,
     modifier: Modifier = Modifier,
 ) {
@@ -95,7 +95,7 @@ internal fun LibraryContent(
 @Composable
 private fun LibraryPreview() {
     ReedTheme {
-        Library(
+        LibraryUi(
             state = LibraryUiState(
                 nickname = "홍길동",
                 email = "test@test.com",

…raft/booket/feature/login/LoginScreen.kt …inecraft/booket/feature/login/LoginUi.ktfeature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginScreen.kt renamed to feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUi.kt feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginScreen.kt renamed to feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUi.kt

@@ -30,7 +30,7 @@ import dagger.hilt.android.components.ActivityRetainedComponent
 
 @CircuitInject(LoginScreen::class, ActivityRetainedComponent::class)
 @Composable
-internal fun Login(
+internal fun LoginUi(
     state: LoginUiState,
     modifier: Modifier = Modifier,
 ) {
@@ -90,7 +90,7 @@ internal fun Login(
 @Composable
 private fun LoginPreview() {
     ReedTheme {
-        Login(
+        LoginUi(
             state = LoginUiState(
                 eventSink = {},
             ),

feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementPresenter.kt

@@ -6,8 +6,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import com.ninecraft.booket.core.common.constants.WebViewConstants
 import com.ninecraft.booket.feature.screens.BottomNavigationScreen
 import com.ninecraft.booket.feature.screens.TermsAgreementScreen
+import com.ninecraft.booket.feature.screens.WebViewScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained
 import com.slack.circuit.runtime.Navigator
@@ -50,8 +52,14 @@ class TermsAgreementPresenter @AssistedInject constructor(
                     navigator.pop()
                 }
 
-                is TermsAgreementUiEvent.OnTermDetailClick -> {
-                    // TODO: 웹뷰 화면으로 이동
+                is TermsAgreementUiEvent.OnPolicyClick -> {
+                    val policy = WebViewConstants.PRIVACY_POLICY
+                    navigator.goTo(WebViewScreen(url = policy.url, title = policy.title))
+                }
+
+                is TermsAgreementUiEvent.OnTermClick -> {
+                    val terms = WebViewConstants.TERMS_OF_SERVICE
+                    navigator.goTo(WebViewScreen(url = terms.url, title = terms.title))
                 }
 
                 is TermsAgreementUiEvent.OnStartButtonClick -> {

…e/termsagreement/TermsAgreementScreen.kt …ature/termsagreement/TermsAgreementUi.ktfeature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementScreen.kt renamed to feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementUi.kt feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementScreen.kt renamed to feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementUi.kt

@@ -23,9 +23,8 @@ import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
-import com.ninecraft.booket.core.common.extensions.clickableSingle
+import com.ninecraft.booket.core.common.extensions.noRippleClickable
 import com.ninecraft.booket.core.designsystem.DevicePreview
-import com.ninecraft.booket.core.designsystem.component.appbar.ReedBackTopAppBar
 import com.ninecraft.booket.core.designsystem.component.button.ReedButton
 import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle
 import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
@@ -38,25 +37,24 @@ import com.ninecraft.booket.feature.screens.TermsAgreementScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 import kotlinx.collections.immutable.persistentListOf
+import com.ninecraft.booket.core.designsystem.R as designR
 
 @CircuitInject(TermsAgreementScreen::class, ActivityRetainedComponent::class)
 @Composable
-internal fun TermsAgreement(
+internal fun TermsAgreementUi(
     state: TermsAgreementUiState,
     modifier: Modifier = Modifier,
 ) {
+    val termsTitles = stringArrayResource(id = R.array.terms_agreement_items)
+
     Column(
         modifier = modifier
             .fillMaxSize()
             .background(White)
             .systemBarsPadding(),
     ) {
-        ReedBackTopAppBar(
-            onBackClick = {
-                state.eventSink(TermsAgreementUiEvent.OnBackClick)
-            },
-        )
-        Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2))
+        Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing16))
+        Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing3))
         Column(
             modifier = Modifier
                 .weight(1f)
@@ -95,22 +93,37 @@ internal fun TermsAgreement(
                     style = ReedTheme.typography.headline1SemiBold,
                 )
             }
+            Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing5))
+            TermItem(
+                title = termsTitles[0],
+                checked = state.agreedTerms[0],
+                onCheckClick = {
+                    state.eventSink(TermsAgreementUiEvent.OnTermItemClick(0))
+                },
+                onDetailClick = {
+                    state.eventSink(TermsAgreementUiEvent.OnPolicyClick)
+                },
+            )
             Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4))
-
-            val termsTitles = stringArrayResource(id = R.array.terms_agreement_items)
-
-            termsTitles.forEachIndexed { index, title ->
-                TermItem(
-                    title = title,
-                    checked = state.agreedTerms[index],
-                    onCheckClick = {
-                        state.eventSink(TermsAgreementUiEvent.OnTermItemClick(index))
-                    },
-                    onDetailClick = {
-                        state.eventSink(TermsAgreementUiEvent.OnTermDetailClick(""))
-                    },
-                )
-            }
+            TermItem(
+                title = termsTitles[1],
+                checked = state.agreedTerms[1],
+                onCheckClick = {
+                    state.eventSink(TermsAgreementUiEvent.OnTermItemClick(1))
+                },
+                onDetailClick = {
+                    state.eventSink(TermsAgreementUiEvent.OnTermClick)
+                },
+            )
+            Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4))
+            TermItem(
+                title = termsTitles[2],
+                checked = state.agreedTerms[2],
+                hasDetailAction = false,
+                onCheckClick = {
+                    state.eventSink(TermsAgreementUiEvent.OnTermItemClick(2))
+                },
+            )
         }
         ReedButton(
             onClick = {
@@ -134,19 +147,18 @@ internal fun TermsAgreement(
 @Composable
 private fun TermItem(
     title: String,
+    onCheckClick: () -> Unit,
     modifier: Modifier = Modifier,
     checked: Boolean = false,
-    onCheckClick: () -> Unit = {},
+    hasDetailAction: Boolean = true,
     onDetailClick: () -> Unit = {},
 ) {
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .clickableSingle {
-                onDetailClick()
-            }
+            .noRippleClickable { onDetailClick() }
             .padding(
-                start = ReedTheme.spacing.spacing5,
+                start = ReedTheme.spacing.spacing4 + ReedTheme.spacing.spacing05,
                 end = ReedTheme.spacing.spacing3,
                 top = ReedTheme.spacing.spacing2,
                 bottom = ReedTheme.spacing.spacing2,
@@ -157,26 +169,29 @@ private fun TermItem(
             checked = checked,
             onCheckedChange = { onCheckClick() },
         )
-        Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing1))
+        Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing3 + ReedTheme.spacing.spacing05))
         Text(
             text = title,
             modifier = Modifier.weight(1f),
             color = ReedTheme.colors.contentPrimary,
             style = ReedTheme.typography.body1Medium,
         )
-        Icon(
-            imageVector = ImageVector.vectorResource(id = com.ninecraft.booket.core.designsystem.R.drawable.ic_chevron_right),
-            contentDescription = "Navigation Icon",
-            tint = Color.Unspecified,
-        )
+
+        if (hasDetailAction) {
+            Icon(
+                imageVector = ImageVector.vectorResource(id = designR.drawable.ic_chevron_right),
+                contentDescription = "Navigation Icon",
+                tint = Color.Unspecified,
+            )
+        }
     }
 }
 
 @DevicePreview
 @Composable
 private fun TermsAgreementPreview() {
     ReedTheme {
-        TermsAgreement(
+        TermsAgreementUi(
             state = TermsAgreementUiState(
                 isAllAgreed = false,
                 agreedTerms = persistentListOf(false, false, false),

feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementUiState.kt

@@ -14,6 +14,7 @@ sealed interface TermsAgreementUiEvent : CircuitUiEvent {
     data object OnAllTermsAgreedClick : TermsAgreementUiEvent
     data class OnTermItemClick(val index: Int) : TermsAgreementUiEvent
     data object OnBackClick : TermsAgreementUiEvent
-    data class OnTermDetailClick(val url: String) : TermsAgreementUiEvent
+    data object OnPolicyClick : TermsAgreementUiEvent
+    data object OnTermClick : TermsAgreementUiEvent
     data object OnStartButtonClick : TermsAgreementUiEvent
 }