add general phone number validation per country

ibrahimsn98 · Jul 1, 2021 · b607fb1 · b607fb1
1 parent 0d13817
commit b607fb1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/lib/src/main/java/me/ibrahimsn/lib/PhoneNumberKit.kt b/lib/src/main/java/me/ibrahimsn/lib/PhoneNumberKit.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.graphics.drawable.Drawable
 import android.text.InputFilter
 import android.text.InputType
-import android.util.Patterns
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.google.android.material.textfield.TextInputLayout
@@ -268,10 +267,6 @@ class PhoneNumberKit(private val context: Context) {
         return null
     }
 
-    /**
-     * Provides country code
-     */
-
     /**
      * Provides country for given country iso2
      */
@@ -286,7 +281,6 @@ class PhoneNumberKit(private val context: Context) {
 
     private fun validate(number: CharSequence?): Boolean {
         if (number == null) return false
-        return !number.isNullOrEmpty()
-                && Patterns.PHONE.matcher(number).find()
+        return core.validateNumber(number.toString(), country?.iso2)
     }
 }
diff --git a/lib/src/main/java/me/ibrahimsn/lib/core/Core.kt b/lib/src/main/java/me/ibrahimsn/lib/core/Core.kt
@@ -8,7 +8,7 @@ import me.ibrahimsn.lib.util.prependPlus
 import me.ibrahimsn.lib.util.startsWithPlus
 import java.util.*
 
-class Core(context: Context) {
+internal class Core(context: Context) {
 
     private var phoneUtil: PhoneNumberUtil = PhoneNumberUtil.createInstance(context)
 
@@ -50,4 +50,13 @@ class Core(context: Context) {
             null
         }
     }
+
+    fun validateNumber(number: String?, countryCode: String?): Boolean {
+        return try {
+            val p = parsePhoneNumber(number, countryCode)
+            return phoneUtil.isValidNumber(p)
+        } catch (e: Exception) {
+            false
+        }
+    }
 }
diff --git a/lib/src/main/java/me/ibrahimsn/lib/util/PhoneNumberTextWatcher.kt b/lib/src/main/java/me/ibrahimsn/lib/util/PhoneNumberTextWatcher.kt
@@ -3,7 +3,7 @@ package me.ibrahimsn.lib.util
 import android.text.Editable
 import android.text.TextWatcher
 
-abstract class PhoneNumberTextWatcher : TextWatcher {
+internal abstract class PhoneNumberTextWatcher : TextWatcher {
 
     override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
         // no-op

diff --git a/lib/src/main/java/me/ibrahimsn/lib/util/PhoneNumberValidator.kt b/lib/src/main/java/me/ibrahimsn/lib/util/PhoneNumberValidator.kt