[feat] : 서버통신 ui state 관찰, ViewModelFactory를 사용하여 viewmodel 초기화

DO-SOPT-ANDROID · Jan 2, 2024 · 4f792d5 · 4f792d5
1 parent ddef6cb
commit 4f792d5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/app/src/main/java/org/sopt/dosopttemplate/ui/login/LoginActivity.kt b/app/src/main/java/org/sopt/dosopttemplate/ui/login/LoginActivity.kt
@@ -8,12 +8,15 @@ import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 import org.sopt.dosopttemplate.databinding.ActivityLoginBinding
 import org.sopt.dosopttemplate.ui.HomeActivity
+import org.sopt.dosopttemplate.utils.ViewModelFactory
 import org.sopt.dosopttemplate.utils.toast
 
 class LoginActivity : AppCompatActivity() {
 
  private lateinit var binding: ActivityLoginBinding
- private val authViewModel by viewModels<AuthViewModel>()
+ private val authViewModel by viewModels<AuthViewModel>() {
+ ViewModelFactory()
+ }
 
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)

diff --git a/app/src/main/java/org/sopt/dosopttemplate/ui/login/SignUpActivity.kt b/app/src/main/java/org/sopt/dosopttemplate/ui/login/SignUpActivity.kt
@@ -11,12 +11,16 @@ import kotlinx.coroutines.launch
 import org.sopt.dosopttemplate.R
 import org.sopt.dosopttemplate.databinding.ActivitySignUpBinding
 import org.sopt.dosopttemplate.ui.model.User
+import org.sopt.dosopttemplate.utils.UiState
+import org.sopt.dosopttemplate.utils.ViewModelFactory
 import org.sopt.dosopttemplate.utils.toast
 
 class SignUpActivity : AppCompatActivity() {
 
  private lateinit var binding: ActivitySignUpBinding
- private val viewModel by viewModels<SignUpViewModel>()
+ private val viewModel by viewModels<SignUpViewModel>() {
+ ViewModelFactory()
+ }
 
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
@@ -41,7 +45,7 @@ class SignUpActivity : AppCompatActivity() {
  nickName = binding.editNickname.text.toString(),
  mbti = binding.editMbti.text.toString(),
  )
- viewModel.signUpServer(userEntity)
+ viewModel.postSignUp(userEntity)
  observeSignUpState(userEntity)
  }
  }
@@ -50,13 +54,13 @@ class SignUpActivity : AppCompatActivity() {
  lifecycleScope.launch {
  viewModel.signUpState.collect {
  when (it) {
- is SignUpState.Success -> {
+ is UiState.Success -> {
  sendUserData(userEntity)
  toast(getString(R.string.toast_signUp_compeleted))
  }
 
- is SignUpState.Error -> toast(getString(R.string.toast_signUp_fail))
- is SignUpState.Loading -> toast("회원가입 중")
+ is UiState.Error -> toast(getString(R.string.toast_signUp_fail))
+ is UiState.Loading -> toast("회원가입 중")
  }
  }
  }