diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdActivity.kt b/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdActivity.kt index f4df0370..76ea139f 100644 --- a/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdActivity.kt +++ b/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdActivity.kt @@ -10,7 +10,6 @@ class FindIdActivity : BaseActivity() { override val layoutId: Int get() = R.layout.activity_find_id - override fun initView() { binding.lifecycleOwner = this } @@ -20,4 +19,4 @@ class FindIdActivity : BaseActivity() { override fun initEvent() { } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdCustomDialog.kt b/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdCustomDialog.kt index 273a0621..682fe23b 100644 --- a/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdCustomDialog.kt +++ b/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdCustomDialog.kt @@ -11,13 +11,13 @@ import com.jjbaksa.jjbaksa.R class FindIdCustomDialog(context: Context) { private val dialog = Dialog(context) - private lateinit var onClickListener : OnDialogClickListener + private lateinit var onClickListener: OnDialogClickListener - fun setOnClickListener(listener: OnDialogClickListener){ + fun setOnClickListener(listener: OnDialogClickListener) { onClickListener = listener } - fun showDialog(email:String, id: String){ + fun showDialog(email: String, id: String) { dialog.setContentView(R.layout.alert_dialog_find_id) dialog.window!!.setLayout(WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT) @@ -36,8 +36,7 @@ class FindIdCustomDialog(context: Context) { } } - interface OnDialogClickListener { fun onClicked(name: String) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdFragment.kt b/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdFragment.kt index ecbaf2a8..7ec74298 100644 --- a/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdFragment.kt +++ b/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdFragment.kt @@ -13,7 +13,6 @@ import com.jjbaksa.jjbaksa.R import com.jjbaksa.jjbaksa.databinding.FragmentFindIdBinding import com.jjbaksa.jjbaksa.ui.findid.viewmodel.FindIdViewModel - class FindIdFragment : Fragment() { private lateinit var binding: FragmentFindIdBinding @@ -39,7 +38,6 @@ class FindIdFragment : Fragment() { findNavController(), R.id.action_find_id_to_input_id_verification_code ) - } else { // Email format is Fail binding.textViewFindIdNotCorrectEmailFormat.visibility = View.VISIBLE @@ -57,6 +55,4 @@ class FindIdFragment : Fragment() { editTextFindIdToEmail.setText(null) } } - } - diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdInputVerificationCodeFragment.kt b/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdInputVerificationCodeFragment.kt index 5465dfa1..724b051f 100644 --- a/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdInputVerificationCodeFragment.kt +++ b/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/FindIdInputVerificationCodeFragment.kt @@ -16,11 +16,11 @@ import com.jjbaksa.jjbaksa.ui.findid.viewmodel.FindIdViewModel import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint -class FindIdInputVerificationCodeFragment: Fragment() { +class FindIdInputVerificationCodeFragment : Fragment() { private lateinit var binding: FragmentFindIdInputVerificationCodeBinding private val findIdViewModel: FindIdViewModel by activityViewModels() - var numberBoxState = mutableListOf(false,false,false,false) + var numberBoxState = mutableListOf(false, false, false, false) override fun onCreateView( inflater: LayoutInflater, @@ -29,7 +29,7 @@ class FindIdInputVerificationCodeFragment: Fragment() { ): View? { binding = DataBindingUtil.inflate(layoutInflater, R.layout.fragment_find_id_input_verification_code, container, false) - numberBoxState = mutableListOf(false,false,false,false) + numberBoxState = mutableListOf(false, false, false, false) nextToVerificationCodeBox() observeData() @@ -58,10 +58,9 @@ class FindIdInputVerificationCodeFragment: Fragment() { return binding.root } - - private fun nextToVerificationCodeBox(){ - with(binding){ - editTextFindIdVerificationCodeOne.addTextChangedListener{ + private fun nextToVerificationCodeBox() { + with(binding) { + editTextFindIdVerificationCodeOne.addTextChangedListener { findIdViewModel.checkNumberInCodeBox(it?.length!!, numberBoxState, 0, editTextFindIdVerificationCodeTwo) } editTextFindIdVerificationCodeTwo.addTextChangedListener { @@ -76,18 +75,20 @@ class FindIdInputVerificationCodeFragment: Fragment() { } } - private fun onActiveButton(value: Boolean){ + private fun onActiveButton(value: Boolean) { binding.buttonFindIdVerificationCode.isEnabled = value } - private fun observeData(){ - findIdViewModel.numberBoxUiState.observe(viewLifecycleOwner, Observer>{ - var checkNumber = 0 - it.forEach { boolData -> - if (!boolData) onActiveButton(boolData) else checkNumber ++ + private fun observeData() { + findIdViewModel.numberBoxUiState.observe( + viewLifecycleOwner, + Observer> { + var checkNumber = 0 + it.forEach { boolData -> + if (!boolData) onActiveButton(boolData) else checkNumber ++ + } + if (checkNumber == 4) onActiveButton(true) } - if (checkNumber == 4) onActiveButton(true) - }) + ) } - -} \ No newline at end of file +} diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/viewmodel/FindIdViewModel.kt b/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/viewmodel/FindIdViewModel.kt index a36e19cb..e1778264 100644 --- a/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/viewmodel/FindIdViewModel.kt +++ b/app/src/main/java/com/jjbaksa/jjbaksa/ui/findid/viewmodel/FindIdViewModel.kt @@ -19,9 +19,7 @@ import java.util.regex.Pattern import javax.inject.Inject @HiltViewModel -class FindIdViewModel @Inject constructor( - -) : ViewModel() { +class FindIdViewModel @Inject constructor() : ViewModel() { val numberBoxUiState: MutableLiveData> by lazy { MutableLiveData>() } @@ -33,12 +31,11 @@ class FindIdViewModel @Inject constructor( userEmail.value = _userEmail } - fun stateButton(emailLength: Int): Boolean{ + fun stateButton(emailLength: Int): Boolean { return emailLength > 0 } - - fun checkEmailFormat(userEmail: String): Boolean{ + fun checkEmailFormat(userEmail: String): Boolean { val emailValidation = "^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$" @@ -46,9 +43,14 @@ class FindIdViewModel @Inject constructor( return Pattern.matches(emailValidation, email) } - fun checkNumberInCodeBox(numberLength:Int, boxState:MutableList, pos:Int, boxNumber: EditText?){ - if (numberLength == 1){ - if (pos != 3){ + fun checkNumberInCodeBox( + numberLength: Int, + boxState: MutableList, + pos: Int, + boxNumber: EditText? + ) { + if (numberLength == 1) { + if (pos != 3) { boxNumber?.requestFocus() } boxState[pos] = true @@ -102,12 +104,10 @@ class FindIdViewModel @Inject constructor( ) emailFormatIsNot.isVisible = false - } else { // fail isOkButton.isEnabled = false emailFormatIsNot.isVisible = true - } } @@ -116,6 +116,4 @@ class FindIdViewModel @Inject constructor( } }) } - - -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/jjbaksa/domain/resp/findid/FindIdResp.kt b/domain/src/main/java/com/jjbaksa/domain/resp/findid/FindIdResp.kt index 664273ba..7c4bd63d 100644 --- a/domain/src/main/java/com/jjbaksa/domain/resp/findid/FindIdResp.kt +++ b/domain/src/main/java/com/jjbaksa/domain/resp/findid/FindIdResp.kt @@ -9,4 +9,4 @@ data class FindIdResp( val profileImage: Map, val userCountResponse: Map, val userType: String -) \ No newline at end of file +) diff --git a/gradlew b/gradlew old mode 100644 new mode 100755