[BOOK-186] feat: 약관 동의 구현 및 약관 동의 화면 컴포넌트 분리

Author: easyhooon

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

@@ -0,0 +1,28 @@
+package com.ninecraft.booket.feature.termsagreement
+
+import android.widget.Toast
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import com.ninecraft.booket.feature.login.KakaoLoginClient
+import com.ninecraft.booket.feature.login.LoginSideEffect
+import com.ninecraft.booket.feature.login.LoginUiEvent
+import com.ninecraft.booket.feature.login.LoginUiState
+import com.skydoves.compose.effects.RememberedEffect
+
+@Composable
+internal fun HandleTermsAgreementSideEffects(
+    state: TermsAgreementUiState,
+) {
+    val context = LocalContext.current
+
+    RememberedEffect(state.sideEffect) {
+        when (state.sideEffect) {
+            is TermsAgreementSideEffect.ShowToast -> {
+                Toast.makeText(context, state.sideEffect.message, Toast.LENGTH_SHORT).show()
+            }
+
+            null -> {}
+        }
+    }
+}

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

@@ -5,13 +5,17 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import com.ninecraft.booket.core.common.constants.WebViewConstants
+import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.core.data.api.repository.UserRepository
+import com.ninecraft.booket.feature.login.LoginSideEffect
 import com.ninecraft.booket.feature.screens.BottomNavigationScreen
 import com.ninecraft.booket.feature.screens.OnboardingScreen
 import com.ninecraft.booket.feature.screens.TermsAgreementScreen
 import com.ninecraft.booket.feature.screens.WebViewScreen
+import com.orhanobut.logger.Logger
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.collectAsRetainedState
 import com.slack.circuit.retained.rememberRetained
