Skip to content

Commit 461ba51

Browse files
committed
[BOOK-475] fix: merge 이후 빌드 문제 해결
1 parent 8e08856 commit 461ba51

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/AuthRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.ninecraft.booket.core.data.api.repository
22

3+
import com.ninecraft.booket.core.model.LoginMethod
34
import com.ninecraft.booket.core.model.state.AutoLoginState
45
import com.ninecraft.booket.core.model.state.UserState
5-
import com.ninecraft.booket.core.model.UserState
66
import kotlinx.coroutines.flow.Flow
77

88
interface AuthRepository {

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import com.ninecraft.booket.core.common.utils.runSuspendCatching
44
import com.ninecraft.booket.core.data.api.repository.AuthRepository
55
import com.ninecraft.booket.core.datastore.api.datasource.LoginMethodDataSource
66
import com.ninecraft.booket.core.datastore.api.datasource.TokenDataSource
7+
import com.ninecraft.booket.core.di.DataScope
8+
import com.ninecraft.booket.core.model.LoginMethod
79
import com.ninecraft.booket.core.model.state.AutoLoginState
810
import com.ninecraft.booket.core.model.state.UserState
9-
import com.ninecraft.booket.core.model.UserState
1011
import com.ninecraft.booket.core.network.request.LoginRequest
1112
import com.ninecraft.booket.core.network.service.ReedService
1213
import dev.zacsweers.metro.Inject
@@ -55,10 +56,6 @@ class DefaultAuthRepository(
5556
tokenDataSource.clearTokens()
5657
}
5758

58-
override suspend fun clearRecentLoginMethod() {
59-
loginMethodDataSource.clearRecentLoginMethod()
60-
}
61-
6259
override val autoLoginState = tokenDataSource.accessToken
6360
.map { accessToken ->
6461
if (accessToken.isBlank()) AutoLoginState.NOT_LOGGED_IN else AutoLoginState.LOGGED_IN
@@ -79,4 +76,8 @@ class DefaultAuthRepository(
7976
override suspend fun setRecentLoginMethod(loginMethod: LoginMethod) {
8077
loginMethodDataSource.setRecentLoginMethod(loginMethod)
8178
}
79+
80+
override suspend fun clearRecentLoginMethod() {
81+
loginMethodDataSource.clearRecentLoginMethod()
82+
}
8283
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ internal fun LoginUi(
158158

159159
Spacer(
160160
modifier = Modifier.height(
161-
if (state.returnToScreen == null) ReedTheme.spacing.spacing3 else ReedTheme.spacing.spacing8
161+
if (state.returnToScreen == null) ReedTheme.spacing.spacing3 else ReedTheme.spacing.spacing8,
162162
),
163163
)
164164

feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/ImpressionStep.kt

Whitespace-only changes.

0 commit comments

Comments
 (0)