Skip to content

Commit

Permalink
[MERGE] #35 -> main
Browse files Browse the repository at this point in the history 
[FEAT/#35] BottomSheet 구현
  • Loading branch information
@blueme0
blueme0 authored Jan 15, 2024
2 parents 2f0b3c3 + 77102ae commit 61aed84
Show file tree
Hide file tree
Showing 48 changed files with 2,901 additions and 37 deletions.
64 changes: 59 additions & 5 deletions app/src/main/java/com/teumteum/teumteum/presentation/signup/SignUpActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,41 @@
package com.teumteum.teumteum.presentation.signup

import android.os.Bundle
import androidx.activity.viewModels
import androidx.fragment.app.Fragment
import androidx.fragment.app.commit
import androidx.fragment.app.replace
import androidx.lifecycle.lifecycleScope
import com.teumteum.base.BindingActivity
import com.teumteum.base.component.appbar.AppBarLayout
import com.teumteum.base.component.appbar.AppBarMenu
import com.teumteum.base.databinding.LayoutCommonAppbarBinding
import com.teumteum.teumteum.R
import com.teumteum.teumteum.databinding.ActivitySignupBinding
import com.teumteum.teumteum.presentation.home.HomeFragment
import com.teumteum.teumteum.presentation.signup.birthday.BirthdayFragment
import com.teumteum.teumteum.presentation.signup.character.CharacterFragment
import com.teumteum.teumteum.presentation.signup.community.CommunityFragment
import com.teumteum.teumteum.presentation.signup.job.CurrentJobFragment
import com.teumteum.teumteum.presentation.signup.job.ReadyJobFragment
import com.teumteum.teumteum.presentation.signup.name.GetNameFragment
import com.teumteum.teumteum.presentation.signup.school.CurrentSchoolFragment
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch

@AndroidEntryPoint
class SignUpActivity
: BindingActivity<ActivitySignupBinding>(R.layout.activity_signup), AppBarLayout {

private val viewModel by viewModels<SignUpViewModel>()

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

initAppBarLayout()
setProgressBar()
setStartingFragment()
initNextButton()
initPreviousButton()
}

override val appBarBinding: LayoutCommonAppbarBinding
Expand All @@ -45,13 +58,54 @@ class SignUpActivity
}

fun activateNextButton() {
binding.btnNext.isEnabled = true
binding.btnNextSignup.isEnabled = true
}

fun disableNextButton() {
binding.btnNextSignup.isEnabled = false
}

private fun initNextButton() {
binding.btnNextSignup.setOnClickListener {
viewModel.goToNextScreen()
moveToCurrentProgress()

}
}

private fun initPreviousButton() {
getLeftMenuChildAt(0).setOnClickListener {
viewModel.goToPreviousScreen()
moveToCurrentProgress()
}
}

private fun setProgressBar() {
lifecycleScope.launch {
viewModel.currentStep.collect { currentStep ->
binding.seekBar.progress = currentStep * 10
if (currentStep == 0) finish()
}
}
}

private fun moveToCurrentProgress() {
when (viewModel.signUpProgress.value) {
SignUpProgress.Character -> navigateTo<CharacterFragment>()
SignUpProgress.Name -> navigateTo<GetNameFragment>()
SignUpProgress.Birthday -> navigateTo<BirthdayFragment>()
SignUpProgress.Community -> navigateTo<CommunityFragment>()
SignUpProgress.CurrentJob -> navigateTo<CurrentJobFragment>()
SignUpProgress.School -> navigateTo<CurrentSchoolFragment>()
SignUpProgress.ReadyJob -> navigateTo<ReadyJobFragment>()
else -> return
}
}

