Skip to content

Upgrades dependencies and The Example app #72

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

Merged
merged 5 commits into from
May 17, 2025
Merged

Upgrades dependencies and The Example app #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67beae1
Upgrades Flutter FormBuilder to v9.5.0
Crucialjun Nov 15, 2024
22da58d
Fixes InputDecoration filled property
Crucialjun Nov 15, 2024
f6c2cd7
Upgrade dependencies
Crucialjun May 17, 2025
5c4221f
fix: update phone number package to phone_numbers_parser and adjust u…
Crucialjun May 17, 2025
34e8c4d
Merge branch 'main' into main
deandreamatias May 17, 2025
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
2 changes: 1 addition & 1 deletion example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
android {
namespace = "com.example.form_builder_phone_field"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion
ndkVersion = "27.0.12077973"

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand Down
3 changes: 3 additions & 0 deletions example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
4 changes: 3 additions & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
4 changes: 2 additions & 2 deletions example/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
id "com.android.application" version '8.7.2' apply false
id "org.jetbrains.kotlin.android" version "2.0.0" apply false
}

include ":app"
28 changes: 14 additions & 14 deletions example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,18 @@ packages:
dependency: "direct main"
description:
name: flutter_form_builder
sha256: "447f8808f68070f7df968e8063aada3c9d2e90e789b5b70f3b44e4b315212656"
sha256: aa3901466c70b69ae6c7f3d03fcbccaec5fde179d3fded0b10203144b546ad28
url: "https://pub.dev"
source: hosted
version: "9.3.0"
version: "10.0.1"
flutter_lints:
dependency: "direct dev"
description:
name: flutter_lints
sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
url: "https://pub.dev"
source: hosted
version: "4.0.0"
version: "5.0.0"
flutter_localizations:
dependency: "direct main"
description: flutter
Expand All @@ -99,10 +99,10 @@ packages:
dependency: "direct main"
description:
name: form_builder_validators
sha256: "475853a177bfc832ec12551f752fd0001278358a6d42d2364681ff15f48f67cf"
sha256: cd617fa346250293ff3e2709961d0faf7b80e6e4f0ff7b500126b28d7422dd67
url: "https://pub.dev"
source: hosted
version: "10.0.1"
version: "11.1.2"
intl:
dependency: transitive
description:
Expand Down Expand Up @@ -139,10 +139,10 @@ packages:
dependency: transitive
description:
name: lints
sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
url: "https://pub.dev"
source: hosted
version: "4.0.0"
version: "5.1.1"
matcher:
dependency: transitive
description:
Expand Down Expand Up @@ -175,14 +175,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.9.1"
phone_number:
phone_numbers_parser:
dependency: transitive
description:
name: phone_number
sha256: c66d3e2f2c69ce95f10bb923957049b1e5b8c6efea02d7366353fa3b80d4338a
name: phone_numbers_parser
sha256: "8aaa49708c9314d450d80767753c6512402e848138e5a91bf59ed3e0d3ac5d9b"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "9.0.3"
sky_engine:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -253,5 +253,5 @@ packages:
source: hosted
version: "14.3.1"
sdks:
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.22.0"
dart: ">=3.7.0 <4.0.0"
flutter: ">=3.29.0"
6 changes: 3 additions & 3 deletions example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ environment:
dependencies:
flutter:
sdk: flutter
flutter_form_builder: ^9.3.0
flutter_form_builder: ^10.0.1
flutter_localizations:
sdk: flutter
form_builder_phone_field:
path: ../
form_builder_validators: ^10.0.1
form_builder_validators: ^11.1.2

dev_dependencies:
flutter_lints: ^4.0.0
flutter_lints: ^5.0.0
flutter_test:
sdk: flutter

Expand Down
20 changes: 10 additions & 10 deletions lib/src/form_builder_phone_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
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.
Expand Down Expand Up @@ -243,12 +243,12 @@
style: style,
focusNode: state.effectiveFocusNode,
decoration: InputDecoration(
border: InputBorder.none,
enabledBorder: InputBorder.none,
errorBorder: InputBorder.none,
hintText: decoration.hintText,
hintStyle: decoration.hintStyle,
),
border: InputBorder.none,
enabledBorder: InputBorder.none,
errorBorder: InputBorder.none,
hintText: decoration.hintText,
hintStyle: decoration.hintStyle,
filled: false),
onChanged: (value) {
// Use setValue instead didChange to avoid parseNumber
state.setValue(value);
Expand Down Expand Up @@ -344,12 +344,12 @@
final phone = newPhone ?? initialValue ?? '';
if (phone.isNotEmpty) {
try {
final parseResult = await PhoneNumberUtil().parse(phone);
final parseResult = PhoneNumber.parse(phone);
setState(() {
_selectedDialogCountry =
CountryPickerUtils.getCountryByIsoCode(parseResult.regionCode);
CountryPickerUtils.getCountryByIsoCode(parseResult.countryCode);
});
_effectiveController.text = parseResult.nationalNumber;
_effectiveController.text = parseResult.nsn;

Check warning on line 352 in lib/src/form_builder_phone_field.dart

View check run for this annotation

Codecov / codecov/patch

lib/src/form_builder_phone_field.dart#L352 

Added line #L352 was not covered by tests
} catch (error) {
if (phone.contains('+')) {
_effectiveController.text = phone.replaceFirst('+', '');
Expand Down
28 changes: 14 additions & 14 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,18 @@ packages:
dependency: "direct main"
description:
name: flutter_form_builder
sha256: "447f8808f68070f7df968e8063aada3c9d2e90e789b5b70f3b44e4b315212656"
sha256: aa3901466c70b69ae6c7f3d03fcbccaec5fde179d3fded0b10203144b546ad28
url: "https://pub.dev"
source: hosted
version: "9.3.0"
version: "10.0.1"
flutter_lints:
dependency: "direct dev"
description:
name: flutter_lints
sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
url: "https://pub.dev"
source: hosted
version: "2.0.3"
version: "5.0.0"
flutter_test:
dependency: "direct dev"
description: flutter
Expand All @@ -87,10 +87,10 @@ packages:
dependency: transitive
description:
name: intl
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
url: "https://pub.dev"
source: hosted
version: "0.19.0"
version: "0.20.2"
leak_tracker:
dependency: transitive
description:
Expand Down Expand Up @@ -119,10 +119,10 @@ packages:
dependency: transitive
description:
name: lints
sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "5.1.1"
matcher:
dependency: transitive
description:
Expand Down Expand Up @@ -155,14 +155,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.9.1"
phone_number:
phone_numbers_parser:
dependency: "direct main"
description:
name: phone_number
sha256: c66d3e2f2c69ce95f10bb923957049b1e5b8c6efea02d7366353fa3b80d4338a
name: phone_numbers_parser
sha256: "8aaa49708c9314d450d80767753c6512402e848138e5a91bf59ed3e0d3ac5d9b"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "9.0.3"
sky_engine:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -233,5 +233,5 @@ packages:
source: hosted
version: "14.3.1"
sdks:
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.22.0"
dart: ">=3.7.0 <4.0.0"
flutter: ">=3.29.0"
6 changes: 3 additions & 3 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ environment:
dependencies:
flutter:
sdk: flutter
flutter_form_builder: ^9.3.0
phone_number: ^2.1.0
flutter_form_builder: ^10.0.1
country_pickers: ^3.0.1
phone_numbers_parser: ^9.0.3

dev_dependencies:
flutter_lints: ^2.0.1
flutter_lints: ^5.0.0
flutter_test:
sdk: flutter
Loading