[FEAT/#19] Week6 / 심화 과제 #22
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
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,16 +1,15 @@ | ||
| package org.sopt.dosopttemplate.data.service | ||
|
|
||
| import org.sopt.dosopttemplate.data.remote.response.ResponsePeopleListDto | ||
| import retrofit2.http.GET | ||
| import retrofit2.http.Query | ||
|
|
||
| interface PeopleService { | ||
|
|
||
| // 사람들 리스트 받아오기 | ||
| @GET("users") | ||
| suspend fun PeopleListGet( | ||
| @Query("page") page: Int, | ||
| @Query("per_page") perPage: Int, | ||
| ): ResponsePeopleListDto | ||
| } |
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 |
|---|---|---|
|
|
@@ -8,12 +8,16 @@ import android.view.MotionEvent | |
| import android.view.View | ||
| import androidx.activity.viewModels | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import org.sopt.dosopttemplate.R | ||
| import org.sopt.dosopttemplate.data.User | ||
| import org.sopt.dosopttemplate.databinding.ActivityLoginBinding | ||
| import org.sopt.dosopttemplate.di.UserSharedPreferences | ||
| import org.sopt.dosopttemplate.presentation.main.BnvActivity | ||
| import org.sopt.dosopttemplate.util.BackPressedUtil | ||
| import org.sopt.dosopttemplate.util.UiState | ||
| import org.sopt.dosopttemplate.util.hideKeyboard | ||
| import org.sopt.dosopttemplate.util.showShortSnackBar | ||
| import org.sopt.dosopttemplate.util.showShortToast | ||
|
|
||
| class LoginActivity : AppCompatActivity() { | ||
| private lateinit var binding: ActivityLoginBinding | ||
|
|
@@ -23,6 +27,13 @@ class LoginActivity : AppCompatActivity() { | |
| super.onCreate(savedInstanceState) | ||
| setContentView(binding.root) | ||
|
|
||
| autoLogin() | ||
| userClickSignUpBtn() | ||
| userCickLoginBtn() | ||
| backPressed() | ||
| } | ||
|
|
||
| private fun autoLogin() { | ||
| // 자동 로그인으로 저장된 유저 정보 | ||
| val spUser = UserSharedPreferences.getUser(this) | ||
|
|
||
|
|
@@ -33,45 +44,60 @@ class LoginActivity : AppCompatActivity() { | |
| // 새로운 Activity를 수행하고 현재 Activity를 스텍에서 제거 | ||
| startActivity(intent) | ||
| } | ||
| } | ||
|
|
||
| // 회원가입 하러 가기 | ||
| private fun userClickSignUpBtn() { | ||
| binding.btnSignupSignup.setOnClickListener { | ||
| val intent = Intent(this, SignUpActivity::class.java) | ||
| startActivity(intent) | ||
| } | ||
| } | ||
|
|
||
| // 로그인 하기 | ||
| private fun userCickLoginBtn() { | ||
| binding.btnLoginLogin.setOnClickListener { | ||
| // 자동 로그인이 적용되지 않고, 회원가입에서 넘어온 경우 | ||
| val signUpUser = intent.getParcelableExtra<User>("signUpUser") | ||
|
|
||
| val inputId = binding.etSignupId.text.toString() | ||
| val inputPw = binding.etSignupPw.text.toString() | ||
|
|
||
| loginViewModel.loginUser(inputId, inputPw) | ||
|
|
||
| loginViewModel.getLoginInfo.observe( | ||
|
There was a problem hiding this comment. 옵저버는 onClickListener보다는 바깥쪽에 위치하는 게 더 좋을 것 같아요~! There was a problem hiding this comment. 오 생각해보니 그렇네염.,,,,,맞슴니다 |
||
| this, | ||
| ) { uiState -> | ||
| when (uiState) { | ||
| is UiState.Success -> { | ||
| if (binding.cbLoginAutologin.isChecked) { | ||
| signUpUser?.let { | ||
| loginViewModel.saveUserForAutoLogin(this, it) | ||
|
Comment on lines
+70
to
+75
There was a problem hiding this comment. 저도 UiSate 써보고 싶었는데,, 다음에 할 때 참고해야게써요 최곱니다,,, |
||
| } | ||
| } | ||
|
|
||
| val userId = uiState.data?.userId | ||
| showShortToast("로그인 성공, 유저 아이디 : $userId") | ||
|
There was a problem hiding this comment. 그냥 슥 봐서는 저는 두번 토스트 뜨는 이유가 안보이네욥... 로그 찍어봐야할듯 ! There was a problem hiding this comment. ㅋㅋㅋㅋㅋ 제가 버튼을 두번 누르는 이슈였습니다 ..ㅎㅎ^^ There was a problem hiding this comment. @kangyuri1114 제 코드 중에 util에 setOnSingleClickListener 라구 있거덩요? 그거 가져와서 대신 쓰면 더블 클릭에 대응하지 않게 된답니다~~! |
||
|
|
||
| val intent = Intent(this, BnvActivity::class.java) | ||
| intent.putExtra("signUpUser", signUpUser) | ||
| startActivity(intent) | ||
| finish() | ||
| } | ||
|
|
||
| is UiState.Failure -> { | ||
| showShortSnackBar(binding.root, "로그인 실패 : ${uiState.errorMessage}") | ||
| } | ||
|
|
||
| is UiState.Loading -> { | ||
| showShortSnackBar(binding.root, getString(R.string.uistate_loading)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun backPressed() { | ||
| val backPressedUtil = BackPressedUtil<ActivityLoginBinding>(this) | ||
| backPressedUtil.BackButton() | ||
| } | ||
|
|
||
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
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.
요 부분의 Call<>도 빼주셔도 될듯함다! 그 전에 Call이 여기서 어떤 역할을 했었고, 왜 이제 안 감싸주어도 작동이 되는지 공부해보면 더 좋을 듯 합니다 ~~