[FIX/#300,#302] Domain 레이어 Paging3 제거 & FlowWithLifecycle 적용 #304
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
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 |
|---|---|---|
| @@ -1,14 +1,13 @@ | ||
| package com.el.yello.presentation.auth | ||
|
|
||
| import android.content.Context | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import com.el.yello.presentation.auth.SignInActivity.Companion.CODE_NOT_SIGNED_IN | ||
| import com.el.yello.presentation.auth.SignInActivity.Companion.CODE_NO_UUID | ||
| import com.example.domain.entity.AuthTokenModel | ||
| import com.example.domain.entity.AuthTokenRequestModel | ||
| import com.example.domain.entity.ProfileUserModel | ||
| import com.example.domain.repository.AuthRepository | ||
| import com.example.domain.repository.OnboardingRepository | ||
| import com.example.domain.repository.ProfileRepository | ||
|
|
@@ -21,6 +20,8 @@ import com.kakao.sdk.user.UserApiClient | |
| import com.kakao.sdk.user.model.Scope | ||
| import com.kakao.sdk.user.model.User | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.launch | ||
| import retrofit2.HttpException | ||
| import javax.inject.Inject | ||
|
|
@@ -32,27 +33,27 @@ class SignInViewModel @Inject constructor( | |
| private val profileRepository: ProfileRepository | ||
| ) : ViewModel() { | ||
|
|
||
| private val _postChangeTokenState = MutableStateFlow<UiState<AuthTokenModel>>(UiState.Empty) | ||
| val postChangeTokenState: StateFlow<UiState<AuthTokenModel?>> = _postChangeTokenState | ||
|
|
||
| private val _getUserProfileState = MutableStateFlow<UiState<ProfileUserModel>>(UiState.Empty) | ||
| val getUserProfileState: StateFlow<UiState<ProfileUserModel>> = _getUserProfileState | ||
|
|
||
| private val _getKakaoInfoState = MutableStateFlow<UiState<User>>(UiState.Empty) | ||
| val getKakaoInfoState: StateFlow<UiState<User?>> = _getKakaoInfoState | ||
|
|
||
| private val _getKakaoValidState = MutableStateFlow<UiState<List<Scope>>>(UiState.Empty) | ||
| val getKakaoValidState: StateFlow<UiState<List<Scope>>> = _getKakaoValidState | ||
|
|
||
| private val serviceTermsList = listOf(THUMBNAIL, EMAIL, FRIEND_LIST, NAME, GENDER) | ||
|
|
||
| private var deviceToken = String() | ||
|
|
||
| private val _getDeviceTokenError = MutableStateFlow(false) | ||
| val getDeviceTokenError: StateFlow<Boolean> = _getDeviceTokenError | ||
|
Comment on lines
+52
to
+53
There was a problem hiding this comment. Boolean 값을 저장하는 변수인데 조금 더 명확하게 네이밍해주는 건 어떨까요?! |
||
|
|
||
| private val _isAppLoginAvailable = MutableStateFlow(true) | ||
| val isAppLoginAvailable: StateFlow<Boolean> = _isAppLoginAvailable | ||
|
|
||
| var isResigned = false | ||
| private set | ||
|
|
@@ -82,10 +83,11 @@ class SignInViewModel @Inject constructor( | |
|
|
||
| fun initLoginState() { | ||
| _isAppLoginAvailable.value = true | ||
| _getDeviceTokenError.value = false | ||
| } | ||
|
|
||
| fun startKakaoLogIn(context: Context) { | ||
| if (UserApiClient.instance.isKakaoTalkLoginAvailable(context) && isAppLoginAvailable.value) { | ||
| UserApiClient.instance.loginWithKakaoTalk( | ||
| context = context, | ||
| callback = appLoginCallback, | ||
|
|
@@ -117,11 +119,14 @@ class SignInViewModel @Inject constructor( | |
|
|
||
| fun checkFriendsListValid() { | ||
| val scopes = mutableListOf(FRIEND_LIST) | ||
| _getKakaoValidState.value = UiState.Loading | ||
| UserApiClient.instance.scopes(scopes) { scopeInfo, error -> | ||
| if (error != null) { | ||
| _getKakaoValidState.value = UiState.Failure(error.message.toString()) | ||
| } else if (scopeInfo != null) { | ||
| _getKakaoValidState.value = UiState.Success(scopeInfo.scopes ?: listOf()) | ||
| } else { | ||
| _getKakaoValidState.value = UiState.Failure(ERROR) | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -132,8 +137,8 @@ class SignInViewModel @Inject constructor( | |
| social: String = KAKAO, | ||
| deviceToken: String | ||
| ) { | ||
| _postChangeTokenState.value = UiState.Loading | ||
| viewModelScope.launch { | ||
| onboardingRepository.postTokenToServiceToken( | ||
| AuthTokenRequestModel(accessToken, social, deviceToken), | ||
| ) | ||
|
|
@@ -159,15 +164,14 @@ class SignInViewModel @Inject constructor( | |
|
|
||
| // 서버통신 - (가입되어 있는) 유저 정보 가져오기 | ||
| fun getUserDataFromServer() { | ||
| _getUserProfileState.value = UiState.Loading | ||
| viewModelScope.launch { | ||
| profileRepository.getUserData() | ||
| .onSuccess { profile -> | ||
| if (profile != null) { | ||
| _getUserProfileState.value = UiState.Success(profile) | ||
| authRepository.setYelloId(profile.yelloId) | ||
| } | ||
| } | ||
| .onFailure { t -> | ||
| if (t is HttpException) { | ||
|
|
@@ -184,14 +188,12 @@ class SignInViewModel @Inject constructor( | |
| deviceToken = task.result | ||
| authRepository.setDeviceToken(deviceToken) | ||
| } else { | ||
| _getDeviceTokenError.value = true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun getIsFirstLoginData() = authRepository.getIsFirstLoginData() | ||
|
|
||
| companion object { | ||
| const val KAKAO = "KAKAO" | ||
|
|
||
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.
똑같이 빈 문자열로 초기화될 것 같은데 이렇게 바꾼 이유가 있나요?
별 이유 없다면 먼가
""요게 더 직관적으로 빈 문자열이라고 이해될 것 같은 늑김...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.
코드에서 ""처럼 초록색 스트링값 안봤으면 해서 추출하는 느낌으로 전환해봤서요..!