[Feat] 7주차 과제 완료 #14
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,10 +56,6 @@ android { | |
| } | ||
| } | ||
|
|
||
|
|
||
| dependencies { | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package org.sopt.and.presentation.core | ||
|
|
||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import kotlinx.coroutines.flow.MutableSharedFlow | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.SharedFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.flow.asSharedFlow | ||
| import kotlinx.coroutines.flow.asStateFlow | ||
| import kotlinx.coroutines.launch | ||
|
|
||
| abstract class BaseViewModel<State : UiState, SideEffect : UiSideEffect, Event : UiEvent> : | ||
| ViewModel() { | ||
|
|
||
| private val initialState: State by lazy { createInitialState() } | ||
| abstract fun createInitialState(): State | ||
|
|
||
| private val _uiState = MutableStateFlow(initialState) | ||
| val uiState: StateFlow<State> = _uiState.asStateFlow() | ||
|
|
||
| private val _sideEffect = MutableSharedFlow<SideEffect>() | ||
| val sideEffect: SharedFlow<SideEffect> = _sideEffect.asSharedFlow() | ||
|
|
||
| fun setState(reduce: State.() -> State) { | ||
| _uiState.value = _uiState.value.reduce() | ||
| } | ||
|
|
||
| fun setSideEffect(builder: () -> SideEffect) { | ||
| viewModelScope.launch { _sideEffect.emit(builder()) } | ||
| } | ||
|
|
||
| fun setEvent(event: Event) { | ||
| viewModelScope.launch { handleEvent(event) } | ||
| } | ||
|
|
||
| protected abstract suspend fun handleEvent(event: Event) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| package org.sopt.and.presentation.core | ||
|
|
||
| interface UiEvent |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| package org.sopt.and.presentation.core | ||
|
|
||
| interface UiSideEffect |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| package org.sopt.and.presentation.core | ||
|
|
||
| interface UiState |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package org.sopt.and.presentation.login | ||
|
|
||
| import org.sopt.and.presentation.core.UiEvent | ||
| import org.sopt.and.presentation.core.UiSideEffect | ||
| import org.sopt.and.presentation.core.UiState | ||
|
|
||
| // State 정의 | ||
| data class LogInState( | ||
| val username: String = "", | ||
| val password: String = "", | ||
| val isLoading: Boolean = false, | ||
|
Comment on lines
+9
to
+11
|
||
| ) : UiState | ||
|
|
||
| // Event 정의 | ||
| sealed class LogInEvent : UiEvent { | ||
| data class UsernameChanged(val username: String) : LogInEvent() | ||
| data class PasswordChanged(val password: String) : LogInEvent() | ||
| object LogInClicked : LogInEvent() | ||
| } | ||
|
|
||
| // SideEffect 정의 | ||
| sealed class LogInEffect : UiSideEffect { | ||
| data class ShowSnackBar(val message: Int) : LogInEffect() | ||
| object NavigateToMain : LogInEffect() | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package org.sopt.and.presentation.login | ||
|
|
||
| import androidx.lifecycle.viewModelScope | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.coroutines.launch | ||
| import org.sopt.and.domain.model.UserLoginRequest | ||
| import org.sopt.and.domain.repository.UserRepository | ||
| import org.sopt.and.presentation.core.BaseViewModel | ||
| import javax.inject.Inject | ||
| import org.sopt.and.R | ||
| import retrofit2.HttpException | ||
|
|
||
| @HiltViewModel | ||
| class LogInViewModel @Inject constructor( | ||
| private val userRepository: UserRepository | ||
| ) : BaseViewModel<LogInState, LogInEffect, LogInEvent>() { | ||
|
|
||
| override fun createInitialState(): LogInState = LogInState() | ||
|
|
||
| override suspend fun handleEvent(event: LogInEvent) { | ||
|
There was a problem hiding this comment. event와 sideEffect의 차이는 뭘까요? |
||
| when (event) { | ||
| is LogInEvent.UsernameChanged -> { | ||
| setState { copy(username = event.username) } | ||
| } | ||
|
|
||
| is LogInEvent.PasswordChanged -> { | ||
| setState { copy(password = event.password) } | ||
| } | ||
|
|
||
| is LogInEvent.LogInClicked -> { | ||
| logIn() | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| // 로그인 로직 | ||
| fun logIn() { | ||
| setState { copy(isLoading = true) } | ||
| viewModelScope.launch { | ||
| val state = uiState.value | ||
| val result = userRepository.postUserLogin( | ||
|
Comment on lines
+38
to
+42
There was a problem hiding this comment. 여기에 상태 업데이트와 비지니스 로직이 섞여있는 것 같아용 약간 분리해줘도 좋을 것 같은데요?? |
||
| UserLoginRequest( | ||
| username = state.username, | ||
| password = state.password | ||
| ) | ||
| ) | ||
| result.fold( | ||
| onSuccess = { | ||
| setState { copy(isLoading = false) } | ||
| setSideEffect { LogInEffect.NavigateToMain } | ||
| }, | ||
| onFailure = { error -> | ||
| val message = if (error is HttpException) { | ||
| when (error.code()) { | ||
| 400 -> R.string.log_in_method | ||
| 403 -> R.string.sign_up_paswd | ||
| else -> R.string.unknown_error | ||
| } | ||
| } else { | ||
| R.string.unknown_error | ||
| } | ||
| setState { copy(isLoading = false) } | ||
| setSideEffect { LogInEffect.ShowSnackBar(message) } | ||
| } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package org.sopt.and.presentation.signup | ||
|
|
||
| import org.sopt.and.presentation.core.UiEvent | ||
| import org.sopt.and.presentation.core.UiSideEffect | ||
| import org.sopt.and.presentation.core.UiState | ||
|
|
||
| // State 정의 | ||
| data class SignUpState( | ||
| val username: String = "", | ||
| val password: String = "", | ||
| val hobby: String = "", | ||
| val isLoading: Boolean = false | ||
| ) : UiState | ||
|
|
||
| // Event 정의 | ||
| sealed class SignUpEvent : UiEvent { | ||
| data class UsernameChanged(val username: String) : SignUpEvent() | ||
| data class PasswordChanged(val password: String) : SignUpEvent() | ||
| data class HobbyChanged(val hobby: String) : SignUpEvent() | ||
| object SignUpClicked : SignUpEvent() | ||
| } | ||
|
|
||
| // SideEffect 정의 | ||
| sealed class SignUpSideEffect : UiSideEffect { | ||
| data class ShowToast(val message: String) : SignUpSideEffect() | ||
| object NavigateToLogin : SignUpSideEffect() | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BaseViewModel을 두어서 하는 방식 좋네요!!