Skip to content

Commit a7c0f11

Browse files
committed
[BOOK-151] refactor: 모든 SideEffect 내에 UUID 도입
InitSideEffect UiEvent 제거
1 parent 7dee1ec commit a7c0f11

File tree

12 files changed

+21
-44
lines changed

12 files changed

+21
-44
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,22 @@ package com.ninecraft.booket.feature.library
22

33
import android.widget.Toast
44
import androidx.compose.runtime.Composable
5-
import androidx.compose.runtime.LaunchedEffect
65
import androidx.compose.ui.platform.LocalContext
6+
import com.skydoves.compose.effects.RememberedEffect
77

88
@Composable
99
internal fun HandleLibrarySideEffects(
1010
state: LibraryUiState,
11-
eventSink: (LibraryUiEvent) -> Unit,
1211
) {
1312
val context = LocalContext.current
1413

15-
LaunchedEffect(state.sideEffect) {
14+
RememberedEffect(state.sideEffect) {
1615
when (state.sideEffect) {
1716
is LibrarySideEffect.ShowToast -> {
1817
Toast.makeText(context, state.sideEffect.message, Toast.LENGTH_SHORT).show()
1918
}
2019

2120
null -> {}
2221
}
23-
24-
if (state.sideEffect != null) {
25-
eventSink(LibraryUiEvent.InitSideEffect)
26-
}
2722
}
2823
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ class LibraryPresenter @AssistedInject constructor(
7070

7171
fun handleEvent(event: LibraryUiEvent) {
7272
when (event) {
73-
is LibraryUiEvent.InitSideEffect -> {
74-
sideEffect = null
75-
}
76-
7773
is LibraryUiEvent.OnSettingsClick -> {
7874
navigator.goTo(SettingsScreen)
7975
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ internal fun Library(
2929
state: LibraryUiState,
3030
modifier: Modifier = Modifier,
3131
) {
32-
HandleLibrarySideEffects(
33-
state = state,
34-
eventSink = state.eventSink,
35-
)
32+
HandleLibrarySideEffects(state = state)
3633

3734
Column(
3835
modifier = modifier.fillMaxSize(),

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.ninecraft.booket.feature.library
22

33
import com.slack.circuit.runtime.CircuitUiEvent
44
import com.slack.circuit.runtime.CircuitUiState
5+
import java.util.UUID
56

67
data class LibraryUiState(
78
val isLoading: Boolean = false,
@@ -12,10 +13,12 @@ data class LibraryUiState(
1213
) : CircuitUiState
1314

1415
sealed interface LibrarySideEffect {
15-
data class ShowToast(val message: String) : LibrarySideEffect
16+
data class ShowToast(
17+
val message: String,
18+
private val key: String = UUID.randomUUID().toString(),
19+
) : LibrarySideEffect
1620
}
1721

1822
sealed interface LibraryUiEvent : CircuitUiEvent {
19-
data object InitSideEffect : LibraryUiEvent
2023
data object OnSettingsClick : LibraryUiEvent
2124
}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package com.ninecraft.booket.feature.login
22

33
import android.widget.Toast
44
import androidx.compose.runtime.Composable
5-
import androidx.compose.runtime.LaunchedEffect
65
import androidx.compose.runtime.remember
76
import androidx.compose.ui.platform.LocalContext
7+
import com.skydoves.compose.effects.RememberedEffect
88

99
@Composable
1010
internal fun HandleLoginSideEffects(
@@ -14,7 +14,7 @@ internal fun HandleLoginSideEffects(
1414
val context = LocalContext.current
1515
val kakaoLoginClient = remember { KakaoLoginClient() }
1616

17-
LaunchedEffect(state.sideEffect) {
17+
RememberedEffect(state.sideEffect) {
1818
when (state.sideEffect) {
1919
is LoginSideEffect.KakaoLogin -> {
2020
kakaoLoginClient.loginWithKakao(
@@ -34,9 +34,5 @@ internal fun HandleLoginSideEffects(
3434

3535
null -> {}
3636
}
37-
38-
if (state.sideEffect != null) {
39-
eventSink(LoginUiEvent.InitSideEffect)
40-
}
4137
}
4238
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ class LoginPresenter @AssistedInject constructor(
3232

3333
fun handleEvent(event: LoginUiEvent) {
3434
when (event) {
35-
is LoginUiEvent.InitSideEffect -> {
36-
sideEffect = null
37-
}
38-
3935
is LoginUiEvent.OnKakaoLoginButtonClick -> {
4036
isLoading = true
4137
sideEffect = LoginSideEffect.KakaoLogin

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.ninecraft.booket.feature.login
22

33
import com.slack.circuit.runtime.CircuitUiEvent
44
import com.slack.circuit.runtime.CircuitUiState
5+
import java.util.UUID
56

67
data class LoginUiState(
78
val isLoading: Boolean = false,
@@ -11,11 +12,13 @@ data class LoginUiState(
1112

1213
sealed interface LoginSideEffect {
1314
data object KakaoLogin : LoginSideEffect
14-
data class ShowToast(val message: String) : LoginSideEffect
15+
data class ShowToast(
16+
val message: String,
17+
private val key: String = UUID.randomUUID().toString(),
18+
) : LoginSideEffect
1519
}
1620

1721
sealed interface LoginUiEvent : CircuitUiEvent {
18-
data object InitSideEffect : LoginUiEvent
1922
data object OnKakaoLoginButtonClick : LoginUiEvent
2023
data class Login(val accessToken: String) : LoginUiEvent
2124
data class LoginFailure(val message: String) : LoginUiEvent

feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/SearchSideEffect.kt renamed to feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/HandlingSearchSideEffect.kt

File renamed without changes.

feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/SettingsSideEffect.kt renamed to feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/HandlingSettingsSideEffect.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.skydoves.compose.effects.RememberedEffect
88
@Composable
99
internal fun HandleSettingsSideEffects(
1010
state: SettingsUiState,
11-
eventSink: (SettingsUiEvent) -> Unit,
1211
) {
1312
val context = LocalContext.current
1413

@@ -19,9 +18,5 @@ internal fun HandleSettingsSideEffects(
1918
}
2019
null -> {}
2120
}
22-
23-
if (state.sideEffect != null) {
24-
eventSink(SettingsUiEvent.InitSideEffect)
25-
}
2621
}
2722
}

feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/SettingsPresenter.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ class SettingsPresenter @AssistedInject constructor(
3737

3838
fun handleEvent(event: SettingsUiEvent) {
3939
when (event) {
40-
is SettingsUiEvent.InitSideEffect -> {
41-
sideEffect = null
42-
}
43-
4440
is SettingsUiEvent.OnBackClick -> {
4541
navigator.pop()
4642
}

0 commit comments

Comments
 (0)