Feat/seminar7 basic #9
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,16 @@ | ||
| package org.sopt.dosopttemplate.data.dataclass | ||
|
|
||
| object UserInfo { | ||
| var userInfoList = User( | ||
| nick = "", | ||
| self_description = "", | ||
| id = "", | ||
| pw = "", | ||
| mbti = "", | ||
| ) | ||
|
|
||
| fun toUser(inId: String, inPw: String) { | ||
| userInfoList.id = inId | ||
| userInfoList.pw = inPw | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,10 @@ | ||
| package org.sopt.dosopttemplate.presentation.login | ||
|
|
||
| import org.sopt.dosopttemplate.data.dto.response.ResponseLoginDto | ||
|
|
||
| sealed class LoginState { | ||
| data class Success(val userId: ResponseLoginDto) : LoginState() | ||
| object Loading : LoginState() | ||
| object Error : LoginState() | ||
| object Unstarted : LoginState() | ||
| } |
This file contains hidden or 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,75 @@ | ||
| package org.sopt.dosopttemplate.presentation.login | ||
|
|
||
| import androidx.lifecycle.LiveData | ||
| import androidx.lifecycle.MutableLiveData | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.flow.asStateFlow | ||
| import kotlinx.coroutines.launch | ||
| import org.sopt.dosopttemplate.data.dataclass.UserInfo | ||
| import org.sopt.dosopttemplate.data.dto.request.RequestLoginDto | ||
| import org.sopt.dosopttemplate.module.ApiFactory | ||
| import org.sopt.dosopttemplate.module.AuthService | ||
|
|
||
| class LoginViewModel() : ViewModel() { | ||
| private val _loginSuccess: MutableLiveData<Boolean> = MutableLiveData() | ||
| var loginSuccess: LiveData<Boolean> = _loginSuccess | ||
|
|
||
| private val _loginState = MutableStateFlow<LoginState>(LoginState.Unstarted) | ||
| val loginState: StateFlow<LoginState> = _loginState.asStateFlow() | ||
|
|
||
|
|
||
| fun checkLoginFromServer(id: String, password: String) { | ||
| viewModelScope.launch { | ||
| val loginService = ApiFactory.create<AuthService>() | ||
| _loginState.value = LoginState.Loading | ||
| kotlin.runCatching { | ||
| loginService.postLogin(RequestLoginDto(id, password)) | ||
| }.onSuccess { | ||
| val body = it.body() | ||
| if (it.body() != null) { | ||
| _loginState.value = LoginState.Success(requireNotNull(body)) | ||
| UserInfo.toUser(id, password) | ||
|
|
||
| } else { | ||
| _loginState.value = LoginState.Error | ||
| } | ||
| }.onFailure { | ||
| _loginState.value = LoginState.Error | ||
| } | ||
|
|
||
| ///* | ||
| // ServicePool.authService.postLogin(RequestLoginDto(id, password)) | ||
| // .enqueue(object : Callback<ResponseLoginDto> { | ||
| // override fun onResponse( | ||
| // call: Call<ResponseLoginDto>, | ||
| // response: Response<ResponseLoginDto>, | ||
| // ) { | ||
| // if (response.isSuccessful) { | ||
| // val data: ResponseLoginDto = requireNotNull(response.body()!!) | ||
| // | ||
| // | ||
| // val userId: Int = data.id | ||
| // loginSuccess.value = true | ||
| // toast("λ‘κ·ΈμΈ μ±κ³΅") | ||
| // val intent = Intent(context, MainHomeActivity::class.java) | ||
| // intent.putExtra("id", userId) | ||
| // | ||
| // | ||
| // startActivity(intent) | ||
| // } else { | ||
|
Comment on lines
+43
to
+62
Member
There was a problem hiding this comment. μ¬νκ³Όμ νκ³ μΆνμ μ£Όμμ μ§μμ£ΌμΈμ! |
||
| // toast("μμ΄λμ ν¨μ€μλκ° μΌμΉ νμ§ μμ΅λλ€.") | ||
| // } | ||
| // } | ||
| // | ||
| // override fun onFailure(call: Call<ResponseLoginDto>, t: Throwable) { | ||
| // toast("μλ² μλ¬ λ°μ") | ||
| // } | ||
| // }) | ||
| //*/ | ||
|
|
||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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
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.
λν΄λ κ°μ μ£ΌκΈ΄μ€μΌλλλ° λν΄νΈκ°μΌλ‘ λ£μλ§ν κ°μ λ±ν λͺ¨λ₯΄κ² μ΄μ ""λ‘ νμΉκ±΄λ° λ³΄ν΅ μΌλ°μ μΌλ‘ μ¬μ©λλ λν΄λκ°μ΄ μμκΉμ??
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.
μ κΌ λν΄νΈ κ°μ μ£Όμ΄μΌ ν μ§ nonNullμ μ£Όλ©΄ μλλμ§ μκ°ν΄λ³΄λ©΄ μ’μ κ² κ°μμμ λ΅μ νλ‘μ νΈμ μ±κ²©μ λ°λΌ λ€λ¦ λλ€ stringμ κΈ°λ³Έκ°μ ""μ λλΆλΆ μ¬μ©ν΄μ