File tree Expand file tree Collapse file tree 9 files changed +6
-27
lines changed
api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository
impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository
designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button
network/src/main/kotlin/com/ninecraft/booket/core/network/response
library/src/main/kotlin/com/ninecraft/booket/feature/library
login/src/main/kotlin/com/ninecraft/booket/feature/login
screens/src/main/kotlin/com/ninecraft/booket/feature/screens Expand file tree Collapse file tree 9 files changed +6
-27
lines changed Original file line number Diff line number Diff line change @@ -12,8 +12,8 @@ interface AuthRepository {
1212 suspend fun withdraw (): Result <Unit >
1313
1414 val autoLoginState: Flow <AutoLoginState >
15-
15+
1616 val userState: Flow <UserState >
17-
17+
1818 suspend fun getCurrentUserState (): UserState
1919}
Original file line number Diff line number Diff line change @@ -51,12 +51,12 @@ internal class DefaultAuthRepository @Inject constructor(
5151 .map { accessToken ->
5252 if (accessToken.isBlank()) AutoLoginState .NOT_LOGGED_IN else AutoLoginState .LOGGED_IN
5353 }
54-
54+
5555 override val userState = tokenDataSource.accessToken
5656 .map { accessToken ->
5757 if (accessToken.isBlank()) UserState .Guest else UserState .LoggedIn
5858 }
59-
59+
6060 override suspend fun getCurrentUserState (): UserState {
6161 val accessToken = tokenDataSource.getAccessToken()
6262 return if (accessToken.isBlank()) UserState .Guest else UserState .LoggedIn
Original file line number Diff line number Diff line change @@ -18,7 +18,6 @@ enum class ReedButtonColorStyle {
1818 STROKE -> if (isPressed) ReedTheme .colors.basePrimary else ReedTheme .colors.basePrimary
1919 TEXT -> Color .Transparent
2020 KAKAO -> Kakao
21-
2221 }
2322
2423 @Composable
Original file line number Diff line number Diff line change @@ -44,4 +44,3 @@ data class GuestBookSummary(
4444 @SerialName(" link" )
4545 val link : String ,
4646)
47-
Original file line number Diff line number Diff line change 11package com.ninecraft.booket.feature.library
22
3- import android.R.attr.onClick
4- import android.R.id.message
53import androidx.compose.foundation.background
64import androidx.compose.foundation.layout.Arrangement
75import androidx.compose.foundation.layout.Box
@@ -19,7 +17,6 @@ import androidx.compose.ui.Modifier
1917import androidx.compose.ui.res.stringResource
2018import androidx.compose.ui.text.style.TextAlign
2119import androidx.compose.ui.unit.dp
22- import com.ninecraft.booket.core.common.utils.isNetworkError
2320import com.ninecraft.booket.core.designsystem.DevicePreview
2421import com.ninecraft.booket.core.designsystem.component.button.ReedButton
2522import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle
Original file line number Diff line number Diff line change @@ -48,11 +48,12 @@ sealed interface LibraryUiEvent : CircuitUiEvent {
4848 val userBookId : String ,
4949 val isbn13 : String ,
5050 ) : LibraryUiEvent
51+
5152 data object OnLoadMore : LibraryUiEvent
5253 data object OnRetryClick : LibraryUiEvent
5354 data class OnFilterClick (val filterOption : LibraryFilterOption ) : LibraryUiEvent
5455 data class OnTabSelected (val tab : MainTab ) : LibraryUiEvent
55- data object OnLoginClick : LibraryUiEvent
56+ data object OnLoginClick : LibraryUiEvent
5657}
5758
5859data class LibraryFilterChip (
Original file line number Diff line number Diff line change @@ -8,14 +8,11 @@ import androidx.compose.runtime.setValue
88import com.ninecraft.booket.core.common.analytics.AnalyticsHelper
99import com.ninecraft.booket.core.data.api.repository.AuthRepository
1010import com.ninecraft.booket.core.data.api.repository.UserRepository
11- import com.ninecraft.booket.core.model.UserState
1211import com.ninecraft.booket.feature.screens.HomeScreen
1312import com.ninecraft.booket.feature.screens.LoginScreen
1413import com.ninecraft.booket.feature.screens.TermsAgreementScreen
15- import com.ninecraft.booket.feature.screens.extensions.popUntilOrGoTo
1614import com.orhanobut.logger.Logger
1715import com.slack.circuit.codegen.annotations.CircuitInject
18- import com.slack.circuit.retained.collectAsRetainedState
1916import com.slack.circuit.retained.rememberRetained
2017import com.slack.circuit.runtime.Navigator
2118import com.slack.circuit.runtime.popUntil
Original file line number Diff line number Diff line change @@ -30,10 +30,6 @@ import com.adamglin.composeshadow.dropShadow
3030import com.ninecraft.booket.core.designsystem.ComponentPreview
3131import com.ninecraft.booket.core.designsystem.theme.ReedTheme
3232import com.ninecraft.booket.core.designsystem.theme.White
33- import com.slack.circuit.backstack.SaveableBackStack
34- import com.slack.circuit.runtime.Navigator
35- import com.slack.circuit.runtime.popUntil
36- import com.slack.circuit.runtime.screen.Screen
3733import kotlinx.collections.immutable.ImmutableList
3834import kotlinx.collections.immutable.toImmutableList
3935
Original file line number Diff line number Diff line change @@ -3,7 +3,6 @@ package com.ninecraft.booket.feature.screens.extensions
33import com.ninecraft.booket.feature.screens.LoginScreen
44import com.ninecraft.booket.feature.screens.ReedScreen
55import com.slack.circuit.runtime.Navigator
6- import com.slack.circuit.runtime.popUntil
76import com.slack.circuit.runtime.screen.Screen
87import kotlinx.coroutines.delay
98
@@ -17,17 +16,8 @@ suspend fun Navigator.delayedPop(delayMillis: Long = 200L) {
1716 pop()
1817}
1918
20- fun Navigator.popUntilOrGoTo (screen : Screen ) {
21- if (screen in peekBackStack()) {
22- popUntil { it == screen }
23- } else {
24- goTo(screen)
25- }
26- }
27-
2819suspend fun Navigator.redirectToLogin (): Screen ? {
2920 val currentScreen = peek()
3021 delayedGoTo(LoginScreen (currentScreen))
3122 return currentScreen
3223}
33-
You can’t perform that action at this time.
0 commit comments