[Chore/#5] setObserver 함수 위치 조정

NOW-SOPT-ANDROID · Sep 19, 2024 · ec44355 · ec44355
1 parent 2341e06
commit ec44355
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
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
@@ -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
@@ -9,18 +9,14 @@ class SignInViewModel : ViewModel() {
     private val _user = MutableLiveData<User?>()
     val user: LiveData<User?> = _user
 
-    private val _signInState = MutableLiveData<Boolean>()
+    private val _signInState = MutableLiveData(false)
     val signInState: LiveData<Boolean> = _signInState
 
     fun setUser(user: User?) {
         _user.value = user
     }
 
     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
     }
 }