diff --git a/example/lib/main.dart b/example/lib/main.dart index 5f7c163..1ba6476 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -16,12 +16,10 @@ class MyApp extends StatelessWidget { return MaterialApp( title: 'Flutter Demo', // Locale config required by form_builder_validators - // https://github.com/danvick/flutter_form_builder/blob/master/packages/form_builder_validators/example/lib/main.dart - supportedLocales: const [...FormBuilderLocalizations.supportedLocales], + // https://github.com/flutter-form-builder-ecosystem/form_builder_validators/blob/main/example/lib/main.dart supportedLocales: const [...FormBuilderLocalizations.supportedLocales], localizationsDelegates: const [ GlobalMaterialLocalizations.delegate, GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, FormBuilderLocalizations.delegate, ], theme: ThemeData( diff --git a/example/pubspec.lock b/example/pubspec.lock index 3b35145..d7807d2 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -115,18 +115,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -155,18 +155,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" path: dependency: transitive description: @@ -175,14 +175,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" - phone_number: + phone_numbers_parser: dependency: transitive description: - name: phone_number - sha256: c66d3e2f2c69ce95f10bb923957049b1e5b8c6efea02d7366353fa3b80d4338a + name: phone_numbers_parser + sha256: "62451b689d842791ed1fd5dc9eacf36ffa8bad23a78ad6cde732dc2fb222fae2" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "8.3.0" sky_engine: dependency: transitive description: flutter @@ -232,10 +232,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" vector_math: dependency: transitive description: @@ -248,10 +248,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.4" sdks: dart: ">=3.4.0 <4.0.0" flutter: ">=3.22.0" diff --git a/lib/src/form_builder_phone_field.dart b/lib/src/form_builder_phone_field.dart index 102785d..03eccc2 100644 --- a/lib/src/form_builder_phone_field.dart +++ b/lib/src/form_builder_phone_field.dart @@ -5,7 +5,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart'; -import 'package:phone_number/phone_number.dart'; +import 'package:phone_numbers_parser/phone_numbers_parser.dart'; //TODO: Switch country_pickers for country_code_picker /// Field for international phone number input. @@ -344,12 +344,15 @@ class _FormBuilderPhoneFieldState final phone = newPhone ?? initialValue ?? ''; if (phone.isNotEmpty) { try { - final parseResult = await PhoneNumberUtil().parse(phone); + final parseResult = PhoneNumber.parse( + phone, + callerCountry: IsoCode.fromJson(_selectedDialogCountry.isoCode), + ); setState(() { - _selectedDialogCountry = - CountryPickerUtils.getCountryByIsoCode(parseResult.regionCode); + _selectedDialogCountry = CountryPickerUtils.getCountryByIsoCode( + parseResult.isoCode.toJson()); }); - _effectiveController.text = parseResult.nationalNumber; + _effectiveController.text = parseResult.nsn; } catch (error) { if (phone.contains('+')) { _effectiveController.text = phone.replaceFirst('+', ''); diff --git a/pubspec.lock b/pubspec.lock index a64189e..3940a91 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -74,10 +74,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "4.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -95,18 +95,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -119,10 +119,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "4.0.0" matcher: dependency: transitive description: @@ -135,18 +135,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" path: dependency: transitive description: @@ -155,14 +155,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" - phone_number: + phone_numbers_parser: dependency: "direct main" description: - name: phone_number - sha256: c66d3e2f2c69ce95f10bb923957049b1e5b8c6efea02d7366353fa3b80d4338a + name: phone_numbers_parser + sha256: "62451b689d842791ed1fd5dc9eacf36ffa8bad23a78ad6cde732dc2fb222fae2" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "8.3.0" sky_engine: dependency: transitive description: flutter @@ -212,10 +212,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" vector_math: dependency: transitive description: @@ -228,10 +228,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.4" sdks: dart: ">=3.4.0 <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 4cb8ea7..d465956 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,17 +8,17 @@ funding: - https://opencollective.com/flutter-form-builder-ecosystem environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.4.0 <4.0.0" flutter: ">=3.22.0" dependencies: flutter: sdk: flutter flutter_form_builder: ^9.3.0 - phone_number: ^2.1.0 country_pickers: ^3.0.1 + phone_numbers_parser: ^8.3.0 dev_dependencies: - flutter_lints: ^2.0.1 + flutter_lints: ^4.0.0 flutter_test: sdk: flutter