Skip to content

Commit

Permalink
#25 [add] ktlint check
Browse files Browse the repository at this point in the history
  • Loading branch information
wnehdals committed Jan 11, 2023
1 parent 5d1c961 commit 2814fcb
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 43 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ class FindIdActivity : BaseActivity<ActivityFindIdBinding>() {
override val layoutId: Int
get() = R.layout.activity_find_id


override fun initView() {
binding.lifecycleOwner = this
}
Expand All @@ -20,4 +19,4 @@ class FindIdActivity : BaseActivity<ActivityFindIdBinding>() {

override fun initEvent() {
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -36,8 +36,7 @@ class FindIdCustomDialog(context: Context) {
}
}


interface OnDialogClickListener {
fun onClicked(name: String)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -57,6 +55,4 @@ class FindIdFragment : Fragment() {
editTextFindIdToEmail.setText(null)
}
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -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<Boolean>(false,false,false,false)
var numberBoxState = mutableListOf<Boolean>(false, false, false, false)

override fun onCreateView(
inflater: LayoutInflater,
Expand All @@ -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()
Expand Down Expand Up @@ -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 {
Expand All @@ -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<MutableList<Boolean>>{
var checkNumber = 0
it.forEach { boolData ->
if (!boolData) onActiveButton(boolData) else checkNumber ++
private fun observeData() {
findIdViewModel.numberBoxUiState.observe(
viewLifecycleOwner,
Observer<MutableList<Boolean>> {
var checkNumber = 0
it.forEach { boolData ->
if (!boolData) onActiveButton(boolData) else checkNumber ++
}
if (checkNumber == 4) onActiveButton(true)
}
if (checkNumber == 4) onActiveButton(true)
})
)
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<MutableList<Boolean>> by lazy {
MutableLiveData<MutableList<Boolean>>()
}
Expand All @@ -33,22 +31,26 @@ 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,})$"

var email = userEmail.trim()
return Pattern.matches(emailValidation, email)
}

fun checkNumberInCodeBox(numberLength:Int, boxState:MutableList<Boolean>, pos:Int, boxNumber: EditText?){
if (numberLength == 1){
if (pos != 3){
fun checkNumberInCodeBox(
numberLength: Int,
boxState: MutableList<Boolean>,
pos: Int,
boxNumber: EditText?
) {
if (numberLength == 1) {
if (pos != 3) {
boxNumber?.requestFocus()
}
boxState[pos] = true
Expand Down Expand Up @@ -102,12 +104,10 @@ class FindIdViewModel @Inject constructor(

)
emailFormatIsNot.isVisible = false

} else {
// fail
isOkButton.isEnabled = false
emailFormatIsNot.isVisible = true

}
}

Expand All @@ -116,6 +116,4 @@ class FindIdViewModel @Inject constructor(
}
})
}


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ data class FindIdResp(
val profileImage: Map<String, Any>,
val userCountResponse: Map<String, Int>,
val userType: String
)
)
Empty file modified gradlew
100644 → 100755
Empty file.

0 comments on commit 2814fcb

Please sign in to comment.