Merge pull request #39 from YAPP-Github/BOOK-121-refactor/#36

refactor: feature 모듈간 의존성 제거

Author: easyhooon

build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt

@@ -1,9 +1,10 @@
+
+import com.ninecraft.booket.convention.api
 import com.ninecraft.booket.convention.applyPlugins
 import com.ninecraft.booket.convention.implementation
-import com.ninecraft.booket.convention.api
 import com.ninecraft.booket.convention.ksp
-import com.ninecraft.booket.convention.project
 import com.ninecraft.booket.convention.libs
+import com.ninecraft.booket.convention.project
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
@@ -23,6 +24,7 @@ internal class AndroidFeatureConventionPlugin : Plugin<Project> {
                 implementation(project(path = ":core:designsystem"))
                 implementation(project(path = ":core:model"))
                 implementation(project(path = ":core:ui"))
+                implementation(project(path = ":screens"))
 
                 implementation(libs.compose.effects)
 

build.gradle.kts

@@ -41,3 +41,7 @@ allprojects {
         }
     }
 }
+
+apply {
+    from("gradle/projectDependencyGraph.gradle")
+}

feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomePresenter.kt

@@ -2,6 +2,7 @@ package com.ninecraft.booket.feature.home
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
+import com.ninecraft.booket.screens.HomeScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
@@ -13,13 +14,13 @@ import dagger.hilt.android.components.ActivityRetainedComponent
 @Suppress("unused")
 class HomePresenter @AssistedInject constructor(
     @Assisted private val navigator: Navigator,
-) : Presenter<HomeScreen.State> {
+) : Presenter<HomeUiState> {
 
     @Composable
-    override fun present(): HomeScreen.State {
+    override fun present(): HomeUiState {
         val scope = rememberCoroutineScope()
 
-        return HomeScreen.State {}
+        return HomeUiState {}
     }
 
     @CircuitInject(HomeScreen::class, ActivityRetainedComponent::class)

feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeScreen.kt

@@ -9,26 +9,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import com.ninecraft.booket.core.designsystem.DevicePreview
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
+import com.ninecraft.booket.screens.HomeScreen
 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.parcelize.Parcelize
-
-@Parcelize
-data object HomeScreen : Screen {
-    data class State(
-        val eventSink: (Event) -> Unit,
-    ) : CircuitUiState
-
-    sealed interface Event : CircuitUiEvent
-}
 
 @CircuitInject(HomeScreen::class, ActivityRetainedComponent::class)
 @Composable
 internal fun Home(
-    state: HomeScreen.State,
+    state: HomeUiState,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -46,7 +34,7 @@ internal fun Home(
 @Suppress("unused")
 @Composable
 internal fun HomeContent(
-    state: HomeScreen.State,
+    state: HomeUiState,
     modifier: Modifier = Modifier,
 ) {
     Text(text = "홈")
@@ -57,7 +45,7 @@ internal fun HomeContent(
 private fun HomePreview() {
     ReedTheme {
         Home(
-            state = HomeScreen.State(
+            state = HomeUiState(
                 eventSink = {},
             ),
         )

feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUiState.kt

@@ -0,0 +1,10 @@
+package com.ninecraft.booket.feature.home
+
+import com.slack.circuit.runtime.CircuitUiEvent
+import com.slack.circuit.runtime.CircuitUiState
+
+data class HomeUiState(
+    val eventSink: (HomeUiEvent) -> Unit,
+) : CircuitUiState
+
+sealed interface HomeUiEvent : CircuitUiEvent

feature/library/build.gradle.kts

@@ -16,8 +16,6 @@ ksp {
 
 dependencies {
     implementations(
-        projects.feature.login,
-
         libs.logger,
     )
 }

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/HandleLibrarySideEffects.kt

@@ -7,22 +7,22 @@ import androidx.compose.ui.platform.LocalContext
 
 @Composable
 internal fun HandleLibrarySideEffects(
-    state: LibraryScreen.State,
-    eventSink: (LibraryScreen.Event) -> Unit,
+    state: LibraryUiState,
+    eventSink: (LibraryUiEvent) -> Unit,
 ) {
     val context = LocalContext.current
 
     LaunchedEffect(state.sideEffect) {
         when (state.sideEffect) {
-            is LibraryScreen.SideEffect.ShowToast -> {
+            is LibrarySideEffect.ShowToast -> {
                 Toast.makeText(context, state.sideEffect.message, Toast.LENGTH_SHORT).show()
             }
 
             null -> {}
         }
 
         if (state.sideEffect != null) {
-            eventSink(LibraryScreen.Event.InitSideEffect)
+            eventSink(LibraryUiEvent.InitSideEffect)
         }
     }
 }

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt

@@ -8,7 +8,8 @@ import androidx.compose.runtime.setValue
 import com.ninecraft.booket.core.common.utils.handleException
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.core.data.api.repository.UserRepository
-import com.ninecraft.booket.feature.login.LoginScreen
+import com.ninecraft.booket.screens.LibraryScreen
+import com.ninecraft.booket.screens.LoginScreen
 import com.orhanobut.logger.Logger
 import com.skydoves.compose.effects.RememberedEffect
 import com.slack.circuit.codegen.annotations.CircuitInject
@@ -25,13 +26,13 @@ class LibraryPresenter @AssistedInject constructor(
     @Assisted private val navigator: Navigator,
     private val authRepository: AuthRepository,
     private val userRepository: UserRepository,
-) : Presenter<LibraryScreen.State> {
+) : Presenter<LibraryUiState> {
 
     @Composable
-    override fun present(): LibraryScreen.State {
+    override fun present(): LibraryUiState {
         val scope = rememberCoroutineScope()
         var isLoading by rememberRetained { mutableStateOf(false) }
-        var sideEffect by rememberRetained { mutableStateOf<LibraryScreen.SideEffect?>(null) }
+        var sideEffect by rememberRetained { mutableStateOf<LibrarySideEffect?>(null) }
         var nickname by rememberRetained { mutableStateOf("") }
         var email by rememberRetained { mutableStateOf("") }
 
@@ -47,7 +48,7 @@ class LibraryPresenter @AssistedInject constructor(
                         .onFailure { exception ->
                             val handleErrorMessage = { message: String ->
                                 Logger.e(message)
-                                sideEffect = LibraryScreen.SideEffect.ShowToast(message)
+                                sideEffect = LibrarySideEffect.ShowToast(message)
                             }
 
                             handleException(
@@ -69,13 +70,13 @@ class LibraryPresenter @AssistedInject constructor(
             getUserProfile()
         }
 
-        fun handleEvent(event: LibraryScreen.Event) {
+        fun handleEvent(event: LibraryUiEvent) {
             when (event) {
-                is LibraryScreen.Event.InitSideEffect -> {
+                is LibraryUiEvent.InitSideEffect -> {
                     sideEffect = null
                 }
 
-                is LibraryScreen.Event.OnLogoutButtonClick -> {
+                is LibraryUiEvent.OnLogoutButtonClick -> {
                     scope.launch {
                         try {
                             isLoading = true
@@ -87,7 +88,7 @@ class LibraryPresenter @AssistedInject constructor(
                                 .onFailure { exception ->
                                     val handleErrorMessage = { message: String ->
                                         Logger.e(message)
-                                        sideEffect = LibraryScreen.SideEffect.ShowToast(message)
+                                        sideEffect = LibrarySideEffect.ShowToast(message)
                                     }
 
                                     handleException(
@@ -107,7 +108,7 @@ class LibraryPresenter @AssistedInject constructor(
             }
         }
 
-        return LibraryScreen.State(
+        return LibraryUiState(
             isLoading = isLoading,
             nickname = nickname,
             email = email,

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryScreen.kt

@@ -20,37 +20,14 @@ 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.theme.ReedTheme
+import com.ninecraft.booket.screens.LibraryScreen
 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.parcelize.Parcelize
-
-@Parcelize
-data object LibraryScreen : Screen {
-    data class State(
-        val isLoading: Boolean = false,
-        val nickname: String = "",
-        val email: String = "",
-        val sideEffect: SideEffect? = null,
-        val eventSink: (Event) -> Unit,
-    ) : CircuitUiState
-
-    sealed interface SideEffect {
-        data class ShowToast(val message: String) : SideEffect
-    }
-
-    sealed interface Event : CircuitUiEvent {
-        data object InitSideEffect : Event
-        data object OnLogoutButtonClick : Event
-    }
-}
 
 @CircuitInject(LibraryScreen::class, ActivityRetainedComponent::class)
 @Composable
 internal fun Library(
-    state: LibraryScreen.State,
+    state: LibraryUiState,
     modifier: Modifier = Modifier,
 ) {
     HandleLibrarySideEffects(
@@ -72,7 +49,7 @@ internal fun Library(
 
 @Composable
 internal fun LibraryContent(
-    state: LibraryScreen.State,
+    state: LibraryUiState,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -94,7 +71,7 @@ internal fun LibraryContent(
             }
             ReedButton(
                 onClick = {
-                    state.eventSink(LibraryScreen.Event.OnLogoutButtonClick)
+                    state.eventSink(LibraryUiEvent.OnLogoutButtonClick)
                 },
                 modifier = Modifier
                     .fillMaxWidth()
@@ -118,7 +95,7 @@ internal fun LibraryContent(
 private fun LibraryPreview() {
     ReedTheme {
         Library(
-            state = LibraryScreen.State(
+            state = LibraryUiState(
                 nickname = "홍길동",
                 email = "[email protected]",
                 eventSink = {},

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUiState.kt

@@ -0,0 +1,21 @@
+package com.ninecraft.booket.feature.library
+
+import com.slack.circuit.runtime.CircuitUiEvent
+import com.slack.circuit.runtime.CircuitUiState
+
+data class LibraryUiState(
+    val isLoading: Boolean = false,
+    val nickname: String = "",
+    val email: String = "",
+    val sideEffect: LibrarySideEffect? = null,
+    val eventSink: (LibraryUiEvent) -> Unit,
+) : CircuitUiState
+
+sealed interface LibrarySideEffect {
+    data class ShowToast(val message: String) : LibrarySideEffect
+}
+
+sealed interface LibraryUiEvent : CircuitUiEvent {
+    data object InitSideEffect : LibraryUiEvent
+    data object OnLogoutButtonClick : LibraryUiEvent
+}