Skip to content

Commit bee1d65

Browse files
authored
Merge pull request #413 from natintosh/develop
update minimum os version on iOS
2 parents a0c32bb + 77a0708 commit bee1d65

File tree

16 files changed

+554
-269
lines changed

16 files changed

+554
-269
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,5 @@ build/
7272
!**/ios/**/default.pbxuser
7373
!**/ios/**/default.perspectivev3
7474
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
75+
76+
.metadata

.pubignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,5 @@ build/
7373
!**/ios/**/default.pbxuser
7474
!**/ios/**/default.perspectivev3
7575
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
76+
77+
.metadata

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
## [0.7.4]
2+
* Updated minimum os version on iOS
3+
* Updated dependencies
4+
15
## [0.7.3+1]
26
* Added pub example
37

4-
* ## [0.7.3]
8+
## [0.7.3]
59
* Updated dependency in libphonenumber
610
* Update AsYouTypeFormatter
711
* Replaced `headline` with `headlineSmall` in countries_search_list_widget.dart

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ InternationalPhoneNumberInput({
121121
this.autofillHints,
122122
this.countries
123123
});
124-
```|
124+
```
125125

126126
```dart
127127
SelectorConfig({
@@ -131,6 +131,7 @@ SelectorConfig({
131131
this.backgroundColor,
132132
this.countryComparator,
133133
this.setSelectorButtonAsPrefixIcon = false,
134+
this.useBottomSheetSafeArea = false,
134135
});
135136
```
136137

example/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ lib/generated_plugin_registrant.dart
3535

3636
# Exceptions to above rules.
3737
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
38+
39+
.metadata

example/lib/main.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class _MyHomePageState extends State<MyHomePage> {
5252
},
5353
selectorConfig: SelectorConfig(
5454
selectorType: PhoneInputSelectorType.BOTTOM_SHEET,
55+
useBottomSheetSafeArea: true,
5556
),
5657
ignoreBlank: false,
5758
autoValidateMode: AutovalidateMode.disabled,

example/lib/main_bottom_sheet.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ class _MyHomePageState extends State<MyHomePage> {
5050
inputBorder: OutlineInputBorder(),
5151
selectorConfig: SelectorConfig(
5252
selectorType: PhoneInputSelectorType.BOTTOM_SHEET,
53+
useBottomSheetSafeArea: true,
5354
),
5455
),
5556
ElevatedButton(
5657
onPressed: () {
57-
formKey.currentState.validate();
58+
formKey.currentState?.validate();
5859
},
5960
child: Text('Validate'),
6061
),
@@ -78,13 +79,13 @@ class _MyHomePageState extends State<MyHomePage> {
7879
controller.text = parsableNumber;
7980

8081
setState(() {
81-
initialCountry = number.isoCode;
82+
initialCountry = number.isoCode ?? '';
8283
});
8384
}
8485

8586
@override
8687
void dispose() {
87-
controller?.dispose();
88+
controller.dispose();
8889
super.dispose();
8990
}
9091
}

example/lib/main_dialog.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class _MyHomePageState extends State<MyHomePage> {
5454
),
5555
ElevatedButton(
5656
onPressed: () {
57-
formKey.currentState.validate();
57+
formKey.currentState?.validate();
5858
},
5959
child: Text('Validate'),
6060
),
@@ -78,13 +78,13 @@ class _MyHomePageState extends State<MyHomePage> {
7878
controller.text = parsableNumber;
7979

8080
setState(() {
81-
initialCountry = number.isoCode;
81+
initialCountry = number.isoCode ?? '';
8282
});
8383
}
8484

8585
@override
8686
void dispose() {
87-
controller?.dispose();
87+
controller.dispose();
8888
super.dispose();
8989
}
9090
}

example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ description: A new Flutter application.
1414
version: 1.0.0+1
1515

1616
environment:
17-
sdk: ">=2.1.0 <3.0.0"
17+
sdk: ">=3.0.2 <4.0.0"
1818

1919
dependencies:
2020
flutter:
2121
sdk: flutter
2222

2323
# The following adds the Cupertino Icons font to your application.
2424
# Use with the CupertinoIcons class for iOS style icons.
25-
cupertino_icons: ^1.0.2
25+
cupertino_icons: ^1.0.6
2626

2727
dev_dependencies:
2828
flutter_test:

example/test_driver/app/app_test.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ main() {
88
final dropdownButtonFinder =
99
find.byValueKey(TestHelper.DropdownButtonKeyValue);
1010

11-
FlutterDriver driver;
11+
late FlutterDriver driver;
1212

1313
setUpAll(() async {
1414
driver = await FlutterDriver.connect();
1515
});
1616

1717
tearDownAll(() async {
18-
if (driver != null) {
19-
driver.close();
20-
}
21-
});
18+
driver.close();
19+
});
2220

2321
test('Tap On TextField and enter text', () async {
2422
await driver.tap(inputTextFieldFinder);

0 commit comments

Comments
 (0)