Merge pull request #413 from natintosh/develop

update minimum os version on iOS
natintosh · Dec 8, 2023 · bee1d65 · bee1d65
2 parents a0c32bb + 77a0708
commit bee1d65
Show file tree

Hide file tree

Showing 16 changed files with 554 additions and 269 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,3 +72,5 @@ build/
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+.metadata
diff --git a/.pubignore b/.pubignore
@@ -73,3 +73,5 @@ build/
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+.metadata
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
+## [0.7.4]
+* Updated minimum os version on iOS
+* Updated dependencies
+
 ## [0.7.3+1]
 * Added pub example
 
-* ## [0.7.3]
+## [0.7.3]
 * Updated dependency in libphonenumber
 * Update AsYouTypeFormatter
 * Replaced `headline` with `headlineSmall` in countries_search_list_widget.dart

diff --git a/README.md b/README.md
@@ -121,7 +121,7 @@ InternationalPhoneNumberInput({
       this.autofillHints,
       this.countries
     });
-```|
+```
 
 ```dart
 SelectorConfig({
@@ -131,6 +131,7 @@ SelectorConfig({
     this.backgroundColor,
     this.countryComparator,
     this.setSelectorButtonAsPrefixIcon = false,
+    this.useBottomSheetSafeArea = false,
 });
 ```
 

diff --git a/example/.gitignore b/example/.gitignore
@@ -35,3 +35,5 @@ lib/generated_plugin_registrant.dart
 
 # Exceptions to above rules.
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+.metadata
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -52,6 +52,7 @@ class _MyHomePageState extends State<MyHomePage> {
               },
               selectorConfig: SelectorConfig(
                 selectorType: PhoneInputSelectorType.BOTTOM_SHEET,
+                useBottomSheetSafeArea: true,
               ),
               ignoreBlank: false,
               autoValidateMode: AutovalidateMode.disabled,

diff --git a/example/lib/main_bottom_sheet.dart b/example/lib/main_bottom_sheet.dart
@@ -50,11 +50,12 @@ class _MyHomePageState extends State<MyHomePage> {
               inputBorder: OutlineInputBorder(),
               selectorConfig: SelectorConfig(
                 selectorType: PhoneInputSelectorType.BOTTOM_SHEET,
+                useBottomSheetSafeArea: true,
               ),
             ),
             ElevatedButton(
               onPressed: () {
-                formKey.currentState.validate();
+                formKey.currentState?.validate();
               },
               child: Text('Validate'),
             ),
@@ -78,13 +79,13 @@ class _MyHomePageState extends State<MyHomePage> {
     controller.text = parsableNumber;
 
     setState(() {
-      initialCountry = number.isoCode;
+      initialCountry = number.isoCode ?? '';
     });
   }
 
   @override
   void dispose() {
-    controller?.dispose();
+    controller.dispose();
     super.dispose();
   }
 }
diff --git a/example/lib/main_dialog.dart b/example/lib/main_dialog.dart
@@ -54,7 +54,7 @@ class _MyHomePageState extends State<MyHomePage> {
             ),
             ElevatedButton(
               onPressed: () {
-                formKey.currentState.validate();
+                formKey.currentState?.validate();
               },
               child: Text('Validate'),
             ),
@@ -78,13 +78,13 @@ class _MyHomePageState extends State<MyHomePage> {
     controller.text = parsableNumber;
 
     setState(() {
-      initialCountry = number.isoCode;
+      initialCountry = number.isoCode ?? '';
     });
   }
 
   @override
   void dispose() {
-    controller?.dispose();
+    controller.dispose();
     super.dispose();
   }
 }
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -14,15 +14,15 @@ description: A new Flutter application.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=3.0.2 <4.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.2
+  cupertino_icons: ^1.0.6
 
 dev_dependencies:
   flutter_test:

diff --git a/example/test_driver/app/app_test.dart b/example/test_driver/app/app_test.dart
@@ -8,17 +8,15 @@ main() {
     final dropdownButtonFinder =
         find.byValueKey(TestHelper.DropdownButtonKeyValue);
 
-    FlutterDriver driver;
+    late FlutterDriver driver;
 
     setUpAll(() async {
       driver = await FlutterDriver.connect();
     });
 
     tearDownAll(() async {
-      if (driver != null) {
-        driver.close();
-      }
-    });
+      driver.close();
+        });
 
     test('Tap On TextField and enter text', () async {
       await driver.tap(inputTextFieldFinder);

diff --git a/example/test_driver/app_bottom_sheet/app_bottom_sheet_test.dart b/example/test_driver/app_bottom_sheet/app_bottom_sheet_test.dart
@@ -10,17 +10,15 @@ main() {
     final countrySearchInputFinder =
         find.byValueKey(TestHelper.CountrySearchInputKeyValue);
 
-    FlutterDriver driver;
+    late FlutterDriver driver;
 
     setUpAll(() async {
       driver = await FlutterDriver.connect();
     });
 
     tearDownAll(() async {
-      if (driver != null) {
-        driver.close();
-      }
-    });
+      driver.close();
+        });
 
     test('Tap On TextField and enter text', () async {
       await driver.tap(inputTextFieldFinder);

diff --git a/example/test_driver/app_dialog/app_dialog_test.dart b/example/test_driver/app_dialog/app_dialog_test.dart
@@ -10,7 +10,7 @@ main() {
     final countrySearchInputFinder =
         find.byValueKey(TestHelper.CountrySearchInputKeyValue);
 
-    FlutterDriver driver;
+    late FlutterDriver driver;
 
     setUpAll(() async {
       driver = await FlutterDriver.connect();