diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt index 8a45633a4..8411e3a96 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt @@ -73,7 +73,7 @@ class FrequencyPickerDialog( contentView.everyXDaysRadioButton.setOnClickListener { check(contentView.everyXDaysRadioButton) val everyXDaysTextView = contentView.everyXDaysTextView - focus(everyXDaysTextView) + selectInputField(everyXDaysTextView) } contentView.everyXDaysTextView.setOnFocusChangeListener { v, hasFocus -> @@ -82,7 +82,7 @@ class FrequencyPickerDialog( contentView.xTimesPerWeekRadioButton.setOnClickListener { check(contentView.xTimesPerWeekRadioButton) - focus(contentView.xTimesPerWeekTextView) + selectInputField(contentView.xTimesPerWeekTextView) } contentView.xTimesPerWeekTextView.setOnFocusChangeListener { v, hasFocus -> @@ -91,7 +91,7 @@ class FrequencyPickerDialog( contentView.xTimesPerMonthRadioButton.setOnClickListener { check(contentView.xTimesPerMonthRadioButton) - focus(contentView.xTimesPerMonthTextView) + selectInputField(contentView.xTimesPerMonthTextView) } contentView.xTimesPerMonthTextView.setOnFocusChangeListener { v, hasFocus -> @@ -100,7 +100,7 @@ class FrequencyPickerDialog( contentView.xTimesPerYDaysRadioButton.setOnClickListener { check(contentView.xTimesPerYDaysRadioButton) - focus(contentView.xTimesPerYDaysXTextView) + selectInputField(contentView.xTimesPerYDaysXTextView) } contentView.xTimesPerYDaysXTextView.setOnFocusChangeListener { v, hasFocus -> @@ -184,7 +184,7 @@ class FrequencyPickerDialog( if (freqDenominator == 30 || freqDenominator == 31) { contentView.xTimesPerMonthRadioButton.isChecked = true contentView.xTimesPerMonthTextView.setText(freqNumerator.toString()) - focus(contentView.xTimesPerMonthTextView) + selectInputField(contentView.xTimesPerMonthTextView) } else { if (freqNumerator == 1) { if (freqDenominator == 1) { @@ -192,13 +192,13 @@ class FrequencyPickerDialog( } else { contentView.everyXDaysRadioButton.isChecked = true contentView.everyXDaysTextView.setText(freqDenominator.toString()) - focus(contentView.everyXDaysTextView) + selectInputField(contentView.everyXDaysTextView) } } else { if (freqDenominator == 7) { contentView.xTimesPerWeekRadioButton.isChecked = true contentView.xTimesPerWeekTextView.setText(freqNumerator.toString()) - focus(contentView.xTimesPerWeekTextView) + selectInputField(contentView.xTimesPerWeekTextView) } else { contentView.xTimesPerYDaysRadioButton.isChecked = true contentView.xTimesPerYDaysXTextView.setText(freqNumerator.toString()) @@ -208,8 +208,7 @@ class FrequencyPickerDialog( } } - private fun focus(view: EditText) { - view.requestFocus() + private fun selectInputField(view: EditText) { view.setSelection(view.text.length) }