Merge pull request #46 from MohammadKashaniJabbari/issue45

Issue 45
hifiaz · Jul 16, 2021 · b835621 · b835621
2 parents fda5cc4 + fd875dc
commit b835621
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -30,7 +30,7 @@ class _MyAppState extends State<MyApp> {
               backgroundColor: Colors.amber,
               title: Text('Pick your country'),
             ),
-            // if you need custome picker use this
+            // if you need custom picker use this
             // pickerBuilder: (context, CountryCode countryCode) {
             //   return Row(
             //     children: [
@@ -49,6 +49,7 @@ class _MyAppState extends State<MyApp> {
               isShowCode: true,
               isDownIcon: true,
               showEnglishName: false,
+              labelColor: Colors.blueAccent,
             ),
             initialSelection: '+62',
             // or

diff --git a/lib/country_list_pick.dart b/lib/country_list_pick.dart
@@ -21,6 +21,7 @@ class CountryListPick extends StatefulWidget {
       this.theme,
       this.useUiOverlay = true,
       this.useSafeArea = false});
+
   final String? initialSelection;
   final ValueChanged<CountryCode?>? onChanged;
   final PreferredSizeWidget? appBar;
@@ -52,14 +53,16 @@ class CountryListPick extends StatefulWidget {
 class _CountryListPickState extends State<CountryListPick> {
   CountryCode? selectedItem;
   List elements = [];
+
   _CountryListPickState(this.elements);
 
   @override
   void initState() {
     if (widget.initialSelection != null) {
       selectedItem = elements.firstWhere(
           (e) =>
-              (e.code.toUpperCase() == widget.initialSelection!.toUpperCase()) ||
+              (e.code.toUpperCase() ==
+                  widget.initialSelection!.toUpperCase()) ||
               (e.dialCode == widget.initialSelection),
           orElse: () => elements[0] as CountryCode);
     } else {

diff --git a/lib/country_selection_theme.dart b/lib/country_selection_theme.dart
@@ -13,8 +13,10 @@ class CountryTheme {
   final bool? isDownIcon;
   final String? initialSelection;
   final bool? showEnglishName;
+  final Color? labelColor;
 
   CountryTheme({
+    this.labelColor,
     this.searchText,
     this.searchHintText,
     this.lastPickText,

diff --git a/lib/selection_list.dart b/lib/selection_list.dart
@@ -94,7 +94,12 @@ class _SelectionListState extends State<SelectionList> {
                       children: [
                         Padding(
                           padding: const EdgeInsets.all(15.0),
-                          child: Text(widget.theme?.searchText ?? 'SEARCH'),
+                          child: Text(
+                            widget.theme?.searchText ?? 'SEARCH',
+                            style: TextStyle(
+                                color:
+                                    widget.theme?.labelColor ?? Colors.black),
+                          ),
                         ),
                         Container(
                           color: Colors.white,
@@ -116,8 +121,12 @@ class _SelectionListState extends State<SelectionList> {
                         ),
                         Padding(
                           padding: const EdgeInsets.all(15.0),
-                          child:
-                              Text(widget.theme?.lastPickText ?? 'LAST PICK'),
+                          child: Text(
+                            widget.theme?.lastPickText ?? 'LAST PICK',
+                            style: TextStyle(
+                                color:
+                                    widget.theme?.labelColor ?? Colors.black),
+                          ),
                         ),
                         Container(
                           color: Colors.white,