Merge branch 'develop' of github.com:alibaba/flutter-common-widgets-app into develop

2025-07-15 03:04:25 +08:00 · 2019-01-29 15:06:22 +08:00
parent 12544b0d44 acfe8f6ed8
commit 573a85a075
207 changed files with 549 additions and 786 deletions
--- a/lib/widgets/components/Bar/AppBar/index.dart
+++ b/lib/widgets/components/Bar/AppBar/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: AppBar 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/components/Bar/BottomAppBar/index.dart
+++ b/lib/widgets/components/Bar/BottomAppBar/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: BottomAppBar 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/components/Bar/ButtonBar/index.dart
+++ b/lib/widgets/components/Bar/ButtonBar/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: ButtonBar 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart
+++ b/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: FlexibleSpaceBar 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/components/Bar/SliverAppBar/index.dart
+++ b/lib/widgets/components/Bar/SliverAppBar/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: SliverAppBar 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/components/Bar/SnackBar/index.dart
+++ b/lib/widgets/components/Bar/SnackBar/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: SnackBar 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/components/Bar/SnackBarAction/index.dart
+++ b/lib/widgets/components/Bar/SnackBarAction/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget: SnackBarAction 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import './demo.dart' as SnackBarDemo;

--- a/lib/widgets/components/Bar/TabBar/index.dart
+++ b/lib/widgets/components/Bar/TabBar/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget: SnackBarAction 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';

 import './demo.dart';
--- a/lib/widgets/components/Card/Card/index.dart
+++ b/lib/widgets/components/Card/Card/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: Card 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/components/Chip/Chip/index.dart
+++ b/lib/widgets/components/Chip/Chip/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-18 15:13:23
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Chip/ChipTheme/index.dart
+++ b/lib/widgets/components/Chip/ChipTheme/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-18 15:14:03 
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Chip/ChipThemeData/index.dart
+++ b/lib/widgets/components/Chip/ChipThemeData/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-18 17:38:56
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Chip/ChoiceChip/index.dart
+++ b/lib/widgets/components/Chip/ChoiceChip/index.dart
@ -6,7 +6,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Chip/FilterChip/index.dart
+++ b/lib/widgets/components/Chip/FilterChip/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-21 10:25:22
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Chip/RawChip/index.dart
+++ b/lib/widgets/components/Chip/RawChip/index.dart
@ -6,7 +6,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Chip/inputChip/index.dart
+++ b/lib/widgets/components/Chip/inputChip/index.dart
@ -6,7 +6,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Dialog/AboutDialog/index.dart
+++ b/lib/widgets/components/Dialog/AboutDialog/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/Dialog/AlertDialog/index.dart
+++ b/lib/widgets/components/Dialog/AlertDialog/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/Dialog/Dialog/index.dart
+++ b/lib/widgets/components/Dialog/Dialog/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/Dialog/SimpleDialog/index.dart
+++ b/lib/widgets/components/Dialog/SimpleDialog/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/Grid/GridPaper/index.dart
+++ b/lib/widgets/components/Grid/GridPaper/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/Grid/GridTile/index.dart
+++ b/lib/widgets/components/Grid/GridTile/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/Grid/GridTileBar/index.dart
+++ b/lib/widgets/components/Grid/GridTileBar/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/Grid/GridView/index.dart
+++ b/lib/widgets/components/Grid/GridView/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/Grid/SliverGrid/index.dart
+++ b/lib/widgets/components/Grid/SliverGrid/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/LIst/AnimatedList/demo.dart
+++ b/lib/widgets/components/LIst/AnimatedList/demo.dart
@ -1,7 +1,7 @@


 import 'package:flutter/material.dart';
-import './model.dart';
+import 'package:flutter_go/widgets/components/LIst/AnimatedList/model.dart';

 class AnimatedListFullDefault extends StatefulWidget {
  AnimatedListFullDefault({Key key, this.parent}) : super(key: key);
--- a/lib/widgets/components/LIst/AnimatedList/index.dart
+++ b/lib/widgets/components/LIst/AnimatedList/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: AnimatedList 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';

 import 'package:flutter_markdown/flutter_markdown.dart';
--- a/lib/widgets/components/LIst/ListBody/index.dart
+++ b/lib/widgets/components/LIst/ListBody/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: ListBody 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/components/LIst/ListView/index.dart
+++ b/lib/widgets/components/LIst/ListView/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: ListView 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';

 import 'package:flutter_markdown/flutter_markdown.dart';
--- a/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart
+++ b/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-27 15:37:04
 */
 import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
+//import 'package:fluttertoast/fluttertoast.dart';

 class CheckedPopupMenuItemDemo extends StatefulWidget {
  _CheckedPopupMenuItemDemoState createState() =>
@ -26,27 +26,18 @@ class _CheckedPopupMenuItemDemoState extends State<CheckedPopupMenuItemDemo> {
    _checkedValues = <String>[_checkedValue3];
  }

-  void showInSnackBar(String value){
-    Fluttertoast.showToast(
-        msg: value,
-        toastLength: Toast.LENGTH_SHORT,
-        gravity: ToastGravity.CENTER,
-        timeInSecForIos: 1,
-        backgroundColor: Colors.grey,
-        textColor: Colors.white
-    );
-  }

  bool isChecked(String value) => _checkedValues.contains(value);

-
  void showCheckedMenuSelections(String value){
    if(_checkedValues.contains(value)){
      _checkedValues.remove(value);
    }else{
      _checkedValues.add(value);
    }
-    showInSnackBar('Checked $_checkedValues');
+   
+    Scaffold.of(context).showSnackBar(new SnackBar(
+                content: new Text('Checked $_checkedValues')));
  }

  @override
--- a/lib/widgets/components/Menu/CheckedPopupMenuItem/index.dart
+++ b/lib/widgets/components/Menu/CheckedPopupMenuItem/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-22 21:26:54
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Menu/DropdownMenuItem/index.dart
+++ b/lib/widgets/components/Menu/DropdownMenuItem/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-27 14:51:44
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';


--- a/lib/widgets/components/Menu/PopupMenuButton/demo.dart
+++ b/lib/widgets/components/Menu/PopupMenuButton/demo.dart
@ -5,7 +5,6 @@
 * @Last Modified time: 2018-12-27 15:39:35
 */
 import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';

 class PopupMenuButtonDemo extends StatefulWidget {
  _PopupMenuButtonDemoState createState() => _PopupMenuButtonDemoState();
@ -20,18 +19,11 @@ class _PopupMenuButtonDemoState extends State<PopupMenuButtonDemo> {
  void showMenuSelection(String value) {
    if (<String>[_simpleValue1, _simpleValue2, _simpleValue3].contains(value))
      _simpleValue = value;
-    showInSnackBar('You selected: $value');
+       Scaffold.of(context).showSnackBar(new SnackBar(
+                content: new Text('You selected: $value')));
  }

-    void showInSnackBar(String value) {
-    Fluttertoast.showToast(
-        msg: value,
-        toastLength: Toast.LENGTH_SHORT,
-        gravity: ToastGravity.CENTER,
-        timeInSecForIos: 1,
-        backgroundColor: Colors.grey,
-        textColor: Colors.white);
-  }
+

  @override
  void initState() {
--- a/lib/widgets/components/Menu/PopupMenuButton/index.dart
+++ b/lib/widgets/components/Menu/PopupMenuButton/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-27 15:44:31
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Menu/PopupMenuDivider/demo.dart
+++ b/lib/widgets/components/Menu/PopupMenuDivider/demo.dart
@ -5,65 +5,47 @@
 * @Last Modified time: 2018-12-27 15:45:26 
 */
 import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';

+class PopupMenuDividerDemo extends StatefulWidget {
+  _PopupMenuDividerDemoState createState() => _PopupMenuDividerDemoState();
+}

-
-class PopupMenuDividerDemo extends StatelessWidget {
-
-
-    void showInSnackBar(String value) {
-    Fluttertoast.showToast(
-        msg: value,
-        toastLength: Toast.LENGTH_SHORT,
-        gravity: ToastGravity.CENTER,
-        timeInSecForIos: 1,
-        backgroundColor: Colors.grey,
-        textColor: Colors.white);
+class _PopupMenuDividerDemoState extends State<PopupMenuDividerDemo> {
+  void showInSnackBar(String value) {
+    Scaffold.of(context)
+        .showSnackBar(new SnackBar(content: new Text('You selected: $value')));
  }

-
  @override
  Widget build(BuildContext context) {
    return Container(
-      child:ListTile(
-            title: const Text('An item with a sectioned menu'),
-            trailing: PopupMenuButton<String>(
+      child: ListTile(
+          title: const Text('An item with a sectioned menu'),
+          trailing: PopupMenuButton<String>(
              padding: EdgeInsets.zero,
              onSelected: showInSnackBar,
              itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
-                const PopupMenuItem<String>(
-                  value: 'Preview',
-                  child: ListTile(
-                    leading: Icon(Icons.visibility),
-                    title: Text('Preview')
-                  )
-                ),
-                const PopupMenuItem<String>(
-                  value: 'Share',
-                  child: ListTile(
-                    leading: Icon(Icons.person_add),
-                    title: Text('Share')
-                  )
-                ),
-                const PopupMenuItem<String>(
-                  value: 'Get Link',
-                  child: ListTile(
-                    leading: Icon(Icons.link),
-                    title: Text('Get link')
-                  )
-                ),
-                const PopupMenuDivider(),
-                const PopupMenuItem<String>(
-                  value: 'Remove',
-                  child: ListTile(
-                    leading: Icon(Icons.delete),
-                    title: Text('Remove')
-                  )
-                )
-              ]
-            )
-          ),
+                    const PopupMenuItem<String>(
+                        value: 'Preview',
+                        child: ListTile(
+                            leading: Icon(Icons.visibility),
+                            title: Text('Preview'))),
+                    const PopupMenuItem<String>(
+                        value: 'Share',
+                        child: ListTile(
+                            leading: Icon(Icons.person_add),
+                            title: Text('Share'))),
+                    const PopupMenuItem<String>(
+                        value: 'Get Link',
+                        child: ListTile(
+                            leading: Icon(Icons.link),
+                            title: Text('Get link'))),
+                    const PopupMenuDivider(),
+                    const PopupMenuItem<String>(
+                        value: 'Remove',
+                        child: ListTile(
+                            leading: Icon(Icons.delete), title: Text('Remove')))
+                  ])),
    );
  }
-}
+}
--- a/lib/widgets/components/Menu/PopupMenuDivider/index.dart
+++ b/lib/widgets/components/Menu/PopupMenuDivider/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-27 15:55:22
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Menu/PopupMenuEntry/index.dart
+++ b/lib/widgets/components/Menu/PopupMenuEntry/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-27 16:06:20
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import '../PopupMenuDivider/demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Menu/PopupMenuItem/index.dart
+++ b/lib/widgets/components/Menu/PopupMenuItem/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-29 15:07:16
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import '../PopupMenuDivider/demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Menu/PopupMenuItemState/index.dart
+++ b/lib/widgets/components/Menu/PopupMenuItemState/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-29 16:22:06
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import '../PopupMenuDivider/demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Navigation/BottomNavigationBar/index.dart
+++ b/lib/widgets/components/Navigation/BottomNavigationBar/index.dart
@ -8,7 +8,7 @@
 */

 import 'package:flutter/material.dart';
-import  '../../../../common/widget_demo.dart';
+import  'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter_markdown/flutter_markdown.dart';
 import './demo.dart' as BottomNavigationBarDemo;
--- a/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart
+++ b/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: BottomNavigationBarItem 的示例
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/components/Panel/ExpansionPanel/index.dart
+++ b/lib/widgets/components/Panel/ExpansionPanel/index.dart
@ -6,7 +6,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Panel/ExpansionPanelList/index.dart
+++ b/lib/widgets/components/Panel/ExpansionPanelList/index.dart
@ -6,7 +6,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Panel/ExpansionPanelRadio/index.dart
+++ b/lib/widgets/components/Panel/ExpansionPanelRadio/index.dart
@ -6,7 +6,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 // import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Pick/DayPicker/index.dart
+++ b/lib/widgets/components/Pick/DayPicker/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-17 15:50:02
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Pick/MonthPicker/index.dart
+++ b/lib/widgets/components/Pick/MonthPicker/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-17 17:06:34
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Pick/ShowdatePicker/index.dart
+++ b/lib/widgets/components/Pick/ShowdatePicker/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-17 16:00:07
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Pick/YearPicker/index.dart
+++ b/lib/widgets/components/Pick/YearPicker/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-17 16:00:07
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Progress/CircularProgressIndicator/index.dart
+++ b/lib/widgets/components/Progress/CircularProgressIndicator/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-17 16:00:07
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Progress/LinearProgressIndicator/index.dart
+++ b/lib/widgets/components/Progress/LinearProgressIndicator/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-17 16:00:07
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart
+++ b/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-17 16:00:07
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 const String content0 = '''
 ### **简介**
--- a/lib/widgets/components/Scaffold/Scaffold/index.dart
+++ b/lib/widgets/components/Scaffold/Scaffold/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/Scaffold/ScaffoldState/index.dart
+++ b/lib/widgets/components/Scaffold/ScaffoldState/index.dart
@ -6,7 +6,7 @@
 * email: sanfan.hx@alibaba-inc.com
 * tartget:  xxx
 */
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import 'demo.dart';

--- a/lib/widgets/components/Scroll/BoxScrollView/index.dart
+++ b/lib/widgets/components/Scroll/BoxScrollView/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-17 13:34:46
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Scroll/CustomScrollView/demo.dart
+++ b/lib/widgets/components/Scroll/CustomScrollView/demo.dart
@ -5,7 +5,8 @@
 * @Last Modified time: 2018-12-20 14:06:31
 */
 import 'package:flutter/material.dart';
-import './product_list.dart';
+import 'package:flutter_go/widgets/components/Scroll/CustomScrollView/product_list.dart';
+

 class CustomScrollViewDemo extends StatelessWidget {
  Widget _buildItem(BuildContext context, ProductItem product) {
--- a/lib/widgets/components/Scroll/CustomScrollView/index.dart
+++ b/lib/widgets/components/Scroll/CustomScrollView/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-20 14:08:29
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Scroll/NestedScrollView/index.dart
+++ b/lib/widgets/components/Scroll/NestedScrollView/index.dart
@ -6,7 +6,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Scroll/ScrollMetrics/index.dart
+++ b/lib/widgets/components/Scroll/ScrollMetrics/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-15 20:33:47
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String content0 = '''
--- a/lib/widgets/components/Scroll/ScrollPhysics/index.dart
+++ b/lib/widgets/components/Scroll/ScrollPhysics/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-15 21:26:11
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const  String content0 = '''
--- a/lib/widgets/components/Scroll/ScrollView/index.dart
+++ b/lib/widgets/components/Scroll/ScrollView/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-14 20:36:57
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';


--- a/lib/widgets/components/Scroll/Scrollable/index.dart
+++ b/lib/widgets/components/Scroll/Scrollable/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-15 17:05:20
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String contentText0 = '''
--- a/lib/widgets/components/Scroll/ScrollbarPainter/index.dart
+++ b/lib/widgets/components/Scroll/ScrollbarPainter/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-15 19:38:18
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String contentText0 = '''
--- a/lib/widgets/components/Tab/Tab/index.dart
+++ b/lib/widgets/components/Tab/Tab/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2018-12-22 20:49:56
 */
 import 'package:flutter/material.dart';
-import '../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String content0 = '''
--- a/lib/widgets/elements/Form/Button/DropdownButton/index.dart
+++ b/lib/widgets/elements/Form/Button/DropdownButton/index.dart
@ -7,7 +7,7 @@
 * target: DropdownButton 的示例
 * 对应文档地址:https://docs.flutter.io/flutter/material/DropdownButton-class.html
 */
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/elements/Form/Button/FlatButton/index.dart
+++ b/lib/widgets/elements/Form/Button/FlatButton/index.dart
@ -7,7 +7,7 @@
 * target: FlatButton 的示例
 * 对应文档地址:https://docs.flutter.io/flutter/material/FlatButton-class.html
 */
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart
+++ b/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart
@ -7,7 +7,7 @@
 * target: FloatingActionButton 的示例
 * 对应文档地址:https://docs.flutter.io/flutter/material/FloatingActionButton-class.html
 */
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'dart:math';
 import 'package:flutter/material.dart';

--- a/lib/widgets/elements/Form/Button/IconButton/demo.dart
+++ b/lib/widgets/elements/Form/Button/IconButton/demo.dart
@ -9,7 +9,7 @@
 import 'dart:math';
 import 'package:flutter/material.dart';

-import 'package:flutter_go/common/icon_names.dart';
+import 'package:flutter_go/resources/icon_names.dart';


 final  int len = IconNames.names.length;
--- a/lib/widgets/elements/Form/Button/IconButton/index.dart
+++ b/lib/widgets/elements/Form/Button/IconButton/index.dart
@ -7,7 +7,7 @@
 * target: IconButton 的示例
 * 对应文档地址:https://docs.flutter.io/flutter/material/IconButton-class.html
 */
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'dart:math';
 import 'package:flutter/material.dart';

--- a/lib/widgets/elements/Form/Button/OutlineButton/index.dart
+++ b/lib/widgets/elements/Form/Button/OutlineButton/index.dart
@ -7,7 +7,7 @@
 * target: OutlineButton 的示例
 * 对应文档地址:https://docs.flutter.io/flutter/material/OutlineButton-class.html
 */
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'dart:math';
 import 'package:flutter/material.dart';

--- a/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart
+++ b/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart
@ -8,7 +8,7 @@
 * 对应文档地址:https://docs.flutter.io/flutter/material/PopupMenuButton-class.html
 */

-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
--- a/lib/widgets/elements/Form/Button/RaisedButton/index.dart
+++ b/lib/widgets/elements/Form/Button/RaisedButton/index.dart
@ -7,7 +7,7 @@
 * target: RaisedButton 的示例
 * 对应文档地址:https://docs.flutter.io/flutter/material/RaisedButton-class.html
 */
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'dart:math';
 import 'package:flutter/material.dart';

--- a/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart
+++ b/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart
@ -7,7 +7,7 @@
 * target: RawMaterialButton 的示例
 * 对应文档地址:https://docs.flutter.io/flutter/material/RawMaterialButton-class.html
 */
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'dart:math';
 import 'package:flutter/material.dart';

--- a/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart
+++ b/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart
@ -7,7 +7,7 @@
 * target: Checkbox 的示例
 * 对应文档地址:https://docs.flutter.io/flutter/material/Checkbox-class.html
 */
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart
+++ b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart
@ -6,7 +6,7 @@
 * email: zhu.yan@alibaba-inc.com
 * tartget: CheckboxListTile 的示例
 */
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 import 'package:flutter/material.dart';

--- a/lib/widgets/elements/Form/Input/TextField/index.dart
+++ b/lib/widgets/elements/Form/Input/TextField/index.dart
@ -8,7 +8,7 @@
 * 对应文档地址:https://docs.flutter.io/flutter/material/TextField-class.html
 */

-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'package:flutter/material.dart';
 import './text_field_demo.dart';

--- a/lib/widgets/elements/Form/Radio/Radio/index.dart
+++ b/lib/widgets/elements/Form/Radio/Radio/index.dart
@ -8,7 +8,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';
 const content1 = """
 # Radio
--- a/lib/widgets/elements/Form/Radio/RadioListTile/index.dart
+++ b/lib/widgets/elements/Form/Radio/RadioListTile/index.dart
@ -8,7 +8,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';
 const content1 = """
 # RadioListTile
--- a/lib/widgets/elements/Form/Slider/Slider/index.dart
+++ b/lib/widgets/elements/Form/Slider/Slider/index.dart
@ -8,7 +8,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import  'demo.dart';

 const contentA = '''
--- a/lib/widgets/elements/Form/Slider/SliderTheme/index.dart
+++ b/lib/widgets/elements/Form/Slider/SliderTheme/index.dart
@ -8,7 +8,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import  'demo.dart';

 const contentA = '''
--- a/lib/widgets/elements/Form/Slider/SliderThemeData/index.dart
+++ b/lib/widgets/elements/Form/Slider/SliderThemeData/index.dart
@ -8,7 +8,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import  'demo.dart';

 const contentA = '''
--- a/lib/widgets/elements/Form/Switch/AnimatedSwitcher/index.dart
+++ b/lib/widgets/elements/Form/Switch/AnimatedSwitcher/index.dart
@ -8,7 +8,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const contentA = '''
--- a/lib/widgets/elements/Form/Switch/Switch/index.dart
+++ b/lib/widgets/elements/Form/Switch/Switch/index.dart
@ -8,7 +8,7 @@
 */

 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import  'demo.dart';

 const contentA = '''
--- a/lib/widgets/elements/Form/Switch/SwitchListTile/index.dart
+++ b/lib/widgets/elements/Form/Switch/SwitchListTile/index.dart
@ -8,7 +8,7 @@
 */
 import 'package:flutter/material.dart';

-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import  'demo.dart';

 const contentA = '''
--- a/lib/widgets/elements/Form/Text/RichText/index.dart
+++ b/lib/widgets/elements/Form/Text/RichText/index.dart
@ -1,5 +1,10 @@
 import 'package:flutter/material.dart';
+<<<<<<< HEAD
 import '../../../../../common/widget_demo.dart';
+=======
+import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:flutter_go/components/widget_demo.dart';
+>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
 import 'demo.dart';
 const String intro = """
 ### **简介**
--- a/lib/widgets/elements/Form/Text/Text/index.dart
+++ b/lib/widgets/elements/Form/Text/Text/index.dart
@ -1,6 +1,12 @@
 import 'package:flutter/material.dart';
+<<<<<<< HEAD
 import '../../../../../common/widget_demo.dart';
 import 'demo.dart';
+=======
+//import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:flutter_go/components/widget_demo.dart';
+import '../../../../../components/markdown.dart';
+>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa

 const String intro = """
 ### **简介**
--- a/lib/widgets/elements/Frame/Align/Align/index.dart
+++ b/lib/widgets/elements/Frame/Align/Align/index.dart
@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String _flatText0 = """
--- a/lib/widgets/elements/Frame/Box/ConstrainedBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/ConstrainedBox/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2019-01-08 15:56:53 
 */
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String _Text = '''
--- a/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2019-01-08 15:56:49 
 */
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String _Text = """### **简介**
--- a/lib/widgets/elements/Frame/Box/Fittedbox/index.dart
+++ b/lib/widgets/elements/Frame/Box/Fittedbox/index.dart
@ -8,7 +8,7 @@
 *
 */
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart' as fittedBox;

 const String Text0 = """
--- a/lib/widgets/elements/Frame/Box/LimitedBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/LimitedBox/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2019-01-08 15:56:35 
 */
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String Text0 = """
--- a/lib/widgets/elements/Frame/Box/OverflowBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/OverflowBox/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2019-01-08 15:56:31 
 */
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart' as overflowBox;

 const String Text0 = """### **OverflowBox简介**
--- a/lib/widgets/elements/Frame/Box/RenderBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/RenderBox/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2019-01-08 15:56:26 
 */
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 const String _Text = '''
 ### **简介**
--- a/lib/widgets/elements/Frame/Box/RotatedBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/RotatedBox/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2019-01-08 15:56:13 
 */
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import 'demo.dart';

 const String _Text = '''
--- a/lib/widgets/elements/Frame/Box/SizeBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/SizeBox/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2019-01-08 15:55:46 
 */
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart' as sizeBox;

 class Demo extends StatefulWidget {
--- a/lib/widgets/elements/Frame/Box/SizedOverflowBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/SizedOverflowBox/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2019-01-08 15:55:31 
 */
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart' as sizeBox;

 // const String _Text = """### **SizeBox简介**
--- a/lib/widgets/elements/Frame/Box/TextBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/TextBox/index.dart
@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';

 const String _Text = """### **TextBox简介**
 > 是一个包含一段文本的矩形
--- a/lib/widgets/elements/Frame/Box/UnconstrainedBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/UnconstrainedBox/index.dart
@ -5,7 +5,7 @@
 * @Last Modified time: 2019-01-08 16:00:14
 */
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String Text0 = """### **简介**
--- a/lib/widgets/elements/Frame/Expanded/Expanded/index.dart
+++ b/lib/widgets/elements/Frame/Expanded/Expanded/index.dart
@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './expanded_demo.dart';

 const contentText0 = '''
--- a/lib/widgets/elements/Frame/Layout/Center/index.dart
+++ b/lib/widgets/elements/Frame/Layout/Center/index.dart
@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String Text0 = """### **简介**
--- a/lib/widgets/elements/Frame/Layout/Column/index.dart
+++ b/lib/widgets/elements/Frame/Layout/Column/index.dart
@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../../../../../common/widget_demo.dart';
+import 'package:flutter_go/components/widget_demo.dart';
 import './demo.dart';

 const String Text0 = """### **简介**
--- a/Show More
+++ b/Show More