调整控件，修复搜索排序按键问题

CarGuo · CarGuo · commit c4a43f2efb8d · 2018-08-28T20:52:20.000+08:00
diff --git a/lib/widget/GSYInputWidget.dart b/lib/widget/GSYInputWidget.dart
@@ -17,34 +17,23 @@ class GSYInputWidget extends StatefulWidget {
   GSYInputWidget({Key key, this.hintText, this.iconData, this.onChanged, this.textStyle, this.controller, this.obscureText = false}) : super(key: key);
 
   @override
-  _GSYInputWidgetState createState() => new _GSYInputWidgetState(hintText, iconData, onChanged, textStyle, controller, obscureText);
+  _GSYInputWidgetState createState() => new _GSYInputWidgetState();
 }
 
 /// State for [GSYInputWidget] widgets.
 class _GSYInputWidgetState extends State<GSYInputWidget> {
-  final bool obscureText;
-
-  final String hintText;
-
-  final IconData iconData;
-
-  final ValueChanged<String> onChanged;
-
-  final TextStyle textStyle;
-
-  final TextEditingController controller;
 
-  _GSYInputWidgetState(this.hintText, this.iconData, this.onChanged, this.textStyle, this.controller, this.obscureText) : super();
+  _GSYInputWidgetState() : super();
 
   @override
   Widget build(BuildContext context) {
     return new TextField(
-      controller: controller,
-      onChanged: onChanged,
-      obscureText: obscureText,
+      controller: widget.controller,
+      onChanged: widget.onChanged,
+      obscureText: widget.obscureText,
       decoration: new InputDecoration(
-        hintText: hintText,
-        icon: iconData == null ? null : new Icon(iconData),
+        hintText: widget.hintText,
+        icon: widget.iconData == null ? null : new Icon(widget.iconData),
       ),
     );
   }
diff --git a/lib/widget/GSYSearchDrawer.dart b/lib/widget/GSYSearchDrawer.dart
@@ -18,15 +18,11 @@ class GSYSearchDrawer extends StatefulWidget {
   GSYSearchDrawer(this.typeCallback, this.sortCallback, this.languageCallback);
 
   @override
-  _GSYSearchDrawerState createState() => _GSYSearchDrawerState(this.typeCallback, this.sortCallback, this.languageCallback);
+  _GSYSearchDrawerState createState() => _GSYSearchDrawerState();
 }
 
 class _GSYSearchDrawerState extends State<GSYSearchDrawer> {
-  final SearchSelectItemChanged<String> typeCallback;
-  final SearchSelectItemChanged<String> sortCallback;
-  final SearchSelectItemChanged<String> languageCallback;
-
-  _GSYSearchDrawerState(this.typeCallback, this.sortCallback, this.languageCallback);
+  _GSYSearchDrawerState();
 
   final double itemWidth = 200.0;
 
@@ -54,20 +50,20 @@ class _GSYSearchDrawerState extends State<GSYSearchDrawer> {
     list.add(_renderTitle(CommonUtils.getLocale(context).search_type));
     for (int i = 0; i < searchFilterType.length; i++) {
       FilterModel model = searchFilterType[i];
-      list.add(_renderItem(model, searchFilterType, i, this.typeCallback));
+      list.add(_renderItem(model, searchFilterType, i, widget.typeCallback));
       list.add(_renderDivider());
     }
     list.add(_renderTitle(CommonUtils.getLocale(context).search_type));
 
     for (int i = 0; i < sortType.length; i++) {
       FilterModel model = sortType[i];
-      list.add(_renderItem(model, sortType, i, this.sortCallback));
+      list.add(_renderItem(model, sortType, i, widget.sortCallback));
       list.add(_renderDivider());
     }
     list.add(_renderTitle(CommonUtils.getLocale(context).search_language));
     for (int i = 0; i < searchLanguageType.length; i++) {
       FilterModel model = searchLanguageType[i];
-      list.add(_renderItem(model, searchLanguageType, i, this.languageCallback));
+      list.add(_renderItem(model, searchLanguageType, i, widget.languageCallback));
       list.add(_renderDivider());
     }
     return list;
@@ -97,30 +93,37 @@ class _GSYSearchDrawerState extends State<GSYSearchDrawer> {
   }
 
   _renderItem(FilterModel model, List<FilterModel> list, int index, SearchSelectItemChanged<String> select) {
-    return new Container(
-      height: 50.0,
-      child: new FlatButton(
-        onPressed: () {
-          setState(() {
-            for (FilterModel model in list) {
-              model.select = false;
-            }
-            list[index].select = true;
-          });
-          select?.call(model.value);
-        },
-        child: new Container(
-          width: itemWidth,
-          child: new Row(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: <Widget>[
-              new Center(child: new Checkbox(value: model.select, onChanged: (value) {})),
-              new Center(child: Text(model.name)),
-            ],
+    return new Stack(
+      children: <Widget>[
+        new Container(
+          height: 50.0,
+          child: new Container(
+            width: itemWidth,
+            child: new Row(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                new Center(child: new Checkbox(value: model.select, onChanged: (value) {})),
+                new Center(child: Text(model.name)),
+              ],
+            ),
           ),
         ),
-      ),
+        new FlatButton(
+          onPressed: () {
+            setState(() {
+              for (FilterModel model in list) {
+                model.select = false;
+              }
+              list[index].select = true;
+            });
+            select?.call(model.value);
+          },
+          child: new Container(
+            width: itemWidth,
+          ),
+        )
+      ],
     );
   }
 }
diff --git a/lib/widget/GSYSelectItemWidget.dart b/lib/widget/GSYSelectItemWidget.dart
@@ -30,7 +30,7 @@ class GSYSelectItemWidget extends StatefulWidget implements PreferredSizeWidget
   });
 
   @override
-  _GSYSelectItemWidgetState createState() => _GSYSelectItemWidgetState(selectItemChanged, itemNames, elevation, margin);
+  _GSYSelectItemWidgetState createState() => _GSYSelectItemWidgetState();
 
   @override
   Size get preferredSize {
@@ -41,15 +41,7 @@ class GSYSelectItemWidget extends StatefulWidget implements PreferredSizeWidget
 class _GSYSelectItemWidgetState extends State<GSYSelectItemWidget> {
   int selectIndex = 0;
 
-  final List<String> itemNames;
-
-  final SelectItemChanged selectItemChanged;
-
-  final double elevation;
-
-  final EdgeInsets margin;
-
-  _GSYSelectItemWidgetState(this.selectItemChanged, this.itemNames, this.elevation, this.margin);
+  _GSYSelectItemWidgetState();
 
   _renderItem(String name, int index) {
     var style = index == selectIndex ? GSYConstant.middleTextWhite : GSYConstant.middleSubLightText;
@@ -65,7 +57,7 @@ class _GSYSelectItemWidgetState extends State<GSYSelectItemWidget> {
           ),
           onPressed: () {
             if (selectIndex != index) {
-              selectItemChanged?.call(index);
+              widget.selectItemChanged?.call(index);
             }
             setState(() {
               selectIndex = index;
@@ -76,11 +68,11 @@ class _GSYSelectItemWidgetState extends State<GSYSelectItemWidget> {
 
   _renderList() {
     List<Widget> list = new List();
-    for (int i = 0; i < itemNames.length; i++) {
-      if (i == itemNames.length - 1) {
-        list.add(_renderItem(itemNames[i], i));
+    for (int i = 0; i < widget.itemNames.length; i++) {
+      if (i == widget.itemNames.length - 1) {
+        list.add(_renderItem(widget.itemNames[i], i));
       } else {
-        list.add(_renderItem(itemNames[i], i));
+        list.add(_renderItem(widget.itemNames[i], i));
         list.add(new Container(width: 1.0, height: 25.0, color: Color(GSYColors.subLightTextColor)));
       }
     }
@@ -90,8 +82,8 @@ class _GSYSelectItemWidgetState extends State<GSYSelectItemWidget> {
   @override
   Widget build(BuildContext context) {
     return new GSYCardItem(
-        elevation: elevation,
-        margin: margin,
+        elevation: widget.elevation,
+        margin: widget.margin,
         color: Theme.of(context).primaryColor,
         shape: new RoundedRectangleBorder(
           borderRadius: BorderRadius.all(Radius.circular(4.0)),
diff --git a/lib/widget/GSYTabBarWidget.dart b/lib/widget/GSYTabBarWidget.dart
@@ -47,50 +47,13 @@ class GSYTabBarWidget extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _GSYTabBarState createState() => new _GSYTabBarState(
-        type,
-        tabViews,
-        indicatorColor,
-        title,
-        drawer,
-        floatingActionButton,
-        tarWidgetControl,
-        topPageControl,
-        onPageChanged,
-      );
+  _GSYTabBarState createState() => new _GSYTabBarState();
 }
 
 // ignore: mixin_inherits_from_not_object
 class _GSYTabBarState extends State<GSYTabBarWidget> with SingleTickerProviderStateMixin {
-  final int _type;
-
-  final List<Widget> _tabViews;
-
-  final Color _indicatorColor;
-
-  final Widget _title;
-
-  final Widget _drawer;
-
-  final Widget _floatingActionButton;
-
-  final TarWidgetControl _tarWidgetControl;
-
-  final PageController _pageController;
-
-  final ValueChanged<int> _onPageChanged;
 
-  _GSYTabBarState(
-    this._type,
-    this._tabViews,
-    this._indicatorColor,
-    this._title,
-    this._drawer,
-    this._floatingActionButton,
-    this._tarWidgetControl,
-    this._pageController,
-    this._onPageChanged,
-  ) : super();
+  _GSYTabBarState();
 
   TabController _tabController;
 
@@ -109,50 +72,50 @@ class _GSYTabBarState extends State<GSYTabBarWidget> with SingleTickerProviderSt
 
   @override
   Widget build(BuildContext context) {
-    if (this._type == GSYTabBarWidget.TOP_TAB) {
+    if (widget.type == GSYTabBarWidget.TOP_TAB) {
       ///顶部tab bar
       return new Scaffold(
-        floatingActionButton: _floatingActionButton,
-        persistentFooterButtons: _tarWidgetControl == null ? [] : _tarWidgetControl.footerButton,
+        floatingActionButton: widget.floatingActionButton,
+        persistentFooterButtons: widget.tarWidgetControl == null ? [] : widget.tarWidgetControl.footerButton,
         appBar: new AppBar(
           backgroundColor: Theme.of(context).primaryColor,
-          title: _title,
+          title: widget.title,
           bottom: new TabBar(
             controller: _tabController,
             tabs: widget.tabItems,
-            indicatorColor: _indicatorColor,
+            indicatorColor: widget.indicatorColor,
           ),
         ),
         body: new PageView(
-          controller: _pageController,
-          children: _tabViews,
+          controller: widget.topPageControl,
+          children: widget.tabViews,
           onPageChanged: (index) {
             _tabController.animateTo(index);
-            _onPageChanged?.call(index);
+            widget.onPageChanged?.call(index);
           },
         ),
       );
     }
 
     ///底部tab bar
     return new Scaffold(
-        drawer: _drawer,
+        drawer: widget.drawer,
         appBar: new AppBar(
           backgroundColor: Theme.of(context).primaryColor,
-          title: _title,
+          title: widget.title,
         ),
         body: new TabBarView(
             //TabBarView呈现内容，因此放到Scaffold的body中
             controller: _tabController, //配置控制器
-            children: _tabViews),
+            children: widget.tabViews),
         bottomNavigationBar: new Material(
           //为了适配主题风格，包一层Material实现风格套用
           color: Theme.of(context).primaryColor, //底部导航栏主题颜色
           child: new TabBar(
             //TabBar导航标签，底部导航放到Scaffold的bottomNavigationBar中
             controller: _tabController, //配置控制器
             tabs: widget.tabItems,
-            indicatorColor: _indicatorColor, //tab标签的下划线颜色
+            indicatorColor: widget.indicatorColor, //tab标签的下划线颜色
           ),
         ));
   }
diff --git a/lib/widget/IssueEditDIalog.dart b/lib/widget/IssueEditDIalog.dart