private inline fun <reified T : Fragment> navigateTo() {
binding.btnNext.isEnabled = false
inline fun <reified T : Fragment> navigateTo() {
disableNextButton()
supportFragmentManager.commit {
replace<T>(binding.fcv.id, T::class.java.canonicalName)
replace<T>(R.id.fcv_signup, T::class.java.canonicalName)
}
}

Expand Down
231 changes: 231 additions & 0 deletions app/src/main/java/com/teumteum/teumteum/presentation/signup/SignUpViewModel.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
package com.teumteum.teumteum.presentation.signup

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.stateIn
import javax.inject.Inject

@HiltViewModel
class SignUpViewModel @Inject constructor(
// private val authRepository: AuthRepository,
) : ViewModel() {

private val _signUpProgress = MutableStateFlow<SignUpProgress>(SignUpProgress.Character)
val signUpProgress: StateFlow<SignUpProgress> = _signUpProgress.asStateFlow()

private val _currentStep = MutableStateFlow<Int>(1)
val currentStep: StateFlow<Int> = _currentStep.asStateFlow()

private val _characterId = MutableStateFlow<Int>(-1)
val characterId: StateFlow<Int> = _characterId.asStateFlow()

fun updateCharacterId(characterId: Int) {
_characterId.value = characterId
}

private val _userName = MutableStateFlow<String>("")
val userName: StateFlow<String> = _userName.asStateFlow()

fun updateUserName(userName: String) {
_userName.value = userName
}

private val _birthYear = MutableStateFlow("")
val birthYear: StateFlow<String> = _birthYear.asStateFlow()
private val _birthMonth = MutableStateFlow("")
val birthMonth: StateFlow<String> = _birthMonth.asStateFlow()
private val _birthDate = MutableStateFlow("")
val birthDate: StateFlow<String> = _birthDate.asStateFlow()
val birthValid: StateFlow<Boolean> = combine(
birthYear,
birthMonth,
birthDate
) { year, month, date ->
year.toIntOrNull() in 1000..2122
&& month.toIntOrNull() in 1..12
&& date.toIntOrNull() in 1..31
}.stateIn(scope = viewModelScope, SharingStarted.Eagerly, false)

fun updateBirthYear(birthYear: String) {
_birthYear.value = birthYear
}

fun updateBirthMonth(birthMonth: String) {
_birthMonth.value = birthMonth
}

fun updateBirthDate(birthDate: String) {
_birthDate.value = birthDate
}

private val _community = MutableStateFlow<String>("")
val community: StateFlow<String> = _community.asStateFlow()

fun updateCommunity(community: String) {
_community.value = community
}

private val _companyName = MutableStateFlow<String>("")
val companyName: StateFlow<String> = _companyName.asStateFlow()

fun updateCompanyName(companyName: String) {
_companyName.value = companyName
}

private val _jobClass = MutableStateFlow<String>("")
val jobClass: StateFlow<String> = _jobClass.asStateFlow()

fun updateJobClass(jobClass: String) {
_jobClass.value = jobClass
}

private val _jobDetailClass = MutableStateFlow<String>("")
val jobDetailClass: StateFlow<String> = _jobDetailClass.asStateFlow()

fun updateJobDetailClass(jobDetailClass: String) {
_jobDetailClass.value = jobDetailClass
}

val currentJobValid: StateFlow<Boolean> = combine(
companyName,
jobClass,
jobDetailClass
) { companyName, jobClass, jobDetailClass ->
companyName.trim().length in 2..13 && jobClass.isNotBlank() && jobDetailClass.isNotBlank()
}.stateIn(scope = viewModelScope, SharingStarted.Eagerly, false)

private val _schoolName = MutableStateFlow<String>("")
val schoolName: StateFlow<String> = _schoolName.asStateFlow()

fun updateSchoolName(school: String) {
_schoolName.value = school
}

private val _readyJobClass = MutableStateFlow<String>("")
val readyJobClass: StateFlow<String> = _readyJobClass.asStateFlow()

private val _readyJobDetailClass = MutableStateFlow<String>("")
val readyJobDetailClass: StateFlow<String> = _readyJobDetailClass.asStateFlow()

fun updateReadyJobClass(readyJobClass: String) {
_readyJobClass.value = readyJobClass
}

fun updateReadyJobDetailClass(readyJobDetailClass: String) {
_readyJobDetailClass.value = readyJobDetailClass
}

val readyJobValid: StateFlow<Boolean> = combine(
readyJobClass,
readyJobDetailClass
) { readyJobClass, readyJobDetailClass ->
readyJobClass.isNotBlank() && readyJobDetailClass.isNotBlank()
}.stateIn(scope = viewModelScope, SharingStarted.Eagerly, false)

private val _preferredArea = MutableStateFlow<String>("")
val preferredArea: StateFlow<String> = _preferredArea.asStateFlow()

fun updatePreferredArea(preferredArea: String) {
_preferredArea.value = preferredArea
}

private val _mbtiText = MutableStateFlow<String>("")
val mbtiText: StateFlow<String> = _mbtiText.asStateFlow()

fun updateMbtiText(mbti: String) {
_mbtiText.value = mbti
}

fun goToNextScreen() {
_signUpProgress.value =
when (_signUpProgress.value) {
SignUpProgress.Character -> SignUpProgress.Name
SignUpProgress.Name -> SignUpProgress.Birthday
SignUpProgress.Birthday -> SignUpProgress.Community
SignUpProgress.Community -> {
when (_community.value) {
COMMUNITY_WORKER -> SignUpProgress.CurrentJob
COMMUNITY_STUDENT -> SignUpProgress.School
COMMUNITY_TRAINEE -> SignUpProgress.ReadyJob
else -> _signUpProgress.value
}
}
SignUpProgress.CurrentJob -> SignUpProgress.Area
SignUpProgress.School -> SignUpProgress.ReadyJob
SignUpProgress.ReadyJob -> SignUpProgress.Area
SignUpProgress.Area -> SignUpProgress.Mbti
SignUpProgress.Mbti -> SignUpProgress.Interests
SignUpProgress.Interests -> SignUpProgress.Goal
else -> _signUpProgress.value
}
goToNextStep()
}

fun goToPreviousScreen() {
_signUpProgress.value =
when (_signUpProgress.value) {
SignUpProgress.Name -> SignUpProgress.Character
SignUpProgress.Birthday -> SignUpProgress.Name
SignUpProgress.Community -> SignUpProgress.Birthday
SignUpProgress.CurrentJob -> SignUpProgress.Community
SignUpProgress.School -> SignUpProgress.Community
SignUpProgress.ReadyJob -> {
when (_community.value) {
COMMUNITY_STUDENT -> SignUpProgress.School
COMMUNITY_TRAINEE -> SignUpProgress.Community
else -> _signUpProgress.value
}
}
SignUpProgress.Area -> {
when (_community.value) {
COMMUNITY_WORKER -> SignUpProgress.CurrentJob
COMMUNITY_STUDENT -> SignUpProgress.ReadyJob
COMMUNITY_TRAINEE -> SignUpProgress.ReadyJob
else -> _signUpProgress.value
}
}
SignUpProgress.Mbti -> SignUpProgress.Area
SignUpProgress.Interests -> SignUpProgress.Mbti
SignUpProgress.Goal -> SignUpProgress.Interests
else -> _signUpProgress.value
}
goToPreviousStep()
}

fun goToNextStep() {
val isWorkerInCurrentJob = _signUpProgress.value == SignUpProgress.CurrentJob
&& _community.value == COMMUNITY_WORKER
val isTraineeInReadyJob = _signUpProgress.value == SignUpProgress.ReadyJob
&& _community.value == COMMUNITY_TRAINEE
if (isWorkerInCurrentJob || isTraineeInReadyJob) _currentStep.value++
val nextStep = _currentStep.value + 1
_currentStep.value = nextStep.coerceIn(1, 10)
}

fun goToPreviousStep() {
val isWorkerInArea = _signUpProgress.value == SignUpProgress.Area
&& _community.value == COMMUNITY_WORKER
val isTraineeInArea = _signUpProgress.value == SignUpProgress.Area
&& _community.value == COMMUNITY_TRAINEE
if (isWorkerInArea || isTraineeInArea) _currentStep.value--
val previousStep = _currentStep.value - 1
_currentStep.value = previousStep.coerceAtLeast(0)
}

companion object {
private const val REGEX_ID_PATTERN = "^([A-Za-z0-9_.]*)\$"
private const val COMMUNITY_WORKER = "직장인"
private const val COMMUNITY_STUDENT = "학생"
private const val COMMUNITY_TRAINEE = "취업준비생"
}
}

enum class SignUpProgress {
Character, Name, Birthday, Community, CurrentJob, School, ReadyJob, Area, Mbti, Interests, Goal
}
Loading

0 comments on commit 61aed84

Please sign in to comment.