@@ -23,14 +27,20 @@ import dagger.assisted.AssistedInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toPersistentList
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
 
 class TermsAgreementPresenter @AssistedInject constructor(
     @Assisted private val navigator: Navigator,
-    private val repository: UserRepository,
+    private val userRepository: UserRepository,
+    private val authRepository: AuthRepository,
 ) : Presenter<TermsAgreementUiState> {
 
     @Composable
     override fun present(): TermsAgreementUiState {
+        val scope = rememberCoroutineScope()
+        var sideEffect by rememberRetained { mutableStateOf<TermsAgreementSideEffect?>(null) }
+
         var agreedTerms by rememberRetained {
             mutableStateOf(persistentListOf(false, false, false))
         }
@@ -41,7 +51,7 @@ class TermsAgreementPresenter @AssistedInject constructor(
             }
         }
 
-        val isOnboardingCompleted by repository.isOnboardingCompleted.collectAsRetainedState(initial = false)
+        val isOnboardingCompleted by userRepository.isOnboardingCompleted.collectAsRetainedState(initial = false)
 
         fun handleEvent(event: TermsAgreementUiEvent) {
             when (event) {
@@ -65,10 +75,20 @@ class TermsAgreementPresenter @AssistedInject constructor(
                 }
 
                 is TermsAgreementUiEvent.OnStartButtonClick -> {
-                    if (isOnboardingCompleted) {
-                        navigator.resetRoot(BottomNavigationScreen)
-                    } else {
-                        navigator.resetRoot(OnboardingScreen)
+                    scope.launch {
+                        authRepository.agreeTerms(true)
+                            .onSuccess {
+                                if (isOnboardingCompleted) {
+                                    navigator.resetRoot(BottomNavigationScreen)
+                                } else {
+                                    navigator.resetRoot(OnboardingScreen)
+                                }
+                            }.onFailure { exception ->
+                                exception.message?.let { Logger.e(it) }
+                                sideEffect = exception.message?.let {
+                                    TermsAgreementSideEffect.ShowToast(it)
+                                }
+                            }
                     }
                 }
             }

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

@@ -12,39 +12,36 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
 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.noRippleClickable
 import com.ninecraft.booket.core.designsystem.DevicePreview
 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
 import com.ninecraft.booket.core.designsystem.component.checkbox.SquareCheckBox
-import com.ninecraft.booket.core.designsystem.component.checkbox.TickOnlyCheckBox
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 import com.ninecraft.booket.core.designsystem.theme.White
 import com.ninecraft.booket.feature.login.R
 import com.ninecraft.booket.feature.screens.TermsAgreementScreen
+import com.ninecraft.booket.feature.termsagreement.component.TermItem
 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 TermsAgreementUi(
     state: TermsAgreementUiState,
     modifier: Modifier = Modifier,
 ) {
+    HandleTermsAgreementSideEffects(state = state)
+
     val termsTitles = stringArrayResource(id = R.array.terms_agreement_items)
 
     Column(
@@ -53,8 +50,7 @@ internal fun TermsAgreementUi(
             .background(White)
             .systemBarsPadding(),
     ) {
-        Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing16))
-        Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing3))
+        Spacer(modifier = Modifier.height(76.dp))
         Column(
             modifier = Modifier
                 .weight(1f)
@@ -147,49 +143,6 @@ internal fun TermsAgreementUi(
     }
 }
 
-@Composable
-private fun TermItem(
-    title: String,
-    onCheckClick: () -> Unit,
-    modifier: Modifier = Modifier,
-    checked: Boolean = false,
-    hasDetailAction: Boolean = true,
-    onDetailClick: () -> Unit = {},
-) {
-    Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .noRippleClickable { onDetailClick() }
-            .padding(
-                start = ReedTheme.spacing.spacing4 + ReedTheme.spacing.spacing05,
-                end = ReedTheme.spacing.spacing3,
-                top = ReedTheme.spacing.spacing2,
-                bottom = ReedTheme.spacing.spacing2,
-            ),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        TickOnlyCheckBox(
-            checked = checked,
-            onCheckedChange = { onCheckClick() },
-        )
-        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,
-        )
-
-        if (hasDetailAction) {
-            Icon(
-                imageVector = ImageVector.vectorResource(id = designR.drawable.ic_chevron_right),
-                contentDescription = "Navigation Icon",
-                tint = Color.Unspecified,
-            )
-        }
-    }
-}
-
 @DevicePreview
 @Composable
 private fun TermsAgreementPreview() {

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

@@ -1,15 +1,25 @@
 package com.ninecraft.booket.feature.termsagreement
 
+import com.ninecraft.booket.feature.login.LoginSideEffect
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import kotlinx.collections.immutable.ImmutableList
+import java.util.UUID
 
 data class TermsAgreementUiState(
     val isAllAgreed: Boolean,
     val agreedTerms: ImmutableList<Boolean>,
+    val sideEffect: TermsAgreementSideEffect? = null,
     val eventSink: (TermsAgreementUiEvent) -> Unit,
 ) : CircuitUiState
 
+sealed interface TermsAgreementSideEffect {
+    data class ShowToast(
+        val message: String,
+        private val key: String = UUID.randomUUID().toString(),
+    ) : TermsAgreementSideEffect
+}
+
 sealed interface TermsAgreementUiEvent : CircuitUiEvent {
     data object OnAllTermsAgreedClick : TermsAgreementUiEvent
     data class OnTermItemClick(val index: Int) : TermsAgreementUiEvent

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

@@ -0,0 +1,74 @@
+package com.ninecraft.booket.feature.termsagreement.component
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
+import com.ninecraft.booket.core.common.extensions.noRippleClickable
+import com.ninecraft.booket.core.designsystem.ComponentPreview
+import com.ninecraft.booket.core.designsystem.component.checkbox.TickOnlyCheckBox
+import com.ninecraft.booket.core.designsystem.theme.ReedTheme
+import com.ninecraft.booket.core.designsystem.R as designR
+
+@Composable
+internal fun TermItem(
+    title: String,
+    onCheckClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    checked: Boolean = false,
+    hasDetailAction: Boolean = true,
+    onDetailClick: () -> Unit = {},
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .noRippleClickable { onDetailClick() }
+            .padding(
+                start = ReedTheme.spacing.spacing4 + ReedTheme.spacing.spacing05,
+                end = ReedTheme.spacing.spacing3,
+                top = ReedTheme.spacing.spacing2,
+                bottom = ReedTheme.spacing.spacing2,
+            ),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        TickOnlyCheckBox(
+            checked = checked,
+            onCheckedChange = { onCheckClick() },
+        )
+        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,
+        )
+
+        if (hasDetailAction) {
+            Icon(
+                imageVector = ImageVector.vectorResource(id = designR.drawable.ic_chevron_right),
+                contentDescription = "Navigation Icon",
+                tint = Color.Unspecified,
+            )
+        }
+    }
+}
+
+@ComponentPreview
+@Composable
+private fun TermItemPreview() {
+    ReedTheme {
+        TermItem(
+            title = "(필수)서비스 이용약관",
+            onCheckClick = {}
+        )
+    }
+}