From a83901a73153cc750afc6b466583e1c8b66d8572 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 28 Nov 2019 03:18:27 -0500 Subject: [PATCH] Allow manual blocking of non-numeric addresses --- .../blocking/numbers/BlockedNumberTextWatcher.kt | 13 +++++++++---- .../main/res/layout/blocked_numbers_add_dialog.xml | 1 - 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumberTextWatcher.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumberTextWatcher.kt index 17ceac22..fae446eb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumberTextWatcher.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumberTextWatcher.kt @@ -32,16 +32,21 @@ class BlockedNumberTextWatcher( editText.addTextChangedListener(this) } - override fun afterTextChanged(s: Editable?) = Unit + override fun afterTextChanged(s: Editable?) { + editText.removeTextChangedListener(this) - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { val formatted = s?.let(phoneNumberUtils::formatNumber) if (s?.toString() != formatted && formatted != null) { editText.setText(formatted) editText.setSelection(formatted.length) } + + editText.addTextChangedListener(this) + } + + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { } fun dispose() { diff --git a/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml b/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml index 42d22860..9f0c1b8e 100644 --- a/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml +++ b/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml @@ -39,7 +39,6 @@ android:layout_height="wrap_content" android:background="@null" android:hint="@string/blocked_numbers_dialog_hint" - android:inputType="phone" android:paddingStart="24dp" android:paddingTop="16dp" android:paddingEnd="24dp"