Skip to content

Commit

Permalink
fix : user data class 변경 #2
Browse files Browse the repository at this point in the history
  • Loading branch information
@SeonHwan-Kim
SeonHwan-Kim committed Apr 13, 2023
1 parent cb037d2 commit 91e724a
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 85 deletions.
4 changes: 2 additions & 2 deletions app/src/main/java/org/android/go/sopt/data/User.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import kotlinx.parcelize.Parcelize

@Parcelize
data class User(
val id: String = "",
val password: String = "",
val id: String? = "",
val password: String? = "",
val name: String? = "",
val specialty: String? = "",
): Parcelable
27 changes: 0 additions & 27 deletions app/src/main/java/org/android/go/sopt/main/MainActivity.kt
View file

This file was deleted.

54 changes: 22 additions & 32 deletions app/src/main/java/org/android/go/sopt/presentation/login/LoginActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import android.os.Bundle
import android.util.Log
import androidx.activity.result.ActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.RequiresApi
import androidx.appcompat.app.AppCompatActivity
import org.android.go.sopt.R
import org.android.go.sopt.data.User
Expand All @@ -21,13 +20,8 @@ import org.android.go.sopt.util.showShortToast
class LoginActivity : AppCompatActivity() {

private lateinit var binding: ActivityLoginBinding
// private lateinit var id: String
// private lateinit var password: String
// private lateinit var name: String
// private lateinit var specialty: String
private var user: User? = null

@RequiresApi(Build.VERSION_CODES.TIRAMISU)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityLoginBinding.inflate(layoutInflater)
Expand All @@ -37,45 +31,41 @@ class LoginActivity : AppCompatActivity() {
hideKeyboard(binding.root)
}

// this.onClickLogin()
this.onClickLogin()
this.onCLickSignUp()
}

// private fun onClickLogin() {
// with(binding){
// btMainLogin.setOnClickListener {
// if (id == etMainId.text.toString() && password == etMainPassword.text.toString()) {
// val intent = Intent(this@LoginActivity, MainActivity::class.java)
// intent.putExtra("name", name)
// intent.putExtra("specialty", specialty)
// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
// startActivity(intent)
// showShortToast(getString(R.string.login_success_login_msg))
// if(!isFinishing) finish()
// } else {
// showShortToast(getString(R.string.login_fail_login_msg))
// }
// }
// }
// }
private fun onClickLogin() {
with(binding){
btMainLogin.setOnClickListener {
if (user?.id == etMainId.text.toString() && user?.password == etMainPassword.text.toString()) {
val intent = Intent(this@LoginActivity, MainActivity::class.java)
intent.putExtra("user", user)
startActivity(intent)
showShortToast(getString(R.string.login_success_login_msg))
if(!isFinishing) finish()
} else {
showShortToast(getString(R.string.login_fail_login_msg))
}
}
}
}


@RequiresApi(Build.VERSION_CODES.TIRAMISU)
private val getResultSignUp = registerForActivityResult(
ActivityResultContracts.StartActivityForResult()
) { result: ActivityResult ->
if (result.resultCode == RESULT_OK) {
user = result.data?.getParcelableExtra("user", User::class.java)
user = if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU){
result.data?.getParcelableExtra("user", User::class.java)
} else{
result.data?.getParcelableExtra("user")
}
Log.d("user", "---------\n$user")
// id = result.data?.getStringExtra("id") ?: ""
// password = result.data?.getStringExtra("password") ?: ""
// name = result.data?.getStringExtra("name") ?: ""
// specialty = result.data?.getStringExtra("specialty") ?: ""
showShortSnackbar(binding.root, getString(R.string.login_success_sign_up_msg))
}
}

@RequiresApi(Build.VERSION_CODES.TIRAMISU)
private fun onCLickSignUp() {
binding.btMainSignUp.setOnClickListener {
val intent = Intent(this, SignUpActivity::class.java)
Expand Down
53 changes: 29 additions & 24 deletions app/src/main/java/org/android/go/sopt/presentation/signup/SignUpActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package org.android.go.sopt.presentation.signup
import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.widget.Toast
import org.android.go.sopt.R
import org.android.go.sopt.data.User
import org.android.go.sopt.databinding.ActivitySignUpBinding
import org.android.go.sopt.presentation.login.LoginActivity
import org.android.go.sopt.util.hideKeyboard
Expand All @@ -26,29 +26,34 @@ class SignUpActivity : AppCompatActivity() {
this.onClickComplete()
}

private fun onClickComplete(){
binding.btSignupComplete.setOnClickListener{
val id = binding.etSignupId.text
val password = binding.etSignupPassword.text
val name = binding.etSignupName.text
val specialty = binding.etSignupSpecialty.text

if(id.length !in 6..10){
showShortToast(getString(R.string.sign_up_id_err_msg))
} else if(password.length !in 8..12){
showShortToast(getString(R.string.sign_up_password_err_msg))
} else if(name.isEmpty()){
showShortToast(getString(R.string.sign_up_name_err_msg))
} else if(specialty.isEmpty()){
showShortToast(getString(R.string.sign_up_specialty_err_msg))
} else{
val intent = Intent(this, LoginActivity::class.java)
intent.putExtra("id", id.toString())
intent.putExtra("password", password.toString())
intent.putExtra("name", name.toString())
intent.putExtra("specialty", specialty.toString())
setResult(RESULT_OK, intent)
finish()
private fun onClickComplete() {
with(binding) {
btSignupComplete.setOnClickListener {
val id = etSignupId.text
val password = etSignupPassword.text
val name = etSignupName.text
val specialty = etSignupSpecialty.text

if (id.length !in 6..10) {
showShortToast(getString(R.string.sign_up_id_err_msg))
} else if (password.length !in 8..12) {
showShortToast(getString(R.string.sign_up_password_err_msg))
} else if (name.isEmpty()) {
showShortToast(getString(R.string.sign_up_name_err_msg))
} else if (specialty.isEmpty()) {
showShortToast(getString(R.string.sign_up_specialty_err_msg))
} else {
val intent = Intent(this@SignUpActivity, LoginActivity::class.java)
intent.putExtra("user",User(
id.toString(),
password.toString(),
name.toString(),
specialty.toString()
))
setResult(RESULT_OK, intent)
// 만약 종료가 되지 않았다면 종료시키기
if(!isFinishing) finish()
}
}
}
}
Expand Down

0 comments on commit 91e724a

Please sign in to comment.