Skip to content

feat: 로그인 완료 화면 구현 #5

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

Merged
Dyaoss merged 1 commit into from
Nov 10, 2024
Merged

feat: 로그인 완료 화면 구현 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions app/src/main/java/com/dhproject/registerproject/data/AppDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import android.content.Context
import androidx.room.Database
import androidx.room.Room
import androidx.room.RoomDatabase
import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase

@Database(entities = [User::class], version = 1)
@Database(entities = [User::class], version = 2, exportSchema = false)
abstract class AppDatabase : RoomDatabase() {
abstract fun userDao(): UserDao

Expand All @@ -19,7 +21,8 @@ abstract class AppDatabase : RoomDatabase() {
context.applicationContext,
AppDatabase::class.java,
"user_database"
).build()
).fallbackToDestructiveMigration()
.build()
INSTANCE = instance
instance
}
Expand Down
25 changes: 20 additions & 5 deletions app/src/main/java/com/dhproject/registerproject/data/RegisterViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,38 @@ class RegisterViewModel(private val userRepository: UserRepository) : ViewModel(

fun registerUser(
userId: String,
nickName: String,
password: String,
nickname: String,
email: String,
passwordCheck: String,
onResult: (Boolean) -> Unit
) {
viewModelScope.launch {
val user =
User(userId = userId, password = password, nickname = nickname, email = email)
User(
userId = userId,
nickName = nickName,
password = password,
passwordCheck = password
)
val userId = userRepository.registerUser(user)
onResult(userId > 0)
}
}

fun loginUser(userId: String, password: String, onResult: (Boolean, User?) -> Unit) {
fun loginUser(userId: String, password: String, callback: (Boolean, User?) -> Unit) {
viewModelScope.launch {
val user = userRepository.loginUser(userId, password)
onResult(user != null, user)
if (user != null) {
callback(true, user)
} else {
callback(false, null)
}
}
}
fun checkUserIdExists(userId: String, callback: (Boolean) -> Unit) {
viewModelScope.launch {
val isExist = userRepository.isUserIdExist(userId)
callback(isExist)
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/dhproject/registerproject/data/User.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import androidx.room.PrimaryKey
@Entity(tableName = "users")
data class User(
@PrimaryKey val userId: String,
val nickName: String,
val password: String,
val nickname: String,
val email: String
)
val passwordCheck: String

)
3 changes: 3 additions & 0 deletions app/src/main/java/com/dhproject/registerproject/data/UserDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ interface UserDao {
@Query("SELECT * FROM users WHERE userId = :userId")
suspend fun getUserById(userId: String): User?

@Query("SELECT COUNT(*) FROM users WHERE userId = :userId")
suspend fun isUserIdExist(userId: String): Int

}
3 changes: 3 additions & 0 deletions app/src/main/java/com/dhproject/registerproject/data/UserRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ class UserRepository(private val userDao: UserDao) {

suspend fun getUserById(userId: String): User? {
return userDao.getUserById(userId)
}

suspend fun isUserIdExist(userId: String): Boolean {
return userDao.isUserIdExist(userId) > 0
}

}
20 changes: 19 additions & 1 deletion app/src/main/java/com/dhproject/registerproject/presentation/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
package com.dhproject.registerproject.presentation

import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.dhproject.registerproject.R
import com.dhproject.registerproject.databinding.ActivityMainBinding
import com.dhproject.registerproject.databinding.ActivityRegisterBinding
import com.dhproject.registerproject.presentation.register.RegisterActivity

class MainActivity : AppCompatActivity() {

private val binding by lazy { ActivityMainBinding.inflate(layoutInflater) }

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
setContentView(binding.root)

val userId = intent.getStringExtra("user")
binding.tvUserid.text = "$userId 님 환영합니다!"

binding.btnBack.setOnClickListener {
val intent = Intent(this, RegisterActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
}
startActivity(intent)
finish()
}

}
}
12 changes: 7 additions & 5 deletions ...rc/main/java/com/dhproject/registerproject/presentation/register/signin/SigninFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.dhproject.registerproject.presentation.register.signin

import android.content.Intent
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
Expand All @@ -11,6 +12,7 @@ import com.dhproject.registerproject.R
import com.dhproject.registerproject.data.RegisterViewModel
import com.dhproject.registerproject.data.RegisterViewModelFactory
import com.dhproject.registerproject.databinding.FragmentSigninBinding
import com.dhproject.registerproject.presentation.MainActivity
import com.dhproject.registerproject.presentation.register.signup.SignupFragment
import io.github.muddz.styleabletoast.StyleableToast

Expand All @@ -34,11 +36,11 @@ class SigninFragment : Fragment() {
viewModel.loginUser(userId, password) { isSuccess, user ->
requireActivity().runOnUiThread {
if (isSuccess && user != null) {
StyleableToast.makeText(
requireActivity(),
"로그인 성공",
R.style.toast_warning
).show()
val intent = Intent(requireActivity(), MainActivity::class.java).apply {
putExtra("user",userId)
}
startActivity(intent)
requireActivity().finish()
} else {
StyleableToast.makeText(
requireActivity(),
Expand Down
63 changes: 50 additions & 13 deletions ...rc/main/java/com/dhproject/registerproject/presentation/register/signup/SignupFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,38 @@ class SignupFragment : Fragment() {
//유효성 검사
if (validateInput(userId, userNickname, userPassword, userPasswordCheck)) {

viewModel.registerUser(
userId,
userNickname,
userPassword,
userPasswordCheck
) { success ->
if (success) {
StyleableToast.makeText(requireContext(), "회원가입 성공", R.style.toast_warning)
viewModel.checkUserIdExists(userId) { isExist ->
if (isExist) {
StyleableToast.makeText(
requireContext(),
"이미 존재하는 아이디입니다.",
R.style.toast_warning
)
.show()
goToSigninFragment()
} else {
StyleableToast.makeText(requireContext(), "회원가입 실패", R.style.toast_warning)
.show()
viewModel.registerUser(
userId,
userNickname,
userPassword,
userPasswordCheck
) { success ->
if (success) {
StyleableToast.makeText(
requireContext(),
"회원가입 성공",
R.style.toast_warning
)
.show()
goToSigninFragment()
} else {
StyleableToast.makeText(
requireContext(),
"회원가입 실패",
R.style.toast_warning
)
.show()
}
}
}
}
}
Expand All @@ -74,12 +93,30 @@ class SignupFragment : Fragment() {
false
}

userId.length > 12 || !userId.matches("^[a-zA-Z0-9]*$".toRegex()) -> {
StyleableToast.makeText(
requireContext(),
"아이디는 영문 또는 숫자로 12자 이하로 입력하세요.",
R.style.toast_warning
).show()
false
}

userNickname.isEmpty() -> {
StyleableToast.makeText(requireContext(), "닉네임을 입력하세요.", R.style.toast_warning)
.show()
false
}

userNickname.length > 6 -> {
StyleableToast.makeText(
requireContext(),
"닉네임은 6자 이하로 입력하세요.",
R.style.toast_warning
).show()
false
}

userPassword.isEmpty() -> {
StyleableToast.makeText(requireContext(), "비밀번호를 입력하세요.", R.style.toast_warning)
.show()
Expand All @@ -92,10 +129,10 @@ class SignupFragment : Fragment() {
false
}

userPassword.length < 6 -> {
userPassword.length < 8 -> {
StyleableToast.makeText(
requireContext(),
"비밀번호는 최소 6자리 이상이어야 합니다.",
"비밀번호는 최소 8자리 이상이어야 합니다.",
R.style.toast_warning
).show()
false
Expand Down
27 changes: 25 additions & 2 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,36 @@
android:layout_height="match_parent"
tools:context=".presentation.MainActivity">


<TextView
android:id="@+id/tv_result"
style="@style/common_text_32_bold_dark_gray"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
android:text="로그인 성공!"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_userid"
style="@style/common_text_16_bold_gray"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="아이디"
app:layout_constraintEnd_toEndOf="@id/tv_result"
app:layout_constraintStart_toStartOf="@id/tv_result"
app:layout_constraintTop_toBottomOf="@id/tv_result" />


<Button
android:id="@+id/btn_back"
android:layout_width="120dp"
android:layout_height="50dp"
android:layout_marginTop="200dp"
android:text="뒤로가기"
app:layout_constraintEnd_toEndOf="@id/tv_result"
app:layout_constraintStart_toStartOf="@id/tv_result"
app:layout_constraintTop_toBottomOf="@id/tv_result" />

</androidx.constraintlayout.widget.ConstraintLayout>
50 changes: 0 additions & 50 deletions app/src/main/res/layout/fragment_signin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,56 +111,6 @@
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/signin_search_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<CheckBox
android:id="@+id/cb_auto_signin"
style="@style/common_text_14_gray"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="자동 로그인"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/btn_id_search"
style="@style/common_text_14_gray"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="아이디 찾기"
app:layout_constraintBottom_toBottomOf="@id/cb_auto_signin"
app:layout_constraintEnd_toStartOf="@+id/divider1"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintTop_toTopOf="@id/cb_auto_signin" />

<View
android:id="@+id/divider1"
android:layout_width="1dp"
android:layout_height="20dp"
android:layout_marginEnd="16dp"
android:background="@color/light_gray"
app:layout_constraintBottom_toBottomOf="@+id/btn_id_search"
app:layout_constraintEnd_toStartOf="@+id/btn_password_search"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintTop_toTopOf="@id/btn_id_search" />

<TextView
android:id="@+id/btn_password_search"
style="@style/common_text_14_gray"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="비밀번호 찾기"
app:layout_constraintBottom_toBottomOf="@id/cb_auto_signin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintTop_toTopOf="@id/cb_auto_signin" />

</androidx.constraintlayout.widget.ConstraintLayout>

<com.skydoves.elasticviews.ElasticButton
android:id="@+id/btn_signin"
style="@style/common_text_16_bold_white"
Expand Down
Loading