[BOOK-121] refactor: 누락된 약관 동의 화면 변경 반영

Author: easyhooon

feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginPresenter.kt

@@ -7,6 +7,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.screens.LoginScreen
+import com.ninecraft.booket.screens.TermsAgreementScreen
 import com.orhanobut.logger.Logger
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained

…feature/login/TermsAgreementPresenter.kt …ermsagreement/TermsAgreementPresenter.ktfeature/login/src/main/kotlin/com/ninecraft/booket/feature/login/TermsAgreementPresenter.kt renamed to feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementPresenter.kt feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/TermsAgreementPresenter.kt renamed to feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementPresenter.kt

@@ -1,12 +1,13 @@
-package com.ninecraft.booket.feature.login
+package com.ninecraft.booket.feature.termsagreement
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import com.ninecraft.booket.feature.home.HomeScreen
+import com.ninecraft.booket.screens.HomeScreen
+import com.ninecraft.booket.screens.TermsAgreementScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained
 import com.slack.circuit.runtime.Navigator
@@ -20,10 +21,10 @@ import kotlinx.collections.immutable.toPersistentList
 
 class TermsAgreementPresenter @AssistedInject constructor(
     @Assisted private val navigator: Navigator,
-) : Presenter<TermsAgreementScreen.State> {
+) : Presenter<TermsAgreementUiState> {
 
     @Composable
-    override fun present(): TermsAgreementScreen.State {
+    override fun present(): TermsAgreementUiState {
         var agreedTerms by rememberRetained {
             mutableStateOf(persistentListOf(false, false, false))
         }
@@ -34,32 +35,32 @@ class TermsAgreementPresenter @AssistedInject constructor(
             }
         }
 
-        fun handleEvent(event: TermsAgreementScreen.Event) {
+        fun handleEvent(event: TermsAgreementUiEvent) {
             when (event) {
-                is TermsAgreementScreen.Event.OnAllTermsAgreedClick -> {
+                is TermsAgreementUiEvent.OnAllTermsAgreedClick -> {
                     val toggleAgreed = !isAllAgreed
                     agreedTerms = agreedTerms.map { toggleAgreed }.toPersistentList()
                 }
 
-                is TermsAgreementScreen.Event.OnTermItemClick -> {
+                is TermsAgreementUiEvent.OnTermItemClick -> {
                     agreedTerms = agreedTerms.set(event.index, !agreedTerms[event.index])
                 }
 
-                is TermsAgreementScreen.Event.OnBackClick -> {
+                is TermsAgreementUiEvent.OnBackClick -> {
                     navigator.pop()
                 }
 
-                is TermsAgreementScreen.Event.OnTermDetailClick -> {
+                is TermsAgreementUiEvent.OnTermDetailClick -> {
                     // TODO: 웹뷰 화면으로 이동
                 }
 
-                is TermsAgreementScreen.Event.OnStartButtonClick -> {
+                is TermsAgreementUiEvent.OnStartButtonClick -> {
                     navigator.resetRoot(HomeScreen)
                 }
             }
         }
 
-        return TermsAgreementScreen.State(
+        return TermsAgreementUiState(
             isAllAgreed = isAllAgreed,
             agreedTerms = agreedTerms,
             eventSink = ::handleEvent,

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

@@ -1,4 +1,4 @@
-package com.ninecraft.booket.feature.login
+package com.ninecraft.booket.feature.termsagreement
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -32,36 +32,16 @@ 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.screens.TermsAgreementScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
-import com.slack.circuit.runtime.CircuitUiEvent
-import com.slack.circuit.runtime.CircuitUiState
-import com.slack.circuit.runtime.screen.Screen
 import dagger.hilt.android.components.ActivityRetainedComponent
-import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data object TermsAgreementScreen : Screen {
-    data class State(
-        val isAllAgreed: Boolean,
-        val agreedTerms: ImmutableList<Boolean>,
-        val eventSink: (Event) -> Unit,
-    ) : CircuitUiState
-
-    sealed interface Event : CircuitUiEvent {
-        data object OnAllTermsAgreedClick : Event
-        data class OnTermItemClick(val index: Int) : Event
-        data object OnBackClick : Event
-        data class OnTermDetailClick(val url: String) : Event
-        data object OnStartButtonClick : Event
-    }
-}
 
 @CircuitInject(TermsAgreementScreen::class, ActivityRetainedComponent::class)
 @Composable
 internal fun TermsAgreement(
-    state: TermsAgreementScreen.State,
+    state: TermsAgreementUiState,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -71,7 +51,7 @@ internal fun TermsAgreement(
     ) {
         ReedBackTopAppBar(
             onNavigateBack = {
-                state.eventSink(TermsAgreementScreen.Event.OnBackClick)
+                state.eventSink(TermsAgreementUiEvent.OnBackClick)
             },
         )
         Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2))
@@ -103,7 +83,7 @@ internal fun TermsAgreement(
                 SquareCheckBox(
                     checked = state.isAllAgreed,
                     onCheckedChange = {
-                        state.eventSink(TermsAgreementScreen.Event.OnAllTermsAgreedClick)
+                        state.eventSink(TermsAgreementUiEvent.OnAllTermsAgreedClick)
                     },
                 )
                 Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing4))
@@ -122,17 +102,17 @@ internal fun TermsAgreement(
                     title = title,
                     checked = state.agreedTerms[index],
                     onCheckClick = {
-                        state.eventSink(TermsAgreementScreen.Event.OnTermItemClick(index))
+                        state.eventSink(TermsAgreementUiEvent.OnTermItemClick(index))
                     },
                     onDetailClick = {
-                        state.eventSink(TermsAgreementScreen.Event.OnTermDetailClick(""))
+                        state.eventSink(TermsAgreementUiEvent.OnTermDetailClick(""))
                     },
                 )
             }
         }
         ReedButton(
             onClick = {
-                state.eventSink(TermsAgreementScreen.Event.OnStartButtonClick)
+                state.eventSink(TermsAgreementUiEvent.OnStartButtonClick)
             },
             modifier = Modifier
                 .fillMaxWidth()
@@ -195,7 +175,7 @@ private fun TermItem(
 private fun TermsAgreementPreview() {
     ReedTheme {
         TermsAgreement(
-            state = TermsAgreementScreen.State(
+            state = TermsAgreementUiState(
                 isAllAgreed = false,
                 agreedTerms = persistentListOf(false, false, false),
                 eventSink = {},

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

@@ -0,0 +1,19 @@
+package com.ninecraft.booket.feature.termsagreement
+
+import com.slack.circuit.runtime.CircuitUiEvent
+import com.slack.circuit.runtime.CircuitUiState
+import kotlinx.collections.immutable.ImmutableList
+
+data class TermsAgreementUiState(
+    val isAllAgreed: Boolean,
+    val agreedTerms: ImmutableList<Boolean>,
+    val eventSink: (TermsAgreementUiEvent) -> Unit,
+) : CircuitUiState
+
+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 OnStartButtonClick : TermsAgreementUiEvent
+}

screens/src/main/kotlin/com/ninecraft/booket/screens/Screens.kt

@@ -18,3 +18,6 @@ data object LoginScreen : ReedScreen(name = "Login()")
 
 @Parcelize
 data object SearchScreen : ReedScreen(name = "Search()")
+
+@Parcelize
+data object TermsAgreementScreen : ReedScreen(name = "TermsAgreement()")