diff --git a/app/src/main/java/com/sopt/now/presentation/ui/auth/signin/SignInActivity.kt b/app/src/main/java/com/sopt/now/presentation/ui/auth/signin/SignInActivity.kt index 9a361b4..9225d82 100644 --- a/app/src/main/java/com/sopt/now/presentation/ui/auth/signin/SignInActivity.kt +++ b/app/src/main/java/com/sopt/now/presentation/ui/auth/signin/SignInActivity.kt @@ -21,10 +21,9 @@ class SignInActivity : AppCompatActivity() { super.onCreate(savedInstanceState) binding = ActivitySigninBinding.inflate(layoutInflater) setContentView(binding.root) - viewModel = ViewModelProvider(this)[SignInViewModel::class.java] + viewModel = ViewModelProvider(this).get(SignInViewModel::class.java) getUserInfo() - setupObservers() onSignInClicked() onSignUpClicked() } @@ -38,7 +37,7 @@ class SignInActivity : AppCompatActivity() { viewModel.signInState.observe(this) { isSuccess -> if (isSuccess) { showToast(this, getString(R.string.signin_signin_success)) - navigateToMain() + navigateToMain(viewModel.user.value) } else { showToast(this, getString(R.string.signin_signin_failure)) } @@ -52,6 +51,7 @@ class SignInActivity : AppCompatActivity() { val inputPassword = etSignInPw.text.toString() viewModel.validateSignIn(inputId, inputPassword) } + setupObservers() } } @@ -61,9 +61,9 @@ class SignInActivity : AppCompatActivity() { } } - private fun navigateToMain() { + private fun navigateToMain(user: User?) { val intent = Intent(this@SignInActivity, MainActivity::class.java) - intent.putExtra(KeyStorage.USER_INFO, viewModel.user.value) + intent.putExtra(KeyStorage.USER_INFO, user) startActivity(intent) } diff --git a/app/src/main/java/com/sopt/now/presentation/ui/auth/signin/SignInViewModel.kt b/app/src/main/java/com/sopt/now/presentation/ui/auth/signin/SignInViewModel.kt index 60d2754..c0d243c 100644 --- a/app/src/main/java/com/sopt/now/presentation/ui/auth/signin/SignInViewModel.kt +++ b/app/src/main/java/com/sopt/now/presentation/ui/auth/signin/SignInViewModel.kt @@ -9,7 +9,7 @@ class SignInViewModel : ViewModel() { private val _user = MutableLiveData() val user: LiveData = _user - private val _signInState = MutableLiveData() + private val _signInState = MutableLiveData(false) val signInState: LiveData = _signInState fun setUser(user: User?) { @@ -17,10 +17,6 @@ class SignInViewModel : ViewModel() { } fun validateSignIn(inputId: String, inputPassword: String) { - if (inputId == _user.value?.id && inputPassword == _user.value?.password) { - _signInState.value = true - } else { - _signInState.value = false - } + _signInState.value = inputId == _user.value?.id && inputPassword == _user.value?.password } }