diff --git a/libphonenumber_platform_interface/.idea/libraries/Dart_Packages.xml b/libphonenumber_platform_interface/.idea/libraries/Dart_Packages.xml
index 7441ace..1e3bd87 100644
--- a/libphonenumber_platform_interface/.idea/libraries/Dart_Packages.xml
+++ b/libphonenumber_platform_interface/.idea/libraries/Dart_Packages.xml
@@ -5,182 +5,174 @@
-
+
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libphonenumber_platform_interface/.idea/libraries/Dart_SDK.xml b/libphonenumber_platform_interface/.idea/libraries/Dart_SDK.xml
index e450131..41e82d7 100644
--- a/libphonenumber_platform_interface/.idea/libraries/Dart_SDK.xml
+++ b/libphonenumber_platform_interface/.idea/libraries/Dart_SDK.xml
@@ -1,26 +1,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libphonenumber_platform_interface/.idea/workspace.xml b/libphonenumber_platform_interface/.idea/workspace.xml
index 285a965..dd5f91d 100644
--- a/libphonenumber_platform_interface/.idea/workspace.xml
+++ b/libphonenumber_platform_interface/.idea/workspace.xml
@@ -1,5 +1,8 @@
+
+
+
@@ -21,16 +24,12 @@
-
-
-
-
-
-
-
+
+
+
+
-
@@ -40,6 +39,9 @@
+
+
+
@@ -49,12 +51,15 @@
+
+
+
@@ -78,7 +83,6 @@
-
diff --git a/libphonenumber_platform_interface/pubspec.lock b/libphonenumber_platform_interface/pubspec.lock
index d3c3392..805f1ae 100644
--- a/libphonenumber_platform_interface/pubspec.lock
+++ b/libphonenumber_platform_interface/pubspec.lock
@@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
- version: "2.8.1"
+ version: "2.9.0"
boolean_selector:
dependency: transitive
description:
@@ -21,35 +21,28 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
- charcode:
- dependency: transitive
- description:
- name: charcode
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.3.1"
+ version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
- version: "1.15.0"
+ version: "1.16.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.3.1"
flutter:
dependency: "direct main"
description: flutter
@@ -66,21 +59,28 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.10"
+ version: "0.12.12"
+ material_color_utilities:
+ dependency: transitive
+ description:
+ name: material_color_utilities
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.1.5"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
- version: "1.7.0"
+ version: "1.8.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.0"
+ version: "1.8.2"
plugin_platform_interface:
dependency: "direct main"
description:
@@ -99,7 +99,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.1"
+ version: "1.9.0"
stack_trace:
dependency: transitive
description:
@@ -120,35 +120,28 @@ packages:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.2"
- typed_data:
- dependency: transitive
- description:
- name: typed_data
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.3.0"
+ version: "0.4.12"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0"
+ version: "2.1.2"
sdks:
- dart: ">=2.12.0 <3.0.0"
+ dart: ">=2.17.0-0 <3.0.0"
flutter: ">=1.20.0"
diff --git a/libphonenumber_plugin/.idea/libphonenumber_plugin.iml b/libphonenumber_plugin/.idea/libphonenumber_plugin.iml
index 5ef99d4..c1b769b 100644
--- a/libphonenumber_plugin/.idea/libphonenumber_plugin.iml
+++ b/libphonenumber_plugin/.idea/libphonenumber_plugin.iml
@@ -10,6 +10,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/libphonenumber_plugin/.idea/libraries/Dart_Packages.xml b/libphonenumber_plugin/.idea/libraries/Dart_Packages.xml
index a90d3ee..0307faf 100644
--- a/libphonenumber_plugin/.idea/libraries/Dart_Packages.xml
+++ b/libphonenumber_plugin/.idea/libraries/Dart_Packages.xml
@@ -5,230 +5,214 @@
-
+
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libphonenumber_plugin/.idea/libraries/Dart_SDK.xml b/libphonenumber_plugin/.idea/libraries/Dart_SDK.xml
index e450131..41e82d7 100644
--- a/libphonenumber_plugin/.idea/libraries/Dart_SDK.xml
+++ b/libphonenumber_plugin/.idea/libraries/Dart_SDK.xml
@@ -1,26 +1,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libphonenumber_plugin/.idea/libraries/Flutter_Plugins.xml b/libphonenumber_plugin/.idea/libraries/Flutter_Plugins.xml
index 6fcf1c9..29954a1 100644
--- a/libphonenumber_plugin/.idea/libraries/Flutter_Plugins.xml
+++ b/libphonenumber_plugin/.idea/libraries/Flutter_Plugins.xml
@@ -2,8 +2,7 @@
-
-
+
diff --git a/libphonenumber_plugin/.idea/workspace.xml b/libphonenumber_plugin/.idea/workspace.xml
index fe9f8dc..6f71a5d 100644
--- a/libphonenumber_plugin/.idea/workspace.xml
+++ b/libphonenumber_plugin/.idea/workspace.xml
@@ -22,21 +22,24 @@
-
+
+
-
-
+
+
+
+
@@ -47,7 +50,9 @@
+
+
@@ -75,6 +80,28 @@
1609684921703
+
+ 1673246343927
+
+
+
+ 1673246343928
+
+
+ 1673247826477
+
+
+
+ 1673247826477
+
+
+ 1673261438343
+
+
+
+ 1673261438343
+
+
@@ -87,6 +114,10 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/libphonenumber_plugin/android/build.gradle b/libphonenumber_plugin/android/build.gradle
index 440f017..da89519 100644
--- a/libphonenumber_plugin/android/build.gradle
+++ b/libphonenumber_plugin/android/build.gradle
@@ -4,30 +4,32 @@ version '1.0'
buildscript {
repositories {
google()
- jcenter()
+ mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.1.0'
+ classpath 'com.android.tools.build:gradle:4.1.3'
}
}
rootProject.allprojects {
repositories {
google()
- jcenter()
+ mavenCentral()
}
}
apply plugin: 'com.android.library'
android {
- compileSdkVersion 30
+ compileSdkVersion 33
defaultConfig {
minSdkVersion 16
}
+
dependencies {
- compileOnly rootProject.findProject(":libphonenumber")
+ api 'com.googlecode.libphonenumber:libphonenumber:8.13.4'
+ api 'com.googlecode.libphonenumber:carrier:1.188'
}
}
diff --git a/libphonenumber_plugin/android/src/main/java/com/example/libphonenumber_plugin/LibphonenumberPlugin.java b/libphonenumber_plugin/android/src/main/java/com/example/libphonenumber_plugin/LibphonenumberPlugin.java
index 1a7b3e4..4666161 100644
--- a/libphonenumber_plugin/android/src/main/java/com/example/libphonenumber_plugin/LibphonenumberPlugin.java
+++ b/libphonenumber_plugin/android/src/main/java/com/example/libphonenumber_plugin/LibphonenumberPlugin.java
@@ -2,7 +2,14 @@
import androidx.annotation.NonNull;
+import com.google.i18n.phonenumbers.AsYouTypeFormatter;
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberToCarrierMapper;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.Phonenumber;
+
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
@@ -21,14 +28,14 @@ public class LibphonenumberPlugin implements FlutterPlugin, MethodCallHandler {
/// when the Flutter Engine is detached from the Activity
private MethodChannel channel;
- private com.codeheadlabs.libphonenumber.LibphonenumberPlugin libphonenumberPlugin;
+ private static final PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
+ private static final PhoneNumberToCarrierMapper phoneNumberToCarrierMapper = PhoneNumberToCarrierMapper.getInstance();
+
@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
channel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), "plugin.libphonenumber");
channel.setMethodCallHandler(this);
-
- libphonenumberPlugin = new com.codeheadlabs.libphonenumber.LibphonenumberPlugin();
}
@Override
@@ -40,12 +47,22 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
switch (call.method) {
case "isValidPhoneNumber":
+ handleIsValidPhoneNumber(call, result);
+ break;
case "getNameForNumber":
+ handleGetNameForNumber(call, result);
+ break;
case "normalizePhoneNumber":
+ handleNormalizePhoneNumber(call, result);
+ break;
case "getRegionInfo":
+ handleGetRegionInfo(call, result);
+ break;
case "getNumberType":
+ handleGetNumberType(call, result);
+ break;
case "formatAsYouType":
- onDirectMethodCall(call, result);
+ handleFormatAsYouType(call, result);
break;
default:
result.notImplemented();
@@ -53,17 +70,123 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
}
}
- private void onDirectMethodCall(MethodCall call, Result result) {
+ private void handleIsValidPhoneNumber(MethodCall call, Result result) {
+ String phoneNumber = call.argument("phoneNumber");
+ String isoCode = call.argument("isoCode");
+
+ try {
+ Phonenumber.PhoneNumber p = phoneUtil.parse(phoneNumber, isoCode);
+ result.success(phoneUtil.isValidNumber(p));
+ } catch (NumberParseException e) {
+ result.error("NumberParseException", e.getMessage(), null);
+ }
+ }
+
+ private void handleGetNameForNumber(MethodCall call, Result result) {
+ String phoneNumber = call.argument("phoneNumber");
+ String isoCode = call.argument("isoCode");
+
+ try {
+ Phonenumber.PhoneNumber p = phoneUtil.parse(phoneNumber, isoCode);
+ result.success(phoneNumberToCarrierMapper.getNameForNumber(p, Locale.getDefault()));
+ } catch (NumberParseException e) {
+ result.error("NumberParseException", e.getMessage(), null);
+ }
+ }
+
+ private void handleNormalizePhoneNumber(MethodCall call, Result result) {
+ String phoneNumber = call.argument("phoneNumber");
+ String isoCode = call.argument("isoCode");
+
+ try {
+ Phonenumber.PhoneNumber p = phoneUtil.parse(phoneNumber, isoCode);
+ final String normalized = phoneUtil.format(p, PhoneNumberUtil.PhoneNumberFormat.E164);
+ result.success(normalized);
+ } catch (NumberParseException e) {
+ result.error("NumberParseException", e.getMessage(), null);
+ }
+ }
+
+ private void handleGetRegionInfo(MethodCall call, Result result) {
String phoneNumber = call.argument("phoneNumber");
String isoCode = call.argument("isoCode");
- Map arguments = new HashMap<>();
- arguments.put("phone_number", phoneNumber);
- arguments.put("iso_code", isoCode);
+ try {
+ Phonenumber.PhoneNumber p = phoneUtil.parse(phoneNumber, isoCode);
+ String regionCode = phoneUtil.getRegionCodeForNumber(p);
+ String countryCode = String.valueOf(p.getCountryCode());
+ String formattedNumber = phoneUtil.format(p, PhoneNumberUtil.PhoneNumberFormat.NATIONAL);
+ Map resultMap = new HashMap<>();
+ resultMap.put("isoCode", regionCode);
+ resultMap.put("regionCode", countryCode);
+ resultMap.put("formattedPhoneNumber", formattedNumber);
+ result.success(resultMap);
+ } catch (NumberParseException e) {
+ result.error("NumberParseException", e.getMessage(), null);
+ }
+ }
- final MethodCall methodCall = new MethodCall(call.method, arguments);
+ private void handleGetNumberType(MethodCall call, Result result) {
+ String phoneNumber = call.argument("phoneNumber");
+ String isoCode = call.argument("isoCode");
+ try {
+ Phonenumber.PhoneNumber p = phoneUtil.parse(phoneNumber, isoCode);
+ PhoneNumberUtil.PhoneNumberType t = phoneUtil.getNumberType(p);
+
+ switch (t) {
+ case FIXED_LINE:
+ result.success(0);
+ break;
+ case MOBILE:
+ result.success(1);
+ break;
+ case FIXED_LINE_OR_MOBILE:
+ result.success(2);
+ break;
+ case TOLL_FREE:
+ result.success(3);
+ break;
+ case PREMIUM_RATE:
+ result.success(4);
+ break;
+ case SHARED_COST:
+ result.success(5);
+ break;
+ case VOIP:
+ result.success(6);
+ break;
+ case PERSONAL_NUMBER:
+ result.success(7);
+ break;
+ case PAGER:
+ result.success(8);
+ break;
+ case UAN:
+ result.success(9);
+ break;
+ case VOICEMAIL:
+ result.success(10);
+ break;
+ case UNKNOWN:
+ result.success(-1);
+ break;
+ }
+ } catch (NumberParseException e) {
+ result.error("NumberParseException", e.getMessage(), null);
+ }
+ }
+
+ private void handleFormatAsYouType(MethodCall call, Result result) {
+ String phoneNumber = call.argument("phoneNumber");
+ String isoCode = call.argument("isoCode");
+
+ AsYouTypeFormatter asYouTypeFormatter = phoneUtil.getAsYouTypeFormatter(isoCode);
+ String data = null;
+ for (int i = 0; i < (phoneNumber != null ? phoneNumber.length() : 0); i++) {
+ data = asYouTypeFormatter.inputDigit(phoneNumber.charAt(i));
+ }
- libphonenumberPlugin.onMethodCall(methodCall, result);
+ result.success(data);
}
}
diff --git a/libphonenumber_plugin/assets/js/libphonenumber.js b/libphonenumber_plugin/assets/js/libphonenumber.js
index b4ab572..5cebcde 100644
--- a/libphonenumber_plugin/assets/js/libphonenumber.js
+++ b/libphonenumber_plugin/assets/js/libphonenumber.js
@@ -5,19 +5,23 @@
Copyright The Closure Library Authors.
SPDX-License-Identifier: Apache-2.0
*/
-var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.createTemplateTagFirstArg=function(a){return a.raw=a};$jscomp.createTemplateTagFirstArgWithRaw=function(a,b){a.raw=b;return a};$jscomp.checkStringArgs=function(a,b,c){if(null==a)throw new TypeError("The 'this' value for String.prototype."+c+" must not be null or undefined");if(b instanceof RegExp)throw new TypeError("First argument to String.prototype."+c+" must not be a regular expression");return a+""};$jscomp.ASSUME_ES5=!1;
-$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.SIMPLE_FROUND_POLYFILL=!1;$jscomp.ISOLATE_POLYFILLS=!1;$jscomp.FORCE_POLYFILL_PROMISE=!1;$jscomp.FORCE_POLYFILL_PROMISE_WHEN_NO_UNHANDLED_REJECTION=!1;$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(a,b,c){if(a==Array.prototype||a==Object.prototype)return a;a[b]=c.value;return a};
+var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.createTemplateTagFirstArg=function(a){return a.raw=a};$jscomp.createTemplateTagFirstArgWithRaw=function(a,b){a.raw=b;return a};$jscomp.arrayIteratorImpl=function(a){var b=0;return function(){return b=e}},"es6","es3");
-$jscomp.findInternal=function(a,b,c){a instanceof String&&(a=String(a));for(var d=a.length,e=0;e=f}},"es6","es3");
-$jscomp.polyfill("String.prototype.repeat",function(a){return a?a:function(b){var c=$jscomp.checkStringArgs(this,null,"repeat");if(0>b||1342177279>>=1)c+=c;return d}},"es6","es3");$jscomp.arrayIteratorImpl=function(a){var b=0;return function(){return b=f}},"es6","es3");
+$jscomp.polyfill("String.prototype.repeat",function(a){return a?a:function(b){var c=$jscomp.checkStringArgs(this,null,"repeat");if(0>b||1342177279>>=1)c+=c;return d}},"es6","es3");$jscomp.initSymbol=function(){};
$jscomp.polyfill("Symbol",function(a){if(a)return a;var b=function(e,f){this.$jscomp$symbol$id_=e;$jscomp.defineProperty(this,"description",{configurable:!0,writable:!0,value:f})};b.prototype.toString=function(){return this.$jscomp$symbol$id_};var c=0,d=function(e){if(this instanceof d)throw new TypeError("Symbol is not a constructor");return new b("jscomp_symbol_"+(e||"")+"_"+c++,e)};return d},"es6","es3");
$jscomp.polyfill("Symbol.iterator",function(a){if(a)return a;a=Symbol("Symbol.iterator");for(var b="Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array".split(" "),c=0;cc&&(c=Math.max(c+e,0));c=b.length?0:this.getNumberType(a)==i18n.phonenumbers.PhoneNumberType.MOBILE&&(a=i18n.phonenumbers.PhoneNumberUtil.getCountryMobileToken(a.getCountryCodeOrDefault()),""!=a)?b[2].length+
-a.length:b[1].length};i18n.phonenumbers.PhoneNumberUtil.getCountryMobileToken=function(a){return i18n.phonenumbers.PhoneNumberUtil.MOBILE_TOKEN_MAPPINGS_[a]||""};i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedRegions=function(){return module$contents$goog$array_filter(Object.keys(i18n.phonenumbers.metadata.countryToMetadata),function(a){return isNaN(a)})};
-i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedGlobalNetworkCallingCodes=function(){var a=module$contents$goog$array_filter(Object.keys(i18n.phonenumbers.metadata.countryToMetadata),function(b){return!isNaN(b)});return module$contents$goog$array_map(a,function(b){return parseInt(b,10)})};
-i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedCallingCodes=function(){var a=Object.keys(i18n.phonenumbers.metadata.countryCodeToRegionCodeMap);return module$contents$goog$array_join(this.getSupportedGlobalNetworkCallingCodes(),module$contents$goog$array_map(a,function(b){return parseInt(b,10)}))};i18n.phonenumbers.PhoneNumberUtil.descHasPossibleNumberData_=function(a){return null!=a&&(1!=a.possibleLengthCount()||-1!=a.possibleLengthArray()[0])};
+a.length:b[1].length};i18n.phonenumbers.PhoneNumberUtil.getCountryMobileToken=function(a){return i18n.phonenumbers.PhoneNumberUtil.MOBILE_TOKEN_MAPPINGS_[a]||""};i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedRegions=function(){return Object.keys(i18n.phonenumbers.metadata.countryToMetadata).filter(function(a){return isNaN(a)})};
+i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedGlobalNetworkCallingCodes=function(){return Object.keys(i18n.phonenumbers.metadata.countryToMetadata).filter(function(a){return!isNaN(a)}).map(function(a){return parseInt(a,10)})};
+i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedCallingCodes=function(){var a=Object.keys(i18n.phonenumbers.metadata.countryCodeToRegionCodeMap);return[].concat($jscomp.arrayFromIterable(this.getSupportedGlobalNetworkCallingCodes()),$jscomp.arrayFromIterable(a.map(function(b){return parseInt(b,10)})))};i18n.phonenumbers.PhoneNumberUtil.descHasPossibleNumberData_=function(a){return null!=a&&(1!=a.possibleLengthCount()||-1!=a.possibleLengthArray()[0])};
i18n.phonenumbers.PhoneNumberUtil.descHasData_=function(a){return null!=a&&(a.hasExampleNumber()||i18n.phonenumbers.PhoneNumberUtil.descHasPossibleNumberData_(a)||a.hasNationalNumberPattern())};
i18n.phonenumbers.PhoneNumberUtil.getSupportedTypesForMetadata_=function(a){var b=[];goog.object.forEach(i18n.phonenumbers.PhoneNumberType,function(c){if(c!=i18n.phonenumbers.PhoneNumberType.FIXED_LINE_OR_MOBILE&&c!=i18n.phonenumbers.PhoneNumberType.UNKNOWN){var d=i18n.phonenumbers.PhoneNumberUtil.getNumberDescByType_(a,c);i18n.phonenumbers.PhoneNumberUtil.descHasData_(d)&&b.push(c)}});return b};
i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedTypesForRegion=function(a){return this.isValidRegionCode_(a)?i18n.phonenumbers.PhoneNumberUtil.getSupportedTypesForMetadata_(this.getMetadataForRegion(a)):[]};i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedTypesForNonGeoEntity=function(a){a=this.getMetadataForNonGeographicalRegion(a);return null==a?[]:i18n.phonenumbers.PhoneNumberUtil.getSupportedTypesForMetadata_(a)};
i18n.phonenumbers.PhoneNumberUtil.normalizeHelper_=function(a,b,c){for(var d=new goog.string.StringBuffer,e,f,g=a.length,h=0;ha?i18n.phonenumbers.PhoneNumberUtil.ValidationResult.TOO_SHORT:e[e.length-1]a?i18n.phonenumbers.PhoneNumberUtil.ValidationResult.TOO_SHORT:e[e.length-1]
+
diff --git a/libphonenumber_plugin/example/android/app/src/main/AndroidManifest.xml b/libphonenumber_plugin/example/android/app/src/main/AndroidManifest.xml
index b0e43b9..14d0a9d 100644
--- a/libphonenumber_plugin/example/android/app/src/main/AndroidManifest.xml
+++ b/libphonenumber_plugin/example/android/app/src/main/AndroidManifest.xml
@@ -1,35 +1,35 @@
-
+ package="example.com">
+
+
+ android:name="io.flutter.embedding.android.NormalTheme"
+ android:resource="@style/NormalTheme" />
+ android:name="io.flutter.embedding.android.SplashScreenDrawable"
+ android:resource="@drawable/launch_background" />
-
-
+
+
diff --git a/libphonenumber_plugin/example/android/build.gradle b/libphonenumber_plugin/example/android/build.gradle
index c9e3db0..3593d96 100644
--- a/libphonenumber_plugin/example/android/build.gradle
+++ b/libphonenumber_plugin/example/android/build.gradle
@@ -1,18 +1,18 @@
buildscript {
repositories {
google()
- jcenter()
+ mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.1.0'
+ classpath 'com.android.tools.build:gradle:7.3.1'
}
}
allprojects {
repositories {
google()
- jcenter()
+ mavenCentral()
}
}
diff --git a/libphonenumber_plugin/example/android/gradle/wrapper/gradle-wrapper.properties b/libphonenumber_plugin/example/android/gradle/wrapper/gradle-wrapper.properties
index bc6a58a..cc5527d 100644
--- a/libphonenumber_plugin/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/libphonenumber_plugin/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/libphonenumber_plugin/example/ios/Flutter/AppFrameworkInfo.plist b/libphonenumber_plugin/example/ios/Flutter/AppFrameworkInfo.plist
index 9367d48..9625e10 100644
--- a/libphonenumber_plugin/example/ios/Flutter/AppFrameworkInfo.plist
+++ b/libphonenumber_plugin/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
CFBundleVersion
1.0
MinimumOSVersion
- 8.0
+ 11.0
diff --git a/libphonenumber_plugin/example/ios/Podfile b/libphonenumber_plugin/example/ios/Podfile
index 1e8c3c9..88359b2 100644
--- a/libphonenumber_plugin/example/ios/Podfile
+++ b/libphonenumber_plugin/example/ios/Podfile
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/libphonenumber_plugin/example/ios/Podfile.lock b/libphonenumber_plugin/example/ios/Podfile.lock
index 16408aa..0e2c9be 100644
--- a/libphonenumber_plugin/example/ios/Podfile.lock
+++ b/libphonenumber_plugin/example/ios/Podfile.lock
@@ -1,37 +1,34 @@
PODS:
- Flutter (1.0.0)
- - libphonenumber (0.0.1):
- - Flutter
- - libPhoneNumber-iOS
- - libPhoneNumber-iOS (0.9.15)
- libphonenumber_plugin (0.0.1):
- Flutter
- - libphonenumber
- - libPhoneNumber-iOS
+ - PhoneNumberKit
+ - PhoneNumberKit (3.3.4):
+ - PhoneNumberKit/PhoneNumberKitCore (= 3.3.4)
+ - PhoneNumberKit/UIKit (= 3.3.4)
+ - PhoneNumberKit/PhoneNumberKitCore (3.3.4)
+ - PhoneNumberKit/UIKit (3.3.4):
+ - PhoneNumberKit/PhoneNumberKitCore
DEPENDENCIES:
- Flutter (from `Flutter`)
- - libphonenumber (from `.symlinks/plugins/libphonenumber/ios`)
- libphonenumber_plugin (from `.symlinks/plugins/libphonenumber_plugin/ios`)
SPEC REPOS:
trunk:
- - libPhoneNumber-iOS
+ - PhoneNumberKit
EXTERNAL SOURCES:
Flutter:
:path: Flutter
- libphonenumber:
- :path: ".symlinks/plugins/libphonenumber/ios"
libphonenumber_plugin:
:path: ".symlinks/plugins/libphonenumber_plugin/ios"
SPEC CHECKSUMS:
- Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
- libphonenumber: bd14d5abfc5939ab0b0767234e2d8e2593af258e
- libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
- libphonenumber_plugin: 7cf755ad1656145935d6c208173a476bd3f12898
+ Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+ libphonenumber_plugin: e8a7d64a6624a7c25f2c4ab0b7ead2a8e341e35e
+ PhoneNumberKit: 441e8b26ec88d598e3591de9061eff18f5dd12e8
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.3
diff --git a/libphonenumber_plugin/example/ios/Runner.xcodeproj/project.pbxproj b/libphonenumber_plugin/example/ios/Runner.xcodeproj/project.pbxproj
index 35d05d1..5d58675 100644
--- a/libphonenumber_plugin/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/libphonenumber_plugin/example/ios/Runner.xcodeproj/project.pbxproj
@@ -155,7 +155,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 1020;
+ LastUpgradeCheck = 1300;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
@@ -339,7 +339,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -358,6 +358,7 @@
DEVELOPMENT_TEAM = AQV87U3M66;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -417,7 +418,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -466,7 +467,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -487,6 +488,7 @@
DEVELOPMENT_TEAM = AQV87U3M66;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -510,6 +512,7 @@
DEVELOPMENT_TEAM = AQV87U3M66;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
diff --git a/libphonenumber_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/libphonenumber_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index a28140c..3db53b6 100644
--- a/libphonenumber_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/libphonenumber_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
-
+
+
+
-
+
+
@@ -14,13 +16,14 @@
-
+
-
+
+
diff --git a/libphonenumber_plugin/example/ios/Runner/Info.plist b/libphonenumber_plugin/example/ios/Runner/Info.plist
index 13f4d65..32979e8 100644
--- a/libphonenumber_plugin/example/ios/Runner/Info.plist
+++ b/libphonenumber_plugin/example/ios/Runner/Info.plist
@@ -41,5 +41,7 @@
UIViewControllerBasedStatusBarAppearance
+ CADisableMinimumFrameDurationOnPhone
+
diff --git a/libphonenumber_plugin/example/lib/main.dart b/libphonenumber_plugin/example/lib/main.dart
index be1c257..e90075e 100644
--- a/libphonenumber_plugin/example/lib/main.dart
+++ b/libphonenumber_plugin/example/lib/main.dart
@@ -24,13 +24,16 @@ class _MyAppState extends State {
Future initPlatformState() async {
try {
- String phoneNumber = '+2347082286079';
- String regionCode = 'NG';
+ String phoneNumber = '+212700000000';
+ String regionCode = 'MA';
var formattedNumber =
- await PhoneNumberUtil.normalizePhoneNumber(phoneNumber, regionCode);
+ await PhoneNumberUtil.formatAsYouType(phoneNumber, regionCode);
+
+ var valid = await PhoneNumberUtil.isValidPhoneNumber(phoneNumber, regionCode);
print('\n\n\n Output ==>> $formattedNumber \n\n\n');
+ print('\n\n\n Output Valid ==>> $valid \n\n\n');
} on PlatformException catch (e) {
print('\n\n\n PLATFORM EXCEPTION: \n\n\n $e \n\n\n');
}
diff --git a/libphonenumber_plugin/example/pubspec.lock b/libphonenumber_plugin/example/pubspec.lock
index 225d473..feef30f 100644
--- a/libphonenumber_plugin/example/pubspec.lock
+++ b/libphonenumber_plugin/example/pubspec.lock
@@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
- version: "2.8.1"
+ version: "2.9.0"
boolean_selector:
dependency: transitive
description:
@@ -21,28 +21,21 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
- charcode:
- dependency: transitive
- description:
- name: charcode
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.3.1"
+ version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
- version: "1.15.0"
+ version: "1.16.0"
cupertino_icons:
dependency: "direct main"
description:
@@ -56,7 +49,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.3.1"
flutter:
dependency: "direct main"
description: flutter
@@ -78,14 +71,7 @@ packages:
name: js
url: "https://pub.dartlang.org"
source: hosted
- version: "0.6.3"
- libphonenumber:
- dependency: transitive
- description:
- name: libphonenumber
- url: "https://pub.dartlang.org"
- source: hosted
- version: "2.0.2"
+ version: "0.6.4"
libphonenumber_platform_interface:
dependency: transitive
description:
@@ -113,21 +99,28 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.10"
+ version: "0.12.12"
+ material_color_utilities:
+ dependency: transitive
+ description:
+ name: material_color_utilities
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.1.5"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
- version: "1.7.0"
+ version: "1.8.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.0"
+ version: "1.8.2"
plugin_platform_interface:
dependency: transitive
description:
@@ -146,7 +139,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.1"
+ version: "1.9.0"
stack_trace:
dependency: transitive
description:
@@ -167,35 +160,28 @@ packages:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.2"
- typed_data:
- dependency: transitive
- description:
- name: typed_data
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.3.0"
+ version: "0.4.12"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0"
+ version: "2.1.2"
sdks:
- dart: ">=2.12.0 <3.0.0"
- flutter: ">=2.0.0"
+ dart: ">=2.17.0-0 <3.0.0"
+ flutter: ">=1.20.0"
diff --git a/libphonenumber_plugin/example/web/icons/Icon-maskable-192.png b/libphonenumber_plugin/example/web/icons/Icon-maskable-192.png
new file mode 100644
index 0000000..eb9b4d7
Binary files /dev/null and b/libphonenumber_plugin/example/web/icons/Icon-maskable-192.png differ
diff --git a/libphonenumber_plugin/example/web/icons/Icon-maskable-512.png b/libphonenumber_plugin/example/web/icons/Icon-maskable-512.png
new file mode 100644
index 0000000..d69c566
Binary files /dev/null and b/libphonenumber_plugin/example/web/icons/Icon-maskable-512.png differ
diff --git a/libphonenumber_plugin/ios/Classes/SwiftLibphonenumberPlugin.swift b/libphonenumber_plugin/ios/Classes/SwiftLibphonenumberPlugin.swift
index fbc46af..503c879 100644
--- a/libphonenumber_plugin/ios/Classes/SwiftLibphonenumberPlugin.swift
+++ b/libphonenumber_plugin/ios/Classes/SwiftLibphonenumberPlugin.swift
@@ -1,98 +1,85 @@
import Flutter
import UIKit
-import libphonenumber
-import libPhoneNumber_iOS
+import PhoneNumberKit
public class SwiftLibphonenumberPlugin: NSObject, FlutterPlugin {
- let libphonenumber : LibphonenumberPlugin = LibphonenumberPlugin()
-
- public static func register(with registrar: FlutterPluginRegistrar) {
- let channel = FlutterMethodChannel(name: "plugin.libphonenumber", binaryMessenger: registrar.messenger())
+ let phoneNumberKit: PhoneNumberKit = PhoneNumberKit()
+
+ public static func register(with registrar: FlutterPluginRegistrar) {
+ let channel = FlutterMethodChannel(name: "plugin.libphonenumber", binaryMessenger: registrar.messenger())
+
+ let instance = SwiftLibphonenumberPlugin()
+ registrar.addMethodCallDelegate(instance, channel: channel)
+ }
- let instance = SwiftLibphonenumberPlugin()
- registrar.addMethodCallDelegate(instance, channel: channel)
- }
-
- public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
- switch call.method {
- case "isValidPhoneNumber":
- isValidPhoneNumber(call: call, result: result)
- break
- case "normalizePhoneNumber":
- normalizePhoneNumber(call: call, result: result)
- break
- case "getRegionInfo":
- getRegionInfo(call: call, result: result)
- break
- case "getNumberType":
- getNumberType(call: call, result: result)
- break
- case "formatAsYouType":
- formatAsYouType(call: call, result: result)
- break
- case "getNameForNumber":
- getNameForNumber(call: call, result: result)
- break
- default:
- result(FlutterMethodNotImplemented)
+ public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+ switch call.method {
+ case "isValidPhoneNumber":
+ isValidPhoneNumber(call: call, result: result)
+ break
+ case "normalizePhoneNumber":
+ normalizePhoneNumber(call: call, result: result)
+ break
+ case "getRegionInfo":
+ getRegionInfo(call: call, result: result)
+ break
+ case "getNumberType":
+ getNumberType(call: call, result: result)
+ break
+ case "formatAsYouType":
+ formatAsYouType(call: call, result: result)
+ break
+ case "getNameForNumber":
+ getNameForNumber(call: call, result: result)
+ break
+ default:
+ result(FlutterMethodNotImplemented)
+ }
}
- }
func isValidPhoneNumber(call: FlutterMethodCall, result: @escaping FlutterResult) {
- let arguments = call.arguments as! Dictionary
- let phoneNumber = arguments["phoneNumber"] as! String
- let isoCode = arguments["isoCode"] as! String
+ let arguments = call.arguments as! Dictionary
+ let phoneNumber = arguments["phoneNumber"] as! String
+ let isoCode = arguments["isoCode"] as! String
+ let isValid: Bool = phoneNumberKit.isValidPhoneNumber(phoneNumber, withRegion: isoCode.uppercased(), ignoreType: true)
- let phoneUtils : NBPhoneNumberUtil = NBPhoneNumberUtil()
+ result(isValid)
- do {
- let p : NBPhoneNumber = try phoneUtils.parse(phoneNumber, defaultRegion: isoCode.uppercased())
-
- let isValid : Bool = phoneUtils.isValidNumber(p)
-
- result(isValid)
- } catch let error as NSError {
- result(FlutterError(code: "\(error.code)", message: error.localizedDescription, details: nil))
- }
- }
+ }
func normalizePhoneNumber(call: FlutterMethodCall, result: @escaping FlutterResult) {
- let arguments = call.arguments as! Dictionary
- let phoneNumber = arguments["phoneNumber"] as! String
- let isoCode = arguments["isoCode"] as! String
-
-
- let phoneUtils : NBPhoneNumberUtil = NBPhoneNumberUtil()
+ let arguments = call.arguments as! Dictionary
+ let phoneNumber = arguments["phoneNumber"] as! String
+ let isoCode = arguments["isoCode"] as! String
do {
- let p : NBPhoneNumber = try phoneUtils.parse(phoneNumber, defaultRegion: isoCode.uppercased())
+ let p: PhoneNumber = try phoneNumberKit.parse(phoneNumber, withRegion: isoCode.uppercased(), ignoreType: true)
- let normalized : String = try phoneUtils.format(p, numberFormat: NBEPhoneNumberFormat.E164)
+ let normalized: String = phoneNumberKit.format(p, toType: PhoneNumberFormat.e164)
result(normalized)
} catch let error as NSError {
result(FlutterError(code: "\(error.code)", message: error.localizedDescription, details: nil))
}
- }
+ }
func getRegionInfo(call: FlutterMethodCall, result: @escaping FlutterResult) {
- let arguments = call.arguments as! Dictionary
- let phoneNumber = arguments["phoneNumber"] as! String
- let isoCode = arguments["isoCode"] as! String
-
-
- let phoneUtils : NBPhoneNumberUtil = NBPhoneNumberUtil()
+ let arguments = call.arguments as! Dictionary
+ let phoneNumber = arguments["phoneNumber"] as! String
+ let isoCode = arguments["isoCode"] as! String
do {
- let p : NBPhoneNumber = try phoneUtils.parse(phoneNumber, defaultRegion: isoCode.uppercased())
- let regionCode : String? = phoneUtils.getRegionCode(for: p)
- let countryCode : String? = p.countryCode.stringValue as String
- let formattedNumber : String? = try phoneUtils.format(p, numberFormat: NBEPhoneNumberFormat.NATIONAL)
+ let p: PhoneNumber = try phoneNumberKit.parse(phoneNumber, withRegion: isoCode.uppercased(), ignoreType: true)
+
+ let regionCode: String? = phoneNumberKit.getRegionCode(of: p)
+ let countryCode: String? = phoneNumberKit.mainCountry(forCode: p.countryCode)
+ let formattedNumber: String? = phoneNumberKit.format(p, toType: PhoneNumberFormat.national)
+
let data : Dictionary = ["isoCode": regionCode, "regionCode" : countryCode, "formattedPhoneNumber" : formattedNumber]
@@ -100,75 +87,71 @@ public class SwiftLibphonenumberPlugin: NSObject, FlutterPlugin {
} catch let error as NSError {
result(FlutterError(code: "\(error.code)", message: error.localizedDescription, details: nil))
}
- }
+ }
func getNumberType(call: FlutterMethodCall, result: @escaping FlutterResult) {
- let arguments = call.arguments as! Dictionary
- let phoneNumber = arguments["phoneNumber"] as! String
- let isoCode = arguments["isoCode"] as! String
-
-
- let phoneUtils : NBPhoneNumberUtil = NBPhoneNumberUtil()
+ let arguments = call.arguments as! Dictionary
+ let phoneNumber = arguments["phoneNumber"] as! String
+ let isoCode = arguments["isoCode"] as! String
do {
- let p : NBPhoneNumber = try phoneUtils.parse(phoneNumber, defaultRegion: isoCode.uppercased())
+ let p: PhoneNumber = try phoneNumberKit.parse(phoneNumber, withRegion: isoCode.uppercased(), ignoreType: false)
- let t : NBEPhoneNumberType = phoneUtils.getNumberType(p)
+ let t: PhoneNumberType = p.type
- let value : Int = t.rawValue
-
- result(value)
+ switch t {
+ case .fixedLine:
+ result(0)
+ case .mobile:
+ result(1)
+ case .fixedOrMobile:
+ result(2)
+ case .tollFree:
+ result(3)
+ case .premiumRate:
+ result(4)
+ case .sharedCost:
+ result(5)
+ case .voip:
+ result(6)
+ case .personalNumber:
+ result(7)
+ case .pager:
+ result(8)
+ case .uan:
+ result(9)
+ case .voicemail:
+ result(10)
+ case .unknown:
+ result(-1)
+ case .notParsed:
+ result(-1)
+ }
} catch let error as NSError {
result(FlutterError(code: "\(error.code)", message: error.localizedDescription, details: nil))
}
- }
-
-
- func formatAsYouType(call: FlutterMethodCall, result: @escaping FlutterResult) {
- let arguments = call.arguments as! Dictionary
- let phoneNumber = arguments["phoneNumber"] as! String
- let isoCode = arguments["isoCode"] as! String
-
- let asYouTypeFormatter : NBAsYouTypeFormatter = NBAsYouTypeFormatter(regionCode: isoCode.uppercased())
-
- var formattedNumber: String?
-
- for i in phoneNumber {
- formattedNumber = asYouTypeFormatter.inputDigit(String(i))
- }
-
- result(formattedNumber)
}
-
- func getNameForNumber(call: FlutterMethodCall, result: @escaping FlutterResult) {
+ func formatAsYouType(call: FlutterMethodCall, result: @escaping FlutterResult) {
let arguments = call.arguments as! Dictionary
let phoneNumber = arguments["phoneNumber"] as! String
let isoCode = arguments["isoCode"] as! String
-
-
- let phoneUtils : NBPhoneNumberUtil = NBPhoneNumberUtil()
-
- do {
- let _ : NBPhoneNumber = try phoneUtils.parse(phoneNumber, defaultRegion: isoCode.uppercased())
- result(FlutterMethodNotImplemented)
- } catch let error as NSError {
- result(FlutterError(code: "\(error.code)", message: error.localizedDescription, details: nil))
- }
+ let partialFormatter: PartialFormatter = PartialFormatter(phoneNumberKit: phoneNumberKit, defaultRegion: isoCode.uppercased())
+
+ let formattedNumber = partialFormatter.formatPartial(phoneNumber)
+
+ result(formattedNumber)
}
- func onDirectMethodCall(call: FlutterMethodCall, result: @escaping FlutterResult) {
+ // TODO: Depreciated.
+ // There is no valid way to get carrier information on iOS
+ func getNameForNumber(call: FlutterMethodCall, result: @escaping FlutterResult) {
let arguments = call.arguments as! Dictionary
let phoneNumber = arguments["phoneNumber"] as! String
let isoCode = arguments["isoCode"] as! String
- let data:[String:String] = ["phone_number": phoneNumber, "iso_code": isoCode]
-
- let methodCall:FlutterMethodCall = FlutterMethodCall(methodName: call.method, arguments: data)
-
- libphonenumber.handle(methodCall, result: result)
- return
+ result(FlutterMethodNotImplemented)
}
}
diff --git a/libphonenumber_plugin/ios/libphonenumber_plugin.podspec b/libphonenumber_plugin/ios/libphonenumber_plugin.podspec
index b8dc001..ff10cfd 100644
--- a/libphonenumber_plugin/ios/libphonenumber_plugin.podspec
+++ b/libphonenumber_plugin/ios/libphonenumber_plugin.podspec
@@ -15,10 +15,9 @@ A new flutter plugin project.
s.source = { :path => '.' }
s.source_files = 'Classes/**/*'
s.dependency 'Flutter'
- s.dependency 'libphonenumber'
- s.dependency 'libPhoneNumber-iOS'
+ s.dependency 'PhoneNumberKit'
- s.platform = :ios, '8.0'
+ s.platform = :ios, '11.0'
# Flutter.framework does not contain a i386 slice.
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
diff --git a/libphonenumber_plugin/lib/js/libphonenumber.js b/libphonenumber_plugin/lib/js/libphonenumber.js
index b4ab572..5cebcde 100644
--- a/libphonenumber_plugin/lib/js/libphonenumber.js
+++ b/libphonenumber_plugin/lib/js/libphonenumber.js
@@ -5,19 +5,23 @@
Copyright The Closure Library Authors.
SPDX-License-Identifier: Apache-2.0
*/
-var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.createTemplateTagFirstArg=function(a){return a.raw=a};$jscomp.createTemplateTagFirstArgWithRaw=function(a,b){a.raw=b;return a};$jscomp.checkStringArgs=function(a,b,c){if(null==a)throw new TypeError("The 'this' value for String.prototype."+c+" must not be null or undefined");if(b instanceof RegExp)throw new TypeError("First argument to String.prototype."+c+" must not be a regular expression");return a+""};$jscomp.ASSUME_ES5=!1;
-$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.SIMPLE_FROUND_POLYFILL=!1;$jscomp.ISOLATE_POLYFILLS=!1;$jscomp.FORCE_POLYFILL_PROMISE=!1;$jscomp.FORCE_POLYFILL_PROMISE_WHEN_NO_UNHANDLED_REJECTION=!1;$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(a,b,c){if(a==Array.prototype||a==Object.prototype)return a;a[b]=c.value;return a};
+var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.createTemplateTagFirstArg=function(a){return a.raw=a};$jscomp.createTemplateTagFirstArgWithRaw=function(a,b){a.raw=b;return a};$jscomp.arrayIteratorImpl=function(a){var b=0;return function(){return b=e}},"es6","es3");
-$jscomp.findInternal=function(a,b,c){a instanceof String&&(a=String(a));for(var d=a.length,e=0;e=f}},"es6","es3");
-$jscomp.polyfill("String.prototype.repeat",function(a){return a?a:function(b){var c=$jscomp.checkStringArgs(this,null,"repeat");if(0>b||1342177279>>=1)c+=c;return d}},"es6","es3");$jscomp.arrayIteratorImpl=function(a){var b=0;return function(){return b=f}},"es6","es3");
+$jscomp.polyfill("String.prototype.repeat",function(a){return a?a:function(b){var c=$jscomp.checkStringArgs(this,null,"repeat");if(0>b||1342177279>>=1)c+=c;return d}},"es6","es3");$jscomp.initSymbol=function(){};
$jscomp.polyfill("Symbol",function(a){if(a)return a;var b=function(e,f){this.$jscomp$symbol$id_=e;$jscomp.defineProperty(this,"description",{configurable:!0,writable:!0,value:f})};b.prototype.toString=function(){return this.$jscomp$symbol$id_};var c=0,d=function(e){if(this instanceof d)throw new TypeError("Symbol is not a constructor");return new b("jscomp_symbol_"+(e||"")+"_"+c++,e)};return d},"es6","es3");
$jscomp.polyfill("Symbol.iterator",function(a){if(a)return a;a=Symbol("Symbol.iterator");for(var b="Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array".split(" "),c=0;cc&&(c=Math.max(c+e,0));c=b.length?0:this.getNumberType(a)==i18n.phonenumbers.PhoneNumberType.MOBILE&&(a=i18n.phonenumbers.PhoneNumberUtil.getCountryMobileToken(a.getCountryCodeOrDefault()),""!=a)?b[2].length+
-a.length:b[1].length};i18n.phonenumbers.PhoneNumberUtil.getCountryMobileToken=function(a){return i18n.phonenumbers.PhoneNumberUtil.MOBILE_TOKEN_MAPPINGS_[a]||""};i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedRegions=function(){return module$contents$goog$array_filter(Object.keys(i18n.phonenumbers.metadata.countryToMetadata),function(a){return isNaN(a)})};
-i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedGlobalNetworkCallingCodes=function(){var a=module$contents$goog$array_filter(Object.keys(i18n.phonenumbers.metadata.countryToMetadata),function(b){return!isNaN(b)});return module$contents$goog$array_map(a,function(b){return parseInt(b,10)})};
-i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedCallingCodes=function(){var a=Object.keys(i18n.phonenumbers.metadata.countryCodeToRegionCodeMap);return module$contents$goog$array_join(this.getSupportedGlobalNetworkCallingCodes(),module$contents$goog$array_map(a,function(b){return parseInt(b,10)}))};i18n.phonenumbers.PhoneNumberUtil.descHasPossibleNumberData_=function(a){return null!=a&&(1!=a.possibleLengthCount()||-1!=a.possibleLengthArray()[0])};
+a.length:b[1].length};i18n.phonenumbers.PhoneNumberUtil.getCountryMobileToken=function(a){return i18n.phonenumbers.PhoneNumberUtil.MOBILE_TOKEN_MAPPINGS_[a]||""};i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedRegions=function(){return Object.keys(i18n.phonenumbers.metadata.countryToMetadata).filter(function(a){return isNaN(a)})};
+i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedGlobalNetworkCallingCodes=function(){return Object.keys(i18n.phonenumbers.metadata.countryToMetadata).filter(function(a){return!isNaN(a)}).map(function(a){return parseInt(a,10)})};
+i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedCallingCodes=function(){var a=Object.keys(i18n.phonenumbers.metadata.countryCodeToRegionCodeMap);return[].concat($jscomp.arrayFromIterable(this.getSupportedGlobalNetworkCallingCodes()),$jscomp.arrayFromIterable(a.map(function(b){return parseInt(b,10)})))};i18n.phonenumbers.PhoneNumberUtil.descHasPossibleNumberData_=function(a){return null!=a&&(1!=a.possibleLengthCount()||-1!=a.possibleLengthArray()[0])};
i18n.phonenumbers.PhoneNumberUtil.descHasData_=function(a){return null!=a&&(a.hasExampleNumber()||i18n.phonenumbers.PhoneNumberUtil.descHasPossibleNumberData_(a)||a.hasNationalNumberPattern())};
i18n.phonenumbers.PhoneNumberUtil.getSupportedTypesForMetadata_=function(a){var b=[];goog.object.forEach(i18n.phonenumbers.PhoneNumberType,function(c){if(c!=i18n.phonenumbers.PhoneNumberType.FIXED_LINE_OR_MOBILE&&c!=i18n.phonenumbers.PhoneNumberType.UNKNOWN){var d=i18n.phonenumbers.PhoneNumberUtil.getNumberDescByType_(a,c);i18n.phonenumbers.PhoneNumberUtil.descHasData_(d)&&b.push(c)}});return b};
i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedTypesForRegion=function(a){return this.isValidRegionCode_(a)?i18n.phonenumbers.PhoneNumberUtil.getSupportedTypesForMetadata_(this.getMetadataForRegion(a)):[]};i18n.phonenumbers.PhoneNumberUtil.prototype.getSupportedTypesForNonGeoEntity=function(a){a=this.getMetadataForNonGeographicalRegion(a);return null==a?[]:i18n.phonenumbers.PhoneNumberUtil.getSupportedTypesForMetadata_(a)};
i18n.phonenumbers.PhoneNumberUtil.normalizeHelper_=function(a,b,c){for(var d=new goog.string.StringBuffer,e,f,g=a.length,h=0;ha?i18n.phonenumbers.PhoneNumberUtil.ValidationResult.TOO_SHORT:e[e.length-1]a?i18n.phonenumbers.PhoneNumberUtil.ValidationResult.TOO_SHORT:e[e.length-1]=2.12.0 <3.0.0"
- flutter: ">=2.0.0"
+ dart: ">=2.17.0-0 <3.0.0"
+ flutter: ">=1.20.0"
diff --git a/libphonenumber_plugin/pubspec.yaml b/libphonenumber_plugin/pubspec.yaml
index b82b50e..90375ae 100644
--- a/libphonenumber_plugin/pubspec.yaml
+++ b/libphonenumber_plugin/pubspec.yaml
@@ -17,8 +17,6 @@ dependencies:
libphonenumber_web: ^0.2.0+1
- libphonenumber: ^2.0.2
-
dev_dependencies:
flutter_test:
sdk: flutter
diff --git a/libphonenumber_web/.idea/libraries/Dart_Packages.xml b/libphonenumber_web/.idea/libraries/Dart_Packages.xml
index 8a2f19f..28d1ad2 100644
--- a/libphonenumber_web/.idea/libraries/Dart_Packages.xml
+++ b/libphonenumber_web/.idea/libraries/Dart_Packages.xml
@@ -5,206 +5,198 @@
-
+
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libphonenumber_web/.idea/libraries/Dart_SDK.xml b/libphonenumber_web/.idea/libraries/Dart_SDK.xml
index e450131..41e82d7 100644
--- a/libphonenumber_web/.idea/libraries/Dart_SDK.xml
+++ b/libphonenumber_web/.idea/libraries/Dart_SDK.xml
@@ -1,26 +1,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libphonenumber_web/.idea/workspace.xml b/libphonenumber_web/.idea/workspace.xml
index 3bbad6e..b9e95c4 100644
--- a/libphonenumber_web/.idea/workspace.xml
+++ b/libphonenumber_web/.idea/workspace.xml
@@ -1,5 +1,8 @@
+
+
+
@@ -20,17 +23,11 @@
-
-
-
-
-
-
-
-
+
+
+
-
@@ -40,6 +37,9 @@
+
+
+
@@ -49,11 +49,14 @@
+
+
-
+
+
@@ -77,7 +80,6 @@
-
diff --git a/libphonenumber_web/libphonenumber_web.iml b/libphonenumber_web/libphonenumber_web.iml
index 30e17ca..6d23324 100644
--- a/libphonenumber_web/libphonenumber_web.iml
+++ b/libphonenumber_web/libphonenumber_web.iml
@@ -13,8 +13,8 @@
-
+
\ No newline at end of file
diff --git a/libphonenumber_web/pubspec.lock b/libphonenumber_web/pubspec.lock
index 677564f..5bf75a0 100644
--- a/libphonenumber_web/pubspec.lock
+++ b/libphonenumber_web/pubspec.lock
@@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
- version: "2.8.1"
+ version: "2.9.0"
boolean_selector:
dependency: transitive
description:
@@ -21,35 +21,28 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
- charcode:
- dependency: transitive
- description:
- name: charcode
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.3.1"
+ version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
- version: "1.15.0"
+ version: "1.16.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.3.1"
flutter:
dependency: "direct main"
description: flutter
@@ -71,7 +64,7 @@ packages:
name: js
url: "https://pub.dartlang.org"
source: hosted
- version: "0.6.3"
+ version: "0.6.4"
libphonenumber_platform_interface:
dependency: "direct main"
description:
@@ -85,21 +78,28 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.10"
+ version: "0.12.12"
+ material_color_utilities:
+ dependency: transitive
+ description:
+ name: material_color_utilities
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.1.5"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
- version: "1.7.0"
+ version: "1.8.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.0"
+ version: "1.8.2"
plugin_platform_interface:
dependency: transitive
description:
@@ -118,7 +118,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.1"
+ version: "1.9.0"
stack_trace:
dependency: transitive
description:
@@ -139,35 +139,28 @@ packages:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.2"
- typed_data:
- dependency: transitive
- description:
- name: typed_data
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.3.0"
+ version: "0.4.12"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0"
+ version: "2.1.2"
sdks:
- dart: ">=2.12.0 <3.0.0"
+ dart: ">=2.17.0-0 <3.0.0"
flutter: ">=1.20.0"