[FEAT/#5] 1주차 심화과제 (XML)

app/src/main/AndroidManifest.xml

@@ -14,18 +14,21 @@
         tools:targetApi="31">
         <activity
             android:name=".presentation.ui.auth.signin.SignInActivity"
-            android:exported="true">
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".presentation.ui.auth.signup.SignUpActivity"
+        <activity
+            android:name=".presentation.ui.auth.signup.SignUpActivity"
             android:exported="false">
 
         </activity>
-        <activity android:name=".presentation.ui.MainActivity"
+        <activity
+            android:name=".presentation.ui.MainActivity"
             android:exported="false">
 
         </activity>

app/src/main/java/com/sopt/now/data/User.kt

@@ -5,9 +5,9 @@ import kotlinx.android.parcel.Parcelize
 
 @Parcelize
 data class User(
-    val id: String,
-    val password: String,
-    val nickname: String,
-    val phoneNumber: String
+    val id: String? = "",
+    val password: String? = "",
+    val nickname: String? = "",
+    val phoneNumber: String? = ""
 ) : Parcelable
 

app/src/main/java/com/sopt/now/presentation/ui/MainActivity.kt

@@ -1,23 +1,50 @@
 package com.sopt.now.presentation.ui
 
+import android.content.Intent
 import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import com.sopt.now.R
 import com.sopt.now.data.User
 import com.sopt.now.databinding.ActivityMainBinding
 import com.sopt.now.presentation.utils.KeyStorage
 import com.sopt.now.presentation.utils.getSafeParcelable
+import com.sopt.now.presentation.utils.showToast
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
     private var user: User? = null
+    private var backPressedTime: Long = 0
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         getUserInfo()
         showUserInfo()
+
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (System.currentTimeMillis() - backPressedTime < 2000) {
+                    isEnabled = false
+                    onBackPressedDispatcher.onBackPressed()
+
+                    val intent = Intent(Intent.ACTION_MAIN)
+                    intent.addCategory(Intent.CATEGORY_HOME)
+                    intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+                    startActivity(intent)
+                    finish()
+                } else {
+                    showToast(
+                        context = this@MainActivity,
+                        message = getString(R.string.mypage_back_handler_caution)
+                    )
+                    backPressedTime = System.currentTimeMillis()
+                }
+            }
+        })
+
     }
 
     private fun getUserInfo() {
@@ -37,4 +64,4 @@ class MainActivity : AppCompatActivity() {
             tvMyPagePhoneNumberContent.text = user?.phoneNumber
         }
     }
-}
+}

app/src/main/java/com/sopt/now/presentation/ui/auth/signin/SignInActivity.kt

@@ -3,6 +3,7 @@ package com.sopt.now.presentation.ui.auth.signin
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.ViewModelProvider
 import com.sopt.now.R
 import com.sopt.now.data.User
 import com.sopt.now.databinding.ActivitySigninBinding
@@ -14,34 +15,43 @@ import com.sopt.now.presentation.utils.showToast
 
 class SignInActivity : AppCompatActivity() {
     private lateinit var binding: ActivitySigninBinding
-    private var user: User? = null
+    private lateinit var viewModel: SignInViewModel
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivitySigninBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        viewModel = ViewModelProvider(this).get(SignInViewModel::class.java)
 
         getUserInfo()
         onSignInClicked()
         onSignUpClicked()
     }
 
     private fun getUserInfo() {
-        user = intent.getSafeParcelable(KeyStorage.USER_INFO, User::class.java)
+        val user = intent.getSafeParcelable(KeyStorage.USER_INFO, User::class.java)
+        viewModel.setUser(user)
+    }
+
+    private fun setupObservers() {
+        viewModel.signInState.observe(this) { isSuccess ->
+            if (isSuccess) {
+                showToast(this, getString(R.string.signin_signin_success))
+                navigateToMain(viewModel.user.value)
+            } else {
+                showToast(this, getString(R.string.signin_signin_failure))
+            }
+        }
     }
 
     private fun onSignInClicked() {
         binding.btnSignInSignIn.setOnClickListener {
             with(binding) {
                 val inputId = etSignInId.text.toString()
                 val inputPassword = etSignInPw.text.toString()
-
-                if (inputId == user?.id && inputPassword == user?.password) {
-                    showToast(this@SignInActivity, getString(R.string.signin_signin_success))
-                    navigateToMain()
-                } else {
-                    showToast(this@SignInActivity, getString(R.string.signin_signin_failure))
-                }
+                viewModel.validateSignIn(inputId, inputPassword)
             }
+            setupObservers()
         }
     }
 
@@ -51,7 +61,7 @@ class SignInActivity : AppCompatActivity() {
         }
     }
 
-    private fun navigateToMain() {
+    private fun navigateToMain(user: User?) {
         val intent = Intent(this@SignInActivity, MainActivity::class.java)
         intent.putExtra(KeyStorage.USER_INFO, user)
         startActivity(intent)

app/src/main/java/com/sopt/now/presentation/ui/auth/signin/SignInViewModel.kt

@@ -0,0 +1,22 @@
+package com.sopt.now.presentation.ui.auth.signin
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.sopt.now.data.User
+
+class SignInViewModel : ViewModel() {
+    private val _user = MutableLiveData<User?>()
+    val user: LiveData<User?> = _user
+
+    private val _signInState = MutableLiveData(false)
+    val signInState: LiveData<Boolean> = _signInState
+
+    fun setUser(user: User?) {
+        _user.value = user
+    }
+
+    fun validateSignIn(inputId: String, inputPassword: String) {
+        _signInState.value = inputId == _user.value?.id && inputPassword == _user.value?.password
+    }
+}

app/src/main/java/com/sopt/now/presentation/ui/auth/signup/SignUpActivity.kt

@@ -3,6 +3,7 @@ package com.sopt.now.presentation.ui.auth.signup
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.ViewModelProvider
 import com.sopt.now.R
 import com.sopt.now.data.User
 import com.sopt.now.databinding.ActivitySignupBinding
@@ -12,14 +13,28 @@ import com.sopt.now.presentation.utils.showToast
 
 class SignUpActivity : AppCompatActivity() {
     private lateinit var binding: ActivitySignupBinding
+    private lateinit var viewModel: SignUpViewModel
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivitySignupBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        viewModel = ViewModelProvider(this).get(SignUpViewModel::class.java)
 
         onSignUpClicked()
     }
 
+    private fun setupObservers() {
+        viewModel.signUpState.observe(this) { isSuccess ->
+            if (isSuccess) {
+                showToast(this@SignUpActivity, getString(R.string.signup_signup_success))
+                navigateToSignIn(viewModel.user.value)
+            } else {
+                showToast(this@SignUpActivity, getString(R.string.signup_signup_failure))
+            }
+        }
+    }
+
     private fun onSignUpClicked() {
         binding.btnSignUpSignUp.setOnClickListener {
             with(binding) {
@@ -29,19 +44,14 @@ class SignUpActivity : AppCompatActivity() {
                     etSignUpNickname.text.toString(),
                     etSignUpPhoneNumber.text.toString()
                 )
-
-                if (SignUpValidation.isSignUpValid(user)
-                ) {
-                    showToast(this@SignUpActivity, getString(R.string.signup_signup_success))
-                    navigateToSignIn(user)
-                } else {
-                    showToast(this@SignUpActivity, getString(R.string.signup_signup_failure))
-                }
+                viewModel.setUser(user)
             }
+            viewModel.validateSignUp()
+            setupObservers()
         }
     }
 
-    private fun navigateToSignIn(user: User) {
+    private fun navigateToSignIn(user: User?) {
         val intent = Intent(this@SignUpActivity, SignInActivity::class.java)
         intent.putExtra(KeyStorage.USER_INFO, user)
         startActivity(intent)

app/src/main/java/com/sopt/now/presentation/ui/auth/signup/SignUpViewModel.kt

@@ -0,0 +1,63 @@
+package com.sopt.now.presentation.ui.auth.signup
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.sopt.now.data.User
+import java.util.regex.Pattern
+
+class SignUpViewModel() : ViewModel() {
+    private val _user = MutableLiveData<User?>()
+    val user: LiveData<User?> = _user
+
+    private val _signUpState = MutableLiveData(false)
+    val signUpState: LiveData<Boolean> = _signUpState
+
+    fun setUser(user: User) {
+        _user.value = user
+    }
+
+    private fun isIdValid(): Boolean {
+        return ID_VALIDATION_PATTERN.matcher(_user.value?.id ?: "").matches()
+    }
+
+    private fun isPasswordValid(): Boolean {
+        return PW_VALIDATION_PATTERN.matcher(_user.value?.password ?: "").matches()
+    }
+
+    private fun isNicknameValid(): Boolean {
+        return NICKNAME_VALIDATION_PATTERN.matcher(_user.value?.nickname ?: "").matches()
+    }
+
+    private fun isPhoneNumberValid(): Boolean {
+        return PHONE_NUMBER_VALIDATION_PATTERN.matcher(_user.value?.phoneNumber ?: "").matches()
+    }
+
+    fun validateSignUp() {
+        _signUpState.value = isIdValid() &&
+                isPasswordValid() &&
+                isNicknameValid() &&
+                isPhoneNumberValid()
+    }
+
+    companion object {
+        private const val ID_MIN_LENGTH = 6
+        private const val ID_MAX_LENGTH = 10
+        private const val PW_MIN_LENGTH = 8
+        private const val PW_MAX_LENGTH = 12
+
+        private const val ID_VALIDATION_REGEX = "^[a-zA-Z0-9]{$ID_MIN_LENGTH,$ID_MAX_LENGTH}$"
+        private val ID_VALIDATION_PATTERN: Pattern = Pattern.compile(ID_VALIDATION_REGEX)
+
+        private const val PW_VALIDATION_REGEX = "^[a-zA-Z0-9]{$PW_MIN_LENGTH,$PW_MAX_LENGTH}$"
+        private val PW_VALIDATION_PATTERN: Pattern = Pattern.compile(PW_VALIDATION_REGEX)
+
+        private const val NICKNAME_VALIDATION_REGEX = "^\\S+$"
+        private val NICKNAME_VALIDATION_PATTERN: Pattern =
+            Pattern.compile(NICKNAME_VALIDATION_REGEX)
+
+        private const val PHONE_NUMBER_VALIDATION_REGEX = "^010-\\d{4}-\\d{4}$"
+        private val PHONE_NUMBER_VALIDATION_PATTERN: Pattern =
+            Pattern.compile(PHONE_NUMBER_VALIDATION_REGEX)
+    }
+}