V2.0.24

Merge pull request #139 from Daniel-Ioannou/v2.0.24
Daniel-Ioannou · Jan 29, 2024 · f2891e0 · f2891e0
2 parents 11f3756 + 18151bd
commit f2891e0
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 2.0.24
+  * Add option for bottom sheet Width.
+    ```Dart
+    showCountryPicker(
+      context: context,
+      countryListTheme: CountryListThemeData(
+       bottomSheetWidth: 500, // Optional. Country list modal Width
+      ),
+      onSelect: (Country country) => print('Select country: ${country.displayName}'),
+    );
+    ```
+  * Add `emojiFontFamilyFallback`
+
 ## 2.0.23
   * Export `CustomFlagBuilder`
   * Add parameter `useRootNavigator`

diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -283,7 +283,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -369,7 +369,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -418,7 +418,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -47,7 +47,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.23"
+    version: "2.0.24"
   fake_async:
     dependency: transitive
     description:

diff --git a/lib/country_picker.dart b/lib/country_picker.dart
@@ -58,7 +58,6 @@ void showCountryPicker({
   bool showWorldWide = false,
   bool showSearch = true,
   bool useSafeArea = false,
-  List<String>? emojiFontFamilyFallback,
   bool useRootNavigator = false,
 }) {
   assert(
@@ -79,7 +78,6 @@ void showCountryPicker({
     showWorldWide: showWorldWide,
     showSearch: showSearch,
     useSafeArea: useSafeArea,
-    emojiFontFamilyFallback: emojiFontFamilyFallback,
     useRootNavigator: useRootNavigator,
   );
 }
diff --git a/lib/src/country_list_bottom_sheet.dart b/lib/src/country_list_bottom_sheet.dart
@@ -18,7 +18,6 @@ void showCountryListBottomSheet({
   bool showWorldWide = false,
   bool showSearch = true,
   bool useSafeArea = false,
-  List<String>? emojiFontFamilyFallback,
   bool useRootNavigator = false,
 }) {
   showModalBottomSheet(
@@ -38,7 +37,6 @@ void showCountryListBottomSheet({
       searchAutofocus,
       showWorldWide,
       showSearch,
-      emojiFontFamilyFallback,
       customFlagBuilder,
     ),
   ).whenComplete(() {
@@ -57,7 +55,6 @@ Widget _builder(
   bool searchAutofocus,
   bool showWorldWide,
   bool showSearch,
-  List<String>? emojiFontFamilyFallback,
   CustomFlagBuilder? customFlagBuilder,
 ) {
   final device = MediaQuery.of(context).size.height;
@@ -100,7 +97,6 @@ Widget _builder(
       searchAutofocus: searchAutofocus,
       showWorldWide: showWorldWide,
       showSearch: showSearch,
-      emojiFontFamilyFallback: emojiFontFamilyFallback,
       customFlagBuilder: customFlagBuilder,
     ),
   );

diff --git a/lib/src/country_list_theme_data.dart b/lib/src/country_list_theme_data.dart
@@ -21,6 +21,9 @@ class CountryListThemeData {
   /// If null, set to 25
   final double? flagSize;
 
+  ///Custom emoji font family fallback for flags icons
+  final List<String>? emojiFontFamilyFallback;
+
   ///The decoration used for the search field
   ///
   /// It defaults to a basic outline-bordered input decoration
@@ -58,5 +61,6 @@ class CountryListThemeData {
     this.bottomSheetWidth,
     this.padding,
     this.margin,
+    this.emojiFontFamilyFallback,
   });
 }
diff --git a/lib/src/country_list_view.dart b/lib/src/country_list_view.dart
@@ -45,9 +45,6 @@ class CountryListView extends StatefulWidget {
   /// An optional argument for hiding the search bar
   final bool showSearch;
 
-  ///Custom emoji fontfamily fallback for flags icons
-  final List<String>? emojiFontFamilyFallback;
-
   /// Custom builder function for flag widget
   final CustomFlagBuilder? customFlagBuilder;
 
@@ -63,7 +60,6 @@ class CountryListView extends StatefulWidget {
     this.showWorldWide = false,
     this.showSearch = true,
     this.customFlagBuilder,
-    this.emojiFontFamilyFallback,
   })  : assert(
   exclude == null || countryFilter == null,
   'Cannot provide both exclude and countryFilter',
@@ -251,7 +247,7 @@ class _CountryListViewState extends State<CountryListView> {
         : Utils.countryCodeToEmoji(country.countryCode),
     style: TextStyle(
       fontSize: widget.countryListTheme?.flagSize ?? 25,
-      fontFamilyFallback: widget.emojiFontFamilyFallback,
+      fontFamilyFallback: widget.countryListTheme?.emojiFontFamilyFallback,
     ),
   );
 
@@ -272,4 +268,4 @@ class _CountryListViewState extends State<CountryListView> {
   }
 
   TextStyle get _defaultTextStyle => const TextStyle(fontSize: 16);
-}
+}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: country_picker
 description: A flutter package to select a country from a list of countries.
 
-version: 2.0.23
+version: 2.0.24
 
 homepage: https://github.com/Daniel-Ioannou
 repository: https://github.com/Daniel-Ioannou/flutter_country_picker