Skip to content

Fix: Add missing long phone number patterns for Austria (AT) #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KDVL wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Add missing long phone number patterns for Austria (AT) #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 40 additions & 7 deletions lib/src/main/java/me/ibrahimsn/lib/PhoneNumberKit.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ class PhoneNumberKit private constructor(

private var textChangedListener: MaskedTextChangedListener? = null

private fun setupListener(editText: EditText, pattern: String) {
private fun setupListener(editText: EditText, pattern: String, otherPatterns: List<String>) {
editText.removeTextChangedListener(textChangedListener)
textChangedListener = installOn(
editText,
pattern,
emptyList(),
otherPatterns,
AffinityCalculationStrategy.WHOLE_STRING,
object : MaskedTextChangedListener.ValueListener {
override fun onTextChanged(
Expand Down Expand Up @@ -102,18 +102,51 @@ class PhoneNumberKit private constructor(
}

private fun setCountry(country: Country) {
val formattedNumber = proxy.formatPhoneNumber(
proxy.getExampleNumber(country.iso2)
)
val exampleNumber = proxy.getExampleNumber(country.iso2)
val formattedNumber = proxy.formatPhoneNumber(exampleNumber)

val pattern = CountryPattern.create(
formattedNumber.orEmpty()
)

val patterns = findOtherPatterns(
formattedNumber.orEmpty(),
country.iso2
).map {
CountryPattern.create(it)
}

state.value = State.Attached(
country = country,
pattern = pattern
pattern = pattern,
otherPatterns = patterns
)
}

private fun findOtherPatterns(formattedNumber: String, iso2: String?): List<String> {
val validPatterns = mutableListOf<String>()
var testedNumber = formattedNumber

do {
testedNumber = testedNumber.dropLast(1)
val isValid = proxy.validateNumber(testedNumber, iso2)
if (isValid) {
validPatterns.add(testedNumber)
}
} while (isValid && testedNumber.isNotEmpty())

testedNumber = formattedNumber
do {
testedNumber += '0'
val isValid = proxy.validateNumber(testedNumber, iso2)
if (isValid) {
validPatterns.add(testedNumber)
}
} while (isValid && testedNumber.isNotEmpty())

return validPatterns
}

fun attachToInput(
input: TextInputLayout,
defaultCountry: Int,
Expand Down Expand Up @@ -157,7 +190,7 @@ class PhoneNumberKit private constructor(
}
}
input.get()?.editText?.let { editText ->
setupListener(editText, state.pattern)
setupListener(editText, state.pattern, state.otherPatterns)
}
if (inputValue.isNullOrEmpty()) {
inputValue = state.country.code.toString()
Expand Down
1 change: 1 addition & 0 deletions lib/src/main/java/me/ibrahimsn/lib/internal/model/State.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ sealed class State {
data class Attached(
val country: Country,
val pattern: String,
val otherPatterns: List<String>,
) : State()
}