Skip to content

signup activityのリファクタをする #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

signup activityのリファクタをする #39

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ffc844a
refactor : passwordのバリデーションを書き換え
cacaoMath Jul 30, 2023
bf8270b
fix : emailもバリデーションするように修正
cacaoMath Jul 30, 2023
1516184
fix : アカウントかぶっているときなどのエラーを処理し、ユーザにわかりやすくする (#31)
cacaoMath Jul 30, 2023
21bee61
fix : エラー処理中でユーザに表示するので同じ動作部分は削除 (#31)
cacaoMath Jul 30, 2023
6b8eaa5
chore : コード自動整形
cacaoMath Jul 30, 2023
00dea80
refactor : １メソッドが長いので切り出す
cacaoMath Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 125 additions & 75 deletions app/src/main/java/com/example/place/activity/SignupActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,26 @@ import android.widget.ProgressBar
import android.widget.Spinner
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import com.example.place.EmailValidateStatus
import com.example.place.PasswordValidateStatus
import com.example.place.databinding.ActivitySignupBinding
import com.example.place.validateEmail
import com.example.place.validatePassword
import com.google.android.gms.tasks.Task
import com.google.android.material.snackbar.Snackbar
import com.google.firebase.auth.FirebaseAuth
import com.google.firebase.auth.FirebaseUser
import com.google.firebase.auth.*
import com.google.firebase.auth.ktx.auth
import com.google.firebase.firestore.FirebaseFirestore
import com.google.firebase.ktx.Firebase

class SignupActivity : AppCompatActivity() {
// Initialize Firebase Auth
private var auth : FirebaseAuth = Firebase.auth
private var auth: FirebaseAuth = Firebase.auth
private lateinit var binding: ActivitySignupBinding
private lateinit var envSpn : Spinner
private lateinit var mlSpn : Spinner
private lateinit var createAccountBtn : Button
private lateinit var loadingBar : ProgressBar
private lateinit var envSpn: Spinner
private lateinit var mlSpn: Spinner
private lateinit var createAccountBtn: Button
private lateinit var loadingBar: ProgressBar


override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -39,96 +43,142 @@ class SignupActivity : AppCompatActivity() {
loadingBar.visibility = ProgressBar.INVISIBLE

createAccountBtn.setOnClickListener {
if(binding.etSignupPass.text.toString().length > 6){
loadingBar.visibility = ProgressBar.VISIBLE
signUp(binding.etSignupEmail.text.toString(), binding.etSignupPass.text.toString())
createAccountBtn.isEnabled = false
}else{
// Toast.makeText(baseContext, "パスワードは7文字以上にしてください",
// Toast.LENGTH_SHORT).show()
Snackbar.make(binding.root,"パスワードは7文字以上にしてください", Snackbar.LENGTH_SHORT).show()
}
val signupPassword = binding.etSignupPass.text.toString()
val signupEmail = binding.etSignupEmail.text.toString()

val validatePasswordResult = validatePassword(signupPassword)
val validateEmailResult = validateEmail(signupEmail)

when {
validateEmailResult == EmailValidateStatus.EMPTY || validatePasswordResult == PasswordValidateStatus.EMPTY -> {
Toast.makeText(
baseContext, "入力されていない項目があります", Toast.LENGTH_SHORT
).show()
}
validateEmailResult == EmailValidateStatus.BAD_ADDRESS -> {
Toast.makeText(
baseContext, "有効なメールアドレスではありません", Toast.LENGTH_SHORT
).show()
}
validatePasswordResult == PasswordValidateStatus.TOO_SHORT -> {
Toast.makeText(
baseContext, "パスワードは7文字以上にしてください", Toast.LENGTH_SHORT
).show()
}
else -> {
loadingBar.visibility = ProgressBar.VISIBLE
signUp(signupEmail, signupPassword)
createAccountBtn.isEnabled = false
}
}
}
}


private fun signUpMsg(user : FirebaseUser?){
if(user != null){
Log.d(TAG,"sign up : this user is exist")
Toast.makeText(baseContext, "サインアップ完了しました",
Toast.LENGTH_SHORT).show()
}else{
Log.d(TAG,"sign up : Error")

private fun signUpMsg(user: FirebaseUser?) {
user?.let {
Log.d(TAG, "sign up : this user is exist")
Toast.makeText(
baseContext, "${user}でサインアップ完了しました",
Toast.LENGTH_SHORT
).show()
}

}


private fun signUp(email :String, password : String){
private fun signUp(email: String, password: String) {
auth.createUserWithEmailAndPassword(email, password)
.addOnCompleteListener(this) { task ->
if (task.isSuccessful) {
// Sign up success, update UI with the signed-in user's information
Log.d(TAG, "createUserWithEmail:success")
val db = FirebaseFirestore.getInstance()
val user = auth.currentUser

user?.uid?.let {
db.collection("users").document(it).collection("data")
.add(
hashMapOf(
"mLearningExp" to mlSpn.selectedItem,
"mLearningEnvironment" to envSpn.selectedItem,
"e-mail" to user.email
)
.addOnCompleteListener(this) { task ->
Log.i(TAG, task.toString())
if (task.isSuccessful) {
// Sign up success, update UI with the signed-in user's information
Log.d(TAG, "createUserWithEmail:success")
val db = FirebaseFirestore.getInstance()
val user = auth.currentUser

user?.uid?.let {
db.collection("users").document(it).collection("data")
.add(
hashMapOf(
"mLearningExp" to mlSpn.selectedItem,
"mLearningEnvironment" to envSpn.selectedItem,
"e-mail" to user.email
)
.addOnSuccessListener {
Log.d(TAG, "DocumentSnapshot added with ID: ")
signUpMsg(user)

//サインアップ完了でメール送信
user.sendEmailVerification()
.addOnCompleteListener { task ->
if (task.isSuccessful) {
Log.d(TAG, "Email sent.")
}
)
.addOnSuccessListener {
Log.d(TAG, "DocumentSnapshot added with ID: ")
signUpMsg(user)

//サインアップ完了でメール送信
user.sendEmailVerification()
.addOnCompleteListener { task ->
if (task.isSuccessful) {
Log.d(TAG, "Email sent.")
}
// 登録後ホームへ移行
gotoMain()
}
.addOnFailureListener { e ->
Log.w(TAG, "Error adding document", e)
}
}


} else {
// If sign up fails, display a message to the user.
Log.w(TAG, "createUserWithEmail:failure", task.exception)
// Toast.makeText(baseContext, "Authentication failed.",
// Toast.LENGTH_SHORT).show()
Snackbar.make(binding.root,"Authentication failed.", Snackbar.LENGTH_SHORT).show()

loadingBar.visibility = ProgressBar.INVISIBLE
signUpMsg(null)
createAccountBtn.isEnabled = true

}
// 登録後ホームへ移行
gotoMain()
}
.addOnFailureListener { e ->
Log.w(TAG, "Error adding document", e)
}
}

// ...

} else {
// If sign up fails, display a message to the user.
Log.w(TAG, "createUserWithEmail:failure", task.exception)
checkFirebaseAuthException(task)
loadingBar.visibility = ProgressBar.INVISIBLE
createAccountBtn.isEnabled = true

}

// ...
}
}

private fun gotoMain(){
private fun checkFirebaseAuthException(task: Task<AuthResult>){
when (task.exception) {
is FirebaseAuthWeakPasswordException -> {
Log.i(TAG, "the password is not strong enough")
Snackbar.make(binding.root, "脆弱なパスワードです", Snackbar.LENGTH_SHORT).show()
}

is FirebaseAuthInvalidCredentialsException -> {
Log.i(TAG, " if the email address is malformed")
Snackbar.make(
binding.root,
"有効なメールアドレスを入力してください",
Snackbar.LENGTH_SHORT
).show()
}

is FirebaseAuthUserCollisionException -> {
Log.i(
TAG,
"there already exists an account with the given email address"
)
Snackbar.make(
binding.root,
"すでに登録されているメールアドレスです",
Snackbar.LENGTH_SHORT
).show()
}

else -> {
Log.e(TAG, "謎のエラー")
}
}
}
private fun gotoMain() {
//ホーム画面へ遷移
val mainIntent = Intent(applicationContext, MainActivity::class.java)
startActivity(mainIntent)
finish()
}

companion object{
private const val TAG ="SignupActivity"
companion object {
private const val TAG = "SignupActivity"
}
}