Merge branch 'master' of https://github.com/vincent7293/gzx_dropdown_…

…menu into vincent7293-master # Conflicts: # lib/src/gzx_dropdown_header.dart
GanZhiXiong · Apr 7, 2021 · 7b8b357 · 7b8b357
2 parents d9bf238 + 0a6b5cb
commit 7b8b357
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ A custom is strong dropdown menu for Flutter. Easy to use and powerful for custo
     // 下拉的头部项，目前每一项，只能自定义显示的文字、图标、图标大小修改
     items: [
       GZXDropDownHeaderItem(_dropDownHeaderItemStrings[0]),
-      GZXDropDownHeaderItem(_dropDownHeaderItemStrings[1]),
+      GZXDropDownHeaderItem(_dropDownHeaderItemStrings[1], iconData: Icons.keyboard_arrow_down, iconDropDownData: Icons.keyboard_arrow_up),
       GZXDropDownHeaderItem(_dropDownHeaderItemStrings[2], style: TextStyle(color: Colors.green)),
       GZXDropDownHeaderItem(_dropDownHeaderItemStrings[3], iconData: Icons.filter_frames, iconSize: 18),
     ],

diff --git a/example/lib/gzx_dropdown_menu_test_page.dart b/example/lib/gzx_dropdown_menu_test_page.dart
@@ -115,10 +115,16 @@ class _GZXDropDownMenuTestPageState extends State<GZXDropDownMenuTestPage> {
                 // 下拉的头部项，目前每一项，只能自定义显示的文字、图标、图标大小修改
                 items: [
                   GZXDropDownHeaderItem(_dropDownHeaderItemStrings[0]),
-                  GZXDropDownHeaderItem(_dropDownHeaderItemStrings[1]),
+                  GZXDropDownHeaderItem(
+                    _dropDownHeaderItemStrings[1],
+                    iconData: Icons.keyboard_arrow_down,
+                    iconDropDownData: Icons.keyboard_arrow_up,
+                  ),
                   GZXDropDownHeaderItem(
                     _dropDownHeaderItemStrings[2],
                     style: TextStyle(color: Colors.green),
+                    iconData: Icons.arrow_upward,
+                    iconDropDownData: Icons.arrow_downward,
                   ),
                   GZXDropDownHeaderItem(
                     _dropDownHeaderItemStrings[3],

diff --git a/lib/src/gzx_dropdown_header.dart b/lib/src/gzx_dropdown_header.dart
@@ -174,7 +174,9 @@ class _GZXDropDownHeaderState extends State<GZXDropDownHeader>
                   Icon(
                     !_isShowDropDownItemWidget
                         ? item.iconData ?? Icons.arrow_drop_down
-                        : item.iconData ?? Icons.arrow_drop_up,
+                        : item.iconDropDownData ??
+                            item.iconData ??
+                            Icons.arrow_drop_up,
                     color: _isShowDropDownItemWidget
                         ? _iconDropDownColor
                         : item.style?.color ?? widget.iconColor,
@@ -192,7 +194,7 @@ class _GZXDropDownHeaderState extends State<GZXDropDownHeader>
                         right: BorderSide(color: widget.dividerColor, width: 1),
                       ),
                     ),
-                  )
+                  ),
           ],
         ),
       ),
@@ -203,12 +205,14 @@ class _GZXDropDownHeaderState extends State<GZXDropDownHeader>
 class GZXDropDownHeaderItem {
   final String title;
   final IconData? iconData;
+  final IconData? iconDropDownData;
   final double? iconSize;
   final TextStyle? style;
 
   GZXDropDownHeaderItem(
     this.title, {
     this.iconData,
+    this.iconDropDownData,
     this.iconSize,
     this.style,
   });