Migrate to dlibphonenumber

sashkent3 · sashkent3 · commit 0ca5698bcf00 · 2024-06-28T01:33:27.000+04:00
diff --git a/README.md b/README.md
@@ -12,6 +12,7 @@ A simple and customizable flutter package for inputting phone number in intl / i
 
 
 ### What's new
+  - Replace libphonenumber_plugin with dlibphonenumber
   - Updated libphonenumber and PhoneNumberToCarrierMapper on Android
   - Removed dependency on libphonenumber
   - Switch from libphonenumber-iOS to PhoneNumberKit on iOS
@@ -20,7 +21,7 @@ A simple and customizable flutter package for inputting phone number in intl / i
   
   
 ### Features
-  - Web support.
+  - Support all Flutter platforms.
   - Support for RTL languages
   - Selector mode dropdown, bottom sheet and dialog
   - As You Type Formatter: formats inputs to its selected international format
@@ -35,33 +36,6 @@ A simple and customizable flutter package for inputting phone number in intl / i
     `controller reference`.text = parsableNumber
 ```    
 
-### Web Support
-
-In your app directory, edit `web/index.html` to add the following
-
-```html
-
-<!DOCTYPE html>
-<html>
-    <head>
-        ...
-    </head>
-    <body>
-    
-        ...
-
-        <script src="assets/packages/libphonenumber_plugin/js/libphonenumber.js"></script>
-        <script src="assets/packages/libphonenumber_plugin/js/stringbuffer.js"></script>
-
-        ...
-
-        <script src="main.dart.js" type="application/javascript"></script>
-    </body>
-</html>
-```
-
-Or checkout `/example` folder from [Github](https://github.com/natintosh/intl_phone_number_input/tree/develop/example).
-
 
 ### Note
 ``` dart
@@ -195,7 +169,7 @@ Made with [contributors-img](https://contributors-img.web.app).
 
 # Dependencies
 
-* [libphonenumber](https://pub.dev/packages/libphonenumber)
+* [dlibphonenumber](https://pub.dev/packages/dlibphonenumber)
 * [equatable](https://pub.dev/packages/equatable)
 
 # Credits
diff --git a/lib/src/utils/phone_number/phone_number_util.dart b/lib/src/utils/phone_number/phone_number_util.dart
@@ -1,8 +1,9 @@
+import 'package:dlibphonenumber/dlibphonenumber.dart' as p;
 import 'package:intl_phone_number_input/src/utils/phone_number.dart';
-import 'package:libphonenumber_plugin/libphonenumber_plugin.dart' as p;
 
-/// A wrapper class [PhoneNumberUtil] that basically switch between plugin available for `Web` or `Android or IOS` and `Other platforms` when available.
 class PhoneNumberUtil {
+  static p.PhoneNumberUtil phoneUtil = p.PhoneNumberUtil.instance;
+
   /// [isValidNumber] checks if a [phoneNumber] is valid.
   /// Accepts [phoneNumber] and [isoCode]
   /// Returns [Future<bool>].
@@ -11,35 +12,41 @@ class PhoneNumberUtil {
     if (phoneNumber.length < 2) {
       return false;
     }
-    return p.PhoneNumberUtil.isValidPhoneNumber(phoneNumber, isoCode);
+    final number = phoneUtil.parse(phoneNumber, isoCode.toUpperCase());
+    return phoneUtil.isValidNumber(number);
   }
 
   /// [normalizePhoneNumber] normalizes a string of characters representing a phone number
   /// Accepts [phoneNumber] and [isoCode]
   /// Returns [Future<String>]
   static Future<String?> normalizePhoneNumber(
       {required String phoneNumber, required String isoCode}) async {
-    return p.PhoneNumberUtil.normalizePhoneNumber(phoneNumber, isoCode);
+    final number = phoneUtil.parse(phoneNumber, isoCode.toUpperCase());
+    return phoneUtil.format(number, p.PhoneNumberFormat.e164);
   }
 
   /// Accepts [phoneNumber] and [isoCode]
   /// Returns [Future<RegionInfo>] of all information available about the [phoneNumber]
   static Future<RegionInfo> getRegionInfo(
       {required String phoneNumber, required String isoCode}) async {
-    var response = await p.PhoneNumberUtil.getRegionInfo(phoneNumber, isoCode);
-
+    final number = phoneUtil.parse(phoneNumber, isoCode.toUpperCase());
+    final regionCode = phoneUtil.getRegionCodeForNumber(number);
+    final countryCode = number.countryCode.toString();
+    final formattedNumber =
+        phoneUtil.format(number, p.PhoneNumberFormat.national);
     return RegionInfo(
-        regionPrefix: response.regionPrefix,
-        isoCode: response.isoCode,
-        formattedPhoneNumber: response.formattedPhoneNumber);
+      regionPrefix: countryCode,
+      isoCode: regionCode,
+      formattedPhoneNumber: formattedNumber,
+    );
   }
 
   /// Accepts [phoneNumber] and [isoCode]
   /// Returns [Future<PhoneNumberType>] type of phone number
   static Future<PhoneNumberType> getNumberType(
       {required String phoneNumber, required String isoCode}) async {
-    final dynamic type =
-        await p.PhoneNumberUtil.getNumberType(phoneNumber, isoCode);
+    final p.PhoneNumberType type = phoneUtil
+        .getNumberType(phoneUtil.parse(phoneNumber, isoCode.toUpperCase()));
 
     return PhoneNumberTypeUtil.getType(type.index);
   }
@@ -49,7 +56,12 @@ class PhoneNumberUtil {
   /// Returns [Future<String>]
   static Future<String?> formatAsYouType(
       {required String phoneNumber, required String isoCode}) async {
-    return p.PhoneNumberUtil.formatAsYouType(phoneNumber, isoCode);
+    final asYouTypeFormatter = phoneUtil.getAsYouTypeFormatter(isoCode);
+    String? result;
+    for (int i = 0; i < phoneNumber.length; i++) {
+      result = asYouTypeFormatter.inputDigit(phoneNumber[i]);
+    }
+    return result;
   }
 }
 
@@ -138,7 +150,7 @@ extension phonenumbertypeproperties on PhoneNumberType {
         return 6;
       case PhoneNumberType.PERSONAL_NUMBER:
         return 7;
-      case PhoneNumberType.PREMIUM_RATE:
+      case PhoneNumberType.PAGER:
         return 8;
       case PhoneNumberType.UAN:
         return 9;
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  libphonenumber_plugin: ^0.3.3
+  dlibphonenumber: ^1.1.17
   equatable: ^2.0.5
   collection: ^1.18.0
 
