V2.0.15

Merge pull request #71 from Daniel-Ioannou/v2.0.15 close #69 close #70
Daniel-Ioannou · Feb 12, 2023 · ea37355 · ea37355
2 parents 4ec212f + 3abe0b5
commit ea37355
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 2.0.15
+* Add more currencies:
+  - West African CFA franc
+* Add parameter `useRootNavigator`
+  ``` Dart
+   showCurrencyPicker(
+     context: context,
+     useRootNavigator: true,
+     onSelect: (Currency currency) => print('Select currency: ${currency.name}'),
+   );
+  ```
+* Update dependencies
 ## 2.0.14
 * Add more currencies:
   - Zambian Kwacha

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ A flutter package to select a currency from a list of currencies.
  Add the package to your pubspec.yaml:
 
  ```yaml
- currency_picker: ^2.0.14
+ currency_picker: ^2.0.15
  ```
 
  In your dart file, import the library:

diff --git a/example/README.md b/example/README.md
@@ -11,7 +11,7 @@ A flutter package to select a currency from a list of currencies.
  Add the package to your pubspec.yaml:
 
  ```yaml
- currency_picker: ^2.0.14
+ currency_picker: ^2.0.15
  ```
 
  In your dart file, import the library:

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -47,7 +47,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.14"
+    version: "2.0.15"
   fake_async:
     dependency: transitive
     description:
@@ -168,5 +168,5 @@ packages:
     source: hosted
     version: "2.1.4"
 sdks:
-  dart: ">=2.18.0 <4.0.0"
+  dart: ">=2.18.0 <3.0.0"
   flutter: ">=1.17.0"
diff --git a/lib/currency_picker.dart b/lib/currency_picker.dart
@@ -14,14 +14,26 @@ export 'package:currency_picker/src/currency_utils.dart';
 /// Show currency picker
 ///
 ///  `onSelect`: Called when a currency is select. The currency picker passes the new value to the callback (required)
+///
 ///  `showFlag`: Shows flag for each currency. Default value true (optional).
+///
 ///  `searchHint`: Option to customize hint of the search TextField (optional).
+///
 ///  `showCurrencyName`: Option to show/hide the currency name, default value true (optional).
+///
 ///  `showCurrencyCode`: Option to show/hide the currency code, default value true (optional).
+///
 ///  `currencyFilter`: Can be used to uses filter the Currency list (optional).
+///
 ///  `favorite`: The Currencies that will appear at the top of the list (optional).
+///
 ///  `theme`: can be used to customizing the country list bottom sheet (optional).
 ///
+///  `useRootNavigator`: ensures that the root navigator is used to
+///  display the [BottomSheet] when set to `true`. This is useful in the case
+///  that a modal [BottomSheet] needs to be displayed above all other content
+///  but the caller is inside another [Navigator].
+///
 /// This example demonstrates how to use `showCurrencyPicker`
 /// ```dart
 /// showCurrencyPicker(
@@ -45,6 +57,7 @@ void showCurrencyPicker({
   bool showFlag = true,
   bool showCurrencyName = true,
   bool showCurrencyCode = true,
+  bool useRootNavigator = false,
   ScrollPhysics? physics,
   CurrencyPickerThemeData? theme,
 }) {
@@ -60,6 +73,7 @@ void showCurrencyPicker({
     showFlag: showFlag,
     showCurrencyName: showCurrencyName,
     showCurrencyCode: showCurrencyCode,
+    useRootNavigator: useRootNavigator,
     favorite: favorite,
     currencyFilter: currencyFilter,
     theme: theme,

diff --git a/lib/src/currencies.dart b/lib/src/currencies.dart
@@ -745,7 +745,7 @@ List<Map<String, dynamic>> currencies = [
     "code": "XOF",
     "name": "UEMOA CFA franc",
     "symbol": "FCFA",
-    "flag": "UEMOA",
+    "flag": "xof.png",
     "decimal_digits": 2,
     "number": 960,
     "name_plural": "UEMOA CFA francs",

diff --git a/lib/src/currency.dart b/lib/src/currency.dart
@@ -34,6 +34,8 @@ class Currency {
   ///True if symbol has space with amount
   final bool spaceBetweenAmountAndSymbol;
 
+  bool get isFlagImage => flag?.endsWith('.png') ?? false;
+
   Currency({
     required this.code,
     required this.name,

diff --git a/lib/src/currency_list_bottom_sheet.dart b/lib/src/currency_list_bottom_sheet.dart
@@ -14,6 +14,7 @@ void showCurrencyListBottomSheet({
   bool showFlag = true,
   bool showCurrencyName = true,
   bool showCurrencyCode = true,
+  bool useRootNavigator = false,
   ScrollPhysics? physics,
   CurrencyPickerThemeData? theme,
 }) {
@@ -26,6 +27,7 @@ void showCurrencyListBottomSheet({
     context: context,
     isScrollControlled: true,
     shape: shape,
+    useRootNavigator: useRootNavigator,
     backgroundColor: theme?.backgroundColor,
     builder: (_) => _builder(
       context,

diff --git a/lib/src/currency_list_view.dart b/lib/src/currency_list_view.dart
@@ -233,10 +233,9 @@ class _CurrencyListViewState extends State<CurrencyListView> {
       );
     }
 
-    // Verify if it is UEMOA XOF
-    if (currency.flag == "UEMOA") {
+    if (currency.isFlagImage) {
       return Image.asset(
-        'uemoa.png'.imagePath,
+        currency.flag!.imagePath,
         package: 'currency_picker',
         width: 27,
       );

diff --git a/lib/src/res/uemoa.png → lib/src/res/xof.png b/lib/src/res/uemoa.png → lib/src/res/xof.png
diff --git a/pubspec.lock b/pubspec.lock
@@ -169,5 +169,5 @@ packages:
     source: hosted
     version: "2.1.4"
 sdks:
-  dart: ">=2.18.0 <4.0.0"
+  dart: ">=2.18.0 <3.0.0"
   flutter: ">=1.17.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,7 +4,7 @@ description: A flutter package to select a currency from a list of currencies.
 homepage: https://github.com/Daniel-Ioannou
 repository: https://github.com/Daniel-Ioannou/flutter_currency_picker
 
-version: 2.0.14
+version: 2.0.15
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
@@ -13,7 +13,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  collection: ^1.16.0
+  collection: ^1.17.0
 
 flutter:
   assets: