diff --git a/CHANGE-LOG.md b/CHANGE-LOG.md new file mode 100644 index 00000000..008820bc --- /dev/null +++ b/CHANGE-LOG.md @@ -0,0 +1,62 @@ +## 更新日志 + +#### 2019-1-24 + - [x] 功能：更新小部件的图标 + - [x] 功能：添加CupertinoTimerPickerDemo + - [x] 调试：消除警告 + - [x] 修复：关于手册图标更换 + - [x] 添加：文案描述 + - [x] 添加：CupertinoPicker，CupertinoPopupSurface +#### 2019-1-23 + - [x] 修复: 导航栏home返回报错 + - [x] 修复：收集错误 + - [x] 添加：CupertinoNavigationBar CupertinoPageRoute CupertinoPageScaffold +#### 2019-1-22 + - [x] 功能：在Allsimon拉请求中添加英文简介 +#### 2019-1-21 + - [x] 功能：Cupertino的子项 +#### 2019-1-20 + - [x] 功能：CupertinoSwitch演示 + - [x] 功能：为搜索列表加入图标 + - [x] 功能：CupertinoSliverRefreshControl演示 + - [x] 功能：CupertinoSliverNavigationBar演示 +#### 2019-1-18 + - [x] 更新：SharedPreferences保存数据和android设备布局溢出 + - [x] 功能：添加CupertinoScrollbar演示 + - [x] 功能：第四页暂时用欢迎页替代。后期再开发 +#### 2019-1-17 + - [x] 添加：+许可证 +#### 2019-1-16 + - [x] 转换：将README翻译为En语言环境 + - [x] 功能：CupertinoScrollbar演示 +#### 2019-1-14 + - [x] 添加：增加手册页面 + - [x] 功能：文字演示 + - [x] 重构：修改过的图标 + - [x] 重构：文档，文章，组件收藏，新增webView + - [x] 重构：修改过的演示 + - [x] 重构：代码视图 + - [x] 更新：版本 和readme.md + - [x] 修改：添加代码视图 + - [x] 功能：添加搜索历史记录板 + - [x] 修改：列出加标头错误 +#### 2019-1-15 + - [x] 功能：welcomepage +#### 2019-1-13 + - [x] 添加：一些输入描述 + - [x] 功能：加入GridPaper＆SliverGrid + - [x] 重构：修改db + - [x] 重构：删除数据库 TabBarView + - [x] 添加：网格视图 + - [x] 修改：checkbosListTile 错误 + - [x] 修改：自动提示文案 + - [x] 功能：增加免责声明，声明组件，自动弹出，左上角入口 + - [x] 重构：整理数据库初始逻辑，判断数据库完整性，判断是否存在已知的cat，widget，collection 三张表。 + - [x] 修复：DialogDemo，无法关闭的问题 +#### 2019-1-12 + - [x] 修复：icon没有，但内容有的，组件，给补充了icon + - [x] 修改：1.整理文件 2.修正分析 + - [x] 更新：flutter_rookie_book => flutter_go + - [x] 更新：更新SearchInput文件名=> search_input + - [x] 修改：文件名称的大小写规范 + - [x] 修改：修正bottomNavigationBar iconButton警告 diff --git a/README.md b/README.md index a08e7133..fd82b0eb 100644 --- a/README.md +++ b/README.md @@ -79,5 +79,3 @@ flutter优点主要包括： Powered by [阿里拍卖前端团队](https://github.com/alibaba-paimai-frontend) - - diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f33a5b45..58f19e90 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ FlutterApplication and put your custom class here. --> CFBundleDevelopmentRegion en CFBundleDisplayName - 菜鸟App + Flutter Go CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/lib/common/Style.dart b/lib/common/Style.dart deleted file mode 100644 index 31d9bb8d..00000000 --- a/lib/common/Style.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:flutter/material.dart'; - -//颜色配置 -class AppColor{ - static const int white = 0xFFFFFFFF; - static const int mainTextColor = 0xFF121917; - static const int subTextColor = 0xff959595; -} - -//文本设置 -class AppText{ - static const middleSize = 16.0; - - static const middleText = TextStyle( - color: Color(AppColor.mainTextColor), - fontSize: middleSize, - ); - - static const middleSubText = TextStyle( - color: Color(AppColor.subTextColor), - fontSize: middleSize, - ); -} -class WidgetDemoColor { - static const int fontColor = 0xFF607173; - static const int iconColor = 0xFF607173; - static const int borderColor = 0xFFEFEFEF; - -} diff --git a/lib/common/event_bus.dart b/lib/common/event_bus.dart deleted file mode 100644 index faf20edc..00000000 --- a/lib/common/event_bus.dart +++ /dev/null @@ -1,8 +0,0 @@ -import 'package:event_bus/event_bus.dart'; - -EventBus eventBus = new EventBus(); - -class MyEvent { - String text; - MyEvent(this.text); -} diff --git a/lib/common/widget-demo.dart b/lib/common/widget-demo.dart deleted file mode 100644 index b359e4d3..00000000 --- a/lib/common/widget-demo.dart +++ /dev/null @@ -1,74 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher.dart'; - -class WidgetDemo extends StatelessWidget { - final Widget child; - final String docUrl; - final String title; - final String codeUrl; - - WidgetDemo( - {Key key, - @required this.title, - @required this.child, - @required this.codeUrl, - @required this.docUrl}) - : super(key: key); - - void _launchURL(String url) async { - if (await canLaunch(url)) { - await launch(url); - } else { - throw 'Could not launch $url'; - } - } - - @override - Widget build(BuildContext context,[bottomNaviBar]) { - return Scaffold( - appBar: new AppBar( - title: Text(title), - actions: [ - new IconButton( - tooltip: 'widget doc', - onPressed: (){ - _launchURL(docUrl); - }, - icon: Icon(Icons.library_books), - ), - new IconButton( - tooltip: 'github code', - onPressed: (){ - _launchURL(codeUrl); - }, - icon: Icon(Icons.code), - ), - new IconButton( - tooltip: 'goBack home', - onPressed: (){ - Navigator.popUntil(context, ModalRoute.withName('/')); - }, - icon: Icon(Icons.home), - ), - ], - ), - body: new Container( - padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 15.0), - child: ListView( - shrinkWrap: true, - padding: const EdgeInsets.all(0.0), - children: [ - Column( - children: [ - SizedBox( - height: 10.0, - ), - child, - ], - ), - ]) - ), - bottomNavigationBar: (bottomNaviBar is Widget)?bottomNaviBar:null - ); - } -} diff --git a/lib/components/cate_card.dart b/lib/components/cate_card.dart index 24c05948..829959fb 100644 --- a/lib/components/cate_card.dart +++ b/lib/components/cate_card.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import '../model/cat.dart'; -import '../common/widget_name_to_icon.dart'; +import '../resources/widget_name_to_icon.dart'; import '../components/widget_item_container.dart'; class CateCard extends StatefulWidget { diff --git a/lib/views/category.dart b/lib/components/category.dart similarity index 100% rename from lib/views/category.dart rename to lib/components/category.dart diff --git a/lib/components/comp_list.dart b/lib/components/comp_list.dart deleted file mode 100644 index 3183bb5a..00000000 --- a/lib/components/comp_list.dart +++ /dev/null @@ -1,99 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_go/views/Detail.dart'; - -class CompList extends StatefulWidget { - @override - State createState() { - return new ListState(); - } -} - -class ListState extends State { - @override - Widget build(BuildContext context) { - /// getData() ; this is test; - return new ListView.builder( - //itemCount: data == null ? 0 : data.length, - itemCount: 100, - itemBuilder: (BuildContext context, int index) { - return new Card( - /////child: new Container( - /////padding: new EdgeInsets.all(10.0), - child: new ListTile( - subtitle: new Container( - child: new Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - new Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - new Expanded( - child: new Text("Title", - - ///data[index]["title"], - style: new TextStyle( - fontWeight: FontWeight.bold, fontSize: 16.0)), - ) - ], - ), - new Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - new Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - new Text("time:"), - new Text("2018-05-06") - ], - ), - ], - ), - new Row( - children: [ - new Container( - padding: - const EdgeInsets.fromLTRB(0.0, 8.0, 0.0, 2.0), - child: new Text("content"), - - ///child: new Text("id:"+data[index]["id"].toString()), - ), - ], - ), - ], - ), - ), - trailing: new Icon( - Icons.keyboard_arrow_right, - color: Colors.grey, - ), - - ///onTap: () => _onTap(data[index]["id"].toString()), - onTap: () => _onTap('1'), - ), - /////), - ); - }, - ); - } - - void _onTap(String id){ - Navigator.of(context).push(new PageRouteBuilder( - opaque: false, - pageBuilder: (BuildContext context, _,__){ - return new Detail(id); - }, - transitionsBuilder: (_,Animation animation,__,Widget child){ - return new FadeTransition( - opacity: animation, - child: new SlideTransition(position: new Tween( - begin: const Offset(0.0, 1.0), - end: Offset.zero, - ).animate(animation),child: child, - ), - ) ; - } - )); - } - -} diff --git a/lib/components/disclaimer_msg.dart b/lib/components/disclaimer_msg.dart index aee0a05f..0f191058 100644 --- a/lib/components/disclaimer_msg.dart +++ b/lib/components/disclaimer_msg.dart @@ -5,11 +5,10 @@ * Time: 下午9:19 * email: zhu.yan@alibaba-inc.com */ + import 'package:flutter/material.dart'; import 'package:shared_preferences/shared_preferences.dart'; - -//import 'package:flutter_rookie_book/model/collection_general.dart'; -//import 'package:flutter_rookie_book/model/collection_general.dart'; +import 'dart:async'; const disclaimerText1 = '\r\r\r\r\r\r本APP属于个人的非赢利性开源项目，以供开源社区使用，凡本APP转载的所有的文章 、图片、音频、视频文件等资料的版权归版权所有人所有，本APP采用的非本站原创文章及图片等内容无法一一和版权者联系，如果本网所选内容的文章作者及编辑认为其作品不宜上网供大家浏览，或不应无偿使用请及时用电子邮件或电话通知我们，以迅速采取适当措施，避免给双方造成不必要的经济损失。'; diff --git a/lib/common/full_screen_code_dialog.dart b/lib/components/full_screen_code_dialog.dart similarity index 94% rename from lib/common/full_screen_code_dialog.dart rename to lib/components/full_screen_code_dialog.dart index ee098740..44af351e 100644 --- a/lib/common/full_screen_code_dialog.dart +++ b/lib/components/full_screen_code_dialog.dart @@ -5,8 +5,8 @@ * @Last Modified time: 2019-01-14 14:42:00 */ import 'package:flutter/material.dart'; -import 'example_code_parser.dart'; -import 'syntax_highlighter.dart'; +import 'package:flutter_go/utils/example_code_parser.dart'; +import 'package:flutter_go/utils/syntax_highlighter.dart'; class FullScreenCodeDialog extends StatefulWidget { const FullScreenCodeDialog({this.filePath}); diff --git a/lib/components/list_refresh.dart b/lib/components/list_refresh.dart index 6a8cd00a..0a7dd455 100644 --- a/lib/components/list_refresh.dart +++ b/lib/components/list_refresh.dart @@ -7,6 +7,7 @@ * tartget: FlatButton 的示例 */ import 'package:flutter/material.dart'; +import 'dart:async'; class ListRefresh extends StatefulWidget { final renderItem; diff --git a/lib/common/list_view_item.dart b/lib/components/list_view_item.dart similarity index 100% rename from lib/common/list_view_item.dart rename to lib/components/list_view_item.dart diff --git a/lib/components/markdown.dart b/lib/components/markdown.dart index ba7ea5d3..5e165299 100644 --- a/lib/components/markdown.dart +++ b/lib/components/markdown.dart @@ -1,5 +1,5 @@ import 'package:flutter_markdown/flutter_markdown.dart' as md; -import '../common/high_light_code.dart'; +import 'package:flutter_go/utils/high_light_code.dart'; import 'package:flutter/material.dart'; /// 使用方法 diff --git a/lib/common/widget_demo.dart b/lib/components/widget_demo.dart similarity index 53% rename from lib/common/widget_demo.dart rename to lib/components/widget_demo.dart index 37653e28..ffc2a7e3 100644 --- a/lib/common/widget_demo.dart +++ b/lib/components/widget_demo.dart @@ -9,9 +9,8 @@ import '../routers/routers.dart'; import '../components/markdown.dart'; import '../model/collection.dart'; import '../widgets/index.dart'; -import 'package:fluttertoast/fluttertoast.dart'; -import '../event/event-bus.dart'; -import '../event/event-model.dart'; +import '../event/event_bus.dart'; +import '../event/event_model.dart'; import 'dart:core'; class WidgetDemo extends StatefulWidget { @@ -27,8 +26,7 @@ class WidgetDemo extends StatefulWidget { @required this.contentList, @required this.codeUrl, @required this.docUrl, - this.bottomNaviBar - }) + this.bottomNaviBar}) : super(key: key); _WidgetDemoState createState() => _WidgetDemoState(); @@ -40,17 +38,7 @@ class _WidgetDemoState extends State { var _collectionIcons; List widgetDemosList = new WidgetDemoList().getDemos(); String _router = ''; - - void showInSnackBar(String value) { - Fluttertoast.showToast( - msg: value, - toastLength: Toast.LENGTH_SHORT, - gravity: ToastGravity.CENTER, - timeInSecForIos: 1, - backgroundColor: Colors.grey, - textColor: Colors.white); - } - + final GlobalKey _scaffoldKey = GlobalKey(); List _buildContent() { List _list = [ @@ -99,8 +87,8 @@ class _WidgetDemoState extends State { setState(() { _hasCollected = false; }); - showInSnackBar('已取消收藏'); - + _scaffoldKey.currentState + .showSnackBar(SnackBar(content: Text('已取消收藏'))); if (ApplicationEvent.event != null) { ApplicationEvent.event .fire(CollectionEvent(widget.title, _router, true)); @@ -124,19 +112,21 @@ class _WidgetDemoState extends State { .fire(CollectionEvent(widget.title, _router, false)); } - showInSnackBar('收藏成功'); + _scaffoldKey.currentState + .showSnackBar(SnackBar(content: Text('收藏成功'))); } }); } } - void _selectValue(value){ - if(value == 'doc'){ + void _selectValue(value) { + if (value == 'doc') { // _launchURL(widget.docUrl); - Application.router.navigateTo(context, '${Routes.webViewPage}?title=${Uri.encodeComponent(widget.title)} Doc&&url=${Uri.encodeComponent(widget.docUrl)}'); - }else if(value =='code'){ - Application.router.navigateTo(context, '${Routes.codeView}?filePath=${Uri.encodeComponent(widget.codeUrl)}'); - + Application.router.navigateTo(context, + '${Routes.webViewPage}?title=${Uri.encodeComponent(widget.title)} Doc&&url=${Uri.encodeComponent(widget.docUrl)}'); + } else if (value == 'code') { + Application.router.navigateTo(context, + '${Routes.codeView}?filePath=${Uri.encodeComponent(widget.codeUrl)}'); } } @@ -148,57 +138,63 @@ class _WidgetDemoState extends State { _collectionIcons = Icons.favorite_border; } return Scaffold( - appBar: AppBar( - title: Text(widget.title), - actions: [ - new IconButton( - tooltip: 'goBack home', - onPressed: () { - Navigator.popUntil(context, ModalRoute.withName('/home')); - }, - icon: Icon(Icons.home), - ), - new IconButton( - tooltip: 'collection', - onPressed: _getCollection, - icon: Icon(_collectionIcons), - ), - PopupMenuButton( - onSelected: _selectValue, - itemBuilder: (BuildContext context) => >[ - const PopupMenuItem( - value: 'doc', - child: ListTile( - leading: Icon(Icons.library_books,size: 22.0,), - title: Text('查看文档'), + key: _scaffoldKey, + appBar: AppBar( + title: Text(widget.title), + actions: [ + new IconButton( + tooltip: 'goBack home', + onPressed: () { + Navigator.popUntil(context, ModalRoute.withName('/home')); + }, + icon: Icon(Icons.home), + ), + new IconButton( + tooltip: 'collection', + onPressed: _getCollection, + icon: Icon(_collectionIcons), + ), + PopupMenuButton( + onSelected: _selectValue, + itemBuilder: (BuildContext context) => >[ + const PopupMenuItem( + value: 'doc', + child: ListTile( + leading: Icon( + Icons.library_books, + size: 22.0, + ), + title: Text('查看文档'), + ), ), - ), - const PopupMenuDivider(), - const PopupMenuItem( - value: 'code', - child: ListTile( - leading: Icon(Icons.code,size: 22.0,), - title: Text('查看Demo'), + const PopupMenuDivider(), + const PopupMenuItem( + value: 'code', + child: ListTile( + leading: Icon( + Icons.code, + size: 22.0, + ), + title: Text('查看Demo'), + ), ), - ), - ], - ), - ], - ), - body: Container( - padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 15.0), - child: ListView( - shrinkWrap: true, - padding: const EdgeInsets.all(0.0), - children: [ - Column( - children: _buildContent(), + ], ), ], ), - ), - bottomNavigationBar: (widget.bottomNaviBar is Widget) ? widget - .bottomNaviBar : null - ); + body: Container( + padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 15.0), + child: ListView( + shrinkWrap: true, + padding: const EdgeInsets.all(0.0), + children: [ + Column( + children: _buildContent(), + ), + ], + ), + ), + bottomNavigationBar: + (widget.bottomNaviBar is Widget) ? widget.bottomNaviBar : null); } } diff --git a/lib/components/widget_item.dart b/lib/components/widget_item.dart index b13966cf..1555b45b 100644 --- a/lib/components/widget_item.dart +++ b/lib/components/widget_item.dart @@ -2,8 +2,8 @@ * @author 一凨 */ import 'package:flutter/material.dart'; -import '../common/style.dart'; -import '../common/widget_name_to_icon.dart'; +import 'package:flutter_go/utils/style.dart'; +import 'package:flutter_go/resources/widget_name_to_icon.dart'; String _widgetName; @@ -13,9 +13,15 @@ class WidgetItem extends StatelessWidget { final int index; //用于计算border final int totalCount; final int rowLength; + final String textSize; WidgetItem( - {this.title, this.onTap, this.index, this.totalCount, this.rowLength}); + {this.title, + this.onTap, + this.index, + this.totalCount, + this.rowLength, + this.textSize}); Border _buildBorder(context) { Border _border; @@ -64,6 +70,9 @@ class WidgetItem extends StatelessWidget { Icons.crop, ); } + final textStyle = (textSize == 'middle') + ? TextStyle(fontSize: 13.8, fontFamily: 'MediumItalic') + : TextStyle(fontSize: 16.0); return InkWell( onTap: onTap, child: Container( @@ -80,7 +89,7 @@ class WidgetItem extends StatelessWidget { SizedBox( height: 8.0, ), - Text(_widgetName), + Text(_widgetName, style: textStyle), ], ), ), diff --git a/lib/components/widget_item_container.dart b/lib/components/widget_item_container.dart index 2ddf3029..4537fb8d 100644 --- a/lib/components/widget_item_container.dart +++ b/lib/components/widget_item_container.dart @@ -7,6 +7,7 @@ class WidgetItemContainer extends StatelessWidget { final int columnCount; //一行几个 final List categories; final bool isWidgetPoint; + // 所有的可用demos; final List widgetDemosList = new WidgetDemoList().getDemos(); @@ -50,6 +51,7 @@ class WidgetItemContainer extends StatelessWidget { index: addI, totalCount: length, rowLength: columnCount, + textSize: isWidgetPoint ? 'middle' : 'small', ), ), ); diff --git a/lib/event/event-bus.dart b/lib/event/event_bus.dart similarity index 100% rename from lib/event/event-bus.dart rename to lib/event/event_bus.dart diff --git a/lib/event/event-model.dart b/lib/event/event_model.dart similarity index 100% rename from lib/event/event-model.dart rename to lib/event/event_model.dart diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart deleted file mode 100644 index db983ef0..00000000 --- a/lib/generated/i18n.dart +++ /dev/null @@ -1,78 +0,0 @@ - -import 'dart:async'; - -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -// ignore_for_file: non_constant_identifier_names -// ignore_for_file: camel_case_types -// ignore_for_file: prefer_single_quotes - -//This file is automatically generated. DO NOT EDIT, all your changes would be lost. - -class S implements WidgetsLocalizations { - const S(); - - static const GeneratedLocalizationsDelegate delegate = - const GeneratedLocalizationsDelegate(); - - static S of(BuildContext context) => - Localizations.of(context, WidgetsLocalizations); - - @override - TextDirection get textDirection => TextDirection.ltr; - -} - -class en extends S { - const en(); -} - - -class GeneratedLocalizationsDelegate extends LocalizationsDelegate { - const GeneratedLocalizationsDelegate(); - - List get supportedLocales { - return const [ - - const Locale("en", ""), - - ]; - } - - LocaleResolutionCallback resolution({Locale fallback}) { - return (Locale locale, Iterable supported) { - final Locale languageLocale = new Locale(locale.languageCode, ""); - if (supported.contains(locale)) - return locale; - else if (supported.contains(languageLocale)) - return languageLocale; - else { - final Locale fallbackLocale = fallback ?? supported.first; - return fallbackLocale; - } - }; - } - - @override - Future load(Locale locale) { - final String lang = getLang(locale); - switch (lang) { - - case "en": - return new SynchronousFuture(const en()); - - default: - return new SynchronousFuture(const S()); - } - } - - @override - bool isSupported(Locale locale) => supportedLocales.contains(locale); - - @override - bool shouldReload(GeneratedLocalizationsDelegate old) => false; -} - -String getLang(Locale l) => l.countryCode != null && l.countryCode.isEmpty - ? l.languageCode - : l.toString(); diff --git a/lib/main.dart b/lib/main.dart index 2979687b..3eee4c35 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,7 +3,7 @@ import 'package:fluro/fluro.dart'; import 'package:flutter/rendering.dart'; import 'routers/routers.dart'; import 'routers/application.dart'; -import 'common/provider.dart'; +import 'package:flutter_go/utils/provider.dart'; import 'views/welcome_page/index.dart'; diff --git a/lib/model/cat.dart b/lib/model/cat.dart index bf86764d..21be3e4e 100644 --- a/lib/model/cat.dart +++ b/lib/model/cat.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import '../common/sql.dart'; +import 'package:flutter_go/utils/sql.dart'; abstract class CatInterface{ int get id; diff --git a/lib/model/collection.dart b/lib/model/collection.dart index a8d4ca5e..c764c46b 100644 --- a/lib/model/collection.dart +++ b/lib/model/collection.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 17:37:42 */ import 'dart:async'; -import '../common/sql.dart'; +import 'package:flutter_go/utils/sql.dart'; abstract class CollectionInterface { String get name; diff --git a/lib/model/collection_general.dart b/lib/model/collection_general.dart deleted file mode 100644 index 18367092..00000000 --- a/lib/model/collection_general.dart +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Created with Android Studio. - * User: 一晟 - * Date: 2019/1/12 - * Time: 下午9:19 - * email: zhu.yan@alibaba-inc.com - */ -import 'dart:async'; -import '../common/sql.dart'; - -abstract class CollectionInterface { - String get key; - String get values; -} - -class CollectionGeneral implements CollectionInterface { - String key; - String values; - - CollectionGeneral({this.key, this.values}); - - factory CollectionGeneral.fromJSON(Map json){ - return CollectionGeneral(key: json['name'],values: json['values']); - } - - Object toMap() { - return {'key': key, 'values': values}; - } -} - -class CollectionControlModel { - final String table = 'collectionGeneral'; - Sql sql; - - CollectionControlModel() { - sql = Sql.setTable(table); - } - - // 获取所有的收藏 - - // 插入新收藏 - Future insert(CollectionGeneral collection) { - var result = - sql.insert({'key': collection.key, 'values': collection.values}); - return result; - } - - // 获取全部的收藏 - Future> getAllCollection() async { - List list = await sql.getByCondition(); - List resultList = []; - list.forEach((item){ - resultList.add(CollectionGeneral.fromJSON(item)); - }); - return resultList; - } - - // 通过收藏名获取router - Future getRouterByName(String key) async { - List list = await sql.getByCondition(conditions: {'key': key}); - return list; - } - - // 删除 - Future deleteByName(String key) async{ - return await sql.delete(key,'key'); - } -} diff --git a/lib/model/widget.dart b/lib/model/widget.dart index db9afcc4..a3bfda79 100644 --- a/lib/model/widget.dart +++ b/lib/model/widget.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import '../common/sql.dart'; +import 'package:flutter_go/utils/sql.dart'; import "package:flutter/material.dart"; abstract class WidgetInterface { diff --git a/lib/common/icon_names.dart b/lib/resources/icon_names.dart similarity index 100% rename from lib/common/icon_names.dart rename to lib/resources/icon_names.dart diff --git a/lib/common/widget_name_to_icon.dart b/lib/resources/widget_name_to_icon.dart similarity index 96% rename from lib/common/widget_name_to_icon.dart rename to lib/resources/widget_name_to_icon.dart index 8565d35f..95dff598 100644 --- a/lib/common/widget_name_to_icon.dart +++ b/lib/resources/widget_name_to_icon.dart @@ -157,12 +157,12 @@ class WidgetName2Icon { "CupertinoPopupSurface":Icons.center_focus_weak, "CupertinoScrollbar": Icons.fullscreen, "CupertinoSlider": Icons.switch_camera, - "CupertinoSegmentedControl": Icons.radio_button_checked, + "CupertinoSegmentedControl": Icons.business_center, "CupertinoSliverNavigationBar": Icons.subtitles, - "CupertinoSwitch": Icons.check_box, + "CupertinoSwitch": Icons.radio_button_checked, "CupertinoTabBar": Icons.tab, - "CupertinoTabScaffold": Icons.tab, - "CupertinoTabView": Icons.table_chart, + "CupertinoTabScaffold": Icons.crop_original, + "CupertinoTabView": Icons.tablet, "CupertinoTimerPicker": Icons.timer }; } diff --git a/lib/routers/router_handler.dart b/lib/routers/router_handler.dart index 1b12b954..ce4aab38 100644 --- a/lib/routers/router_handler.dart +++ b/lib/routers/router_handler.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:fluro/fluro.dart'; -import '../views/category.dart'; +import 'package:flutter_go/components/category.dart'; import '../widgets/404.dart'; -import '../common/full_screen_code_dialog.dart'; -import '../views/web_view_page.dart'; -import '../views/home.dart'; +import 'package:flutter_go/components/full_screen_code_dialog.dart'; +import 'package:flutter_go/views/web_page/web_view_page.dart'; +import 'package:flutter_go/views/first_page/home.dart'; // app的首页 var homeHandler = new Handler( diff --git a/lib/common/example_code_parser.dart b/lib/utils/example_code_parser.dart similarity index 95% rename from lib/common/example_code_parser.dart rename to lib/utils/example_code_parser.dart index a045816d..a3e7abec 100644 --- a/lib/common/example_code_parser.dart +++ b/lib/utils/example_code_parser.dart @@ -9,7 +9,7 @@ // found in the LICENSE file. import 'dart:async'; -import '../routers/application.dart'; +import 'package:flutter_go/routers/application.dart'; import 'package:flutter/services.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:flutter/material.dart'; diff --git a/lib/common/high_light_code.dart b/lib/utils/high_light_code.dart similarity index 100% rename from lib/common/high_light_code.dart rename to lib/utils/high_light_code.dart diff --git a/lib/common/net_utils.dart b/lib/utils/net_utils.dart similarity index 100% rename from lib/common/net_utils.dart rename to lib/utils/net_utils.dart diff --git a/lib/common/provider.dart b/lib/utils/provider.dart similarity index 99% rename from lib/common/provider.dart rename to lib/utils/provider.dart index 6704fc9d..35a354c7 100644 --- a/lib/common/provider.dart +++ b/lib/utils/provider.dart @@ -59,7 +59,6 @@ class Provider { //Get a location using getDatabasesPath String databasesPath = await getDatabasesPath(); String path = join(databasesPath, 'flutter.db'); - try { db = await openDatabase(path); } catch (e) { diff --git a/lib/common/sql.dart b/lib/utils/sql.dart similarity index 100% rename from lib/common/sql.dart rename to lib/utils/sql.dart diff --git a/lib/common/style.dart b/lib/utils/style.dart similarity index 100% rename from lib/common/style.dart rename to lib/utils/style.dart diff --git a/lib/common/syntax_highlighter.dart b/lib/utils/syntax_highlighter.dart similarity index 100% rename from lib/common/syntax_highlighter.dart rename to lib/utils/syntax_highlighter.dart diff --git a/lib/common/util.dart b/lib/utils/util.dart similarity index 100% rename from lib/common/util.dart rename to lib/utils/util.dart diff --git a/lib/views/Detail.dart b/lib/views/Detail.dart deleted file mode 100644 index 0677a2bc..00000000 --- a/lib/views/Detail.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:flutter/material.dart'; - -class Detail extends StatelessWidget { - - final String id ; - Detail(this.id) ; - - - @override - Widget build(BuildContext context) { - return new Scaffold( - appBar: new AppBar( - title: new Text('List Detail'), - ), - body: new Center( - child: new Text('msg:'+ 'id='+id), - ), - ) ; - } - - -} \ No newline at end of file diff --git a/lib/views/collection_page.dart b/lib/views/collection_page/collection_page.dart similarity index 93% rename from lib/views/collection_page.dart rename to lib/views/collection_page/collection_page.dart index af417ad7..0e153a59 100644 --- a/lib/views/collection_page.dart +++ b/lib/views/collection_page/collection_page.dart @@ -5,11 +5,11 @@ * @Last Modified time: 2019-01-14 20:13:28 */ import 'package:flutter/material.dart'; -import '../model/collection.dart'; -import '../routers/application.dart'; -import '../routers/routers.dart'; -import '../event/event-bus.dart'; -import '../event/event-model.dart'; +import 'package:flutter_go/model/collection.dart'; +import 'package:flutter_go/routers/application.dart'; +import 'package:flutter_go/routers/routers.dart'; +import 'package:flutter_go/event/event_bus.dart'; +import 'package:flutter_go/event/event_model.dart'; import 'package:event_bus/event_bus.dart'; class CollectionPage extends StatefulWidget { diff --git a/lib/views/detail.dart b/lib/views/detail.dart deleted file mode 100644 index 0677a2bc..00000000 --- a/lib/views/detail.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:flutter/material.dart'; - -class Detail extends StatelessWidget { - - final String id ; - Detail(this.id) ; - - - @override - Widget build(BuildContext context) { - return new Scaffold( - appBar: new AppBar( - title: new Text('List Detail'), - ), - body: new Center( - child: new Text('msg:'+ 'id='+id), - ), - ) ; - } - - -} \ No newline at end of file diff --git a/lib/views/first_page.dart b/lib/views/first_page/first_page.dart similarity index 95% rename from lib/views/first_page.dart rename to lib/views/first_page/first_page.dart index 38b65e22..a7f8feb8 100644 --- a/lib/views/first_page.dart +++ b/lib/views/first_page/first_page.dart @@ -1,13 +1,13 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:flutter_go/common/list_view_item.dart'; +import 'package:flutter_go/components/list_view_item.dart'; import 'package:flutter_go/components/list_refresh.dart' as listComp; import 'package:flutter_go/components/pagination.dart'; -import 'package:flutter_go/components/first_page_item.dart'; +import 'package:flutter_go/views/first_page/first_page_item.dart'; import 'package:flutter_go/components/disclaimer_msg.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import '../common/net_utils.dart'; +import 'package:flutter_go/utils/net_utils.dart'; GlobalKey key; diff --git a/lib/components/first_page_item.dart b/lib/views/first_page/first_page_item.dart similarity index 96% rename from lib/components/first_page_item.dart rename to lib/views/first_page/first_page_item.dart index 3e4e8604..0c6a9ff9 100644 --- a/lib/components/first_page_item.dart +++ b/lib/views/first_page/first_page_item.dart @@ -7,7 +7,7 @@ * tartget: FirstPageItem */ -import '../common/Util.dart'; +import 'package:flutter_go/utils/util.dart'; class FirstPageItem { bool hot; diff --git a/lib/views/home.dart b/lib/views/first_page/home.dart similarity index 90% rename from lib/views/home.dart rename to lib/views/first_page/home.dart index 4eb9b49d..f82b5e77 100644 --- a/lib/views/home.dart +++ b/lib/views/first_page/home.dart @@ -12,16 +12,16 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'first_page.dart'; -import 'widget_page.dart'; +import 'package:flutter_go/views/first_page/first_page.dart'; +import 'package:flutter_go/views/widget_page/widget_page.dart'; import 'package:flutter_go/views/welcome_page/fourth_page.dart'; -import 'collection_page.dart'; -import '../routers/application.dart'; -import '../common/provider.dart'; -import '../model/widget.dart'; -import '../widgets/index.dart'; +import 'package:flutter_go/views/collection_page/collection_page.dart'; +import 'package:flutter_go/routers/application.dart'; +import 'package:flutter_go/utils//provider.dart'; +import 'package:flutter_go/model/widget.dart'; +import 'package:flutter_go/widgets/index.dart'; import 'package:flutter_go/components/search_input.dart'; -import '../common/widget_name_to_icon.dart'; +import 'package:flutter_go/resources/widget_name_to_icon.dart'; const int ThemeColor = 0xFFC91B3A; diff --git a/lib/components/fourth_page_feature/page_dragger.dart b/lib/views/fourth_page/page_dragger.dart similarity index 98% rename from lib/components/fourth_page_feature/page_dragger.dart rename to lib/views/fourth_page/page_dragger.dart index 5b00e29f..6ba965b1 100644 --- a/lib/components/fourth_page_feature/page_dragger.dart +++ b/lib/views/fourth_page/page_dragger.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'dart:ui'; import 'package:flutter/material.dart'; -import './pager_indicator.dart'; +import 'package:flutter_go/views/fourth_page/pager_indicator.dart'; class PageDragger extends StatefulWidget { diff --git a/lib/components/fourth_page_feature/page_reveal.dart b/lib/views/fourth_page/page_reveal.dart similarity index 96% rename from lib/components/fourth_page_feature/page_reveal.dart rename to lib/views/fourth_page/page_reveal.dart index 2cc1490c..4cd5a48a 100644 --- a/lib/components/fourth_page_feature/page_reveal.dart +++ b/lib/views/fourth_page/page_reveal.dart @@ -46,7 +46,6 @@ class CircleRevealClipper extends CustomClipper{ @override bool shouldReclip(CustomClipper oldClipper) { - // TODO: implement shouldReclip return true; } diff --git a/lib/components/fourth_page_feature/pager_indicator.dart b/lib/views/fourth_page/pager_indicator.dart similarity index 98% rename from lib/components/fourth_page_feature/pager_indicator.dart rename to lib/views/fourth_page/pager_indicator.dart index 4bb7db55..e9e93ee9 100644 --- a/lib/components/fourth_page_feature/pager_indicator.dart +++ b/lib/views/fourth_page/pager_indicator.dart @@ -1,7 +1,7 @@ import 'dart:ui'; import 'package:flutter/material.dart'; -import './pages.dart'; +import 'package:flutter_go/views/fourth_page/pages.dart'; class PagerIndicator extends StatelessWidget { diff --git a/lib/components/fourth_page_feature/pages.dart b/lib/views/fourth_page/pages.dart similarity index 100% rename from lib/components/fourth_page_feature/pages.dart rename to lib/views/fourth_page/pages.dart diff --git a/lib/views/web_view_page.dart b/lib/views/web_page/web_view_page.dart similarity index 64% rename from lib/views/web_view_page.dart rename to lib/views/web_page/web_view_page.dart index 1cbbe1a0..2c04b675 100644 --- a/lib/views/web_view_page.dart +++ b/lib/views/web_page/web_view_page.dart @@ -6,10 +6,9 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_webview_plugin/flutter_webview_plugin.dart'; -import '../model/collection.dart'; -import '../event/event-bus.dart'; -import '../event/event-model.dart'; -import 'package:fluttertoast/fluttertoast.dart'; +import 'package:flutter_go/model/collection.dart'; +import 'package:flutter_go/event/event_bus.dart'; +import 'package:flutter_go/event/event_model.dart'; import 'dart:core'; class WebViewPage extends StatefulWidget { @@ -23,26 +22,18 @@ class WebViewPage extends StatefulWidget { class _WebViewPageState extends State { bool _hasCollected = false; String _router = ''; - var _collectionIcons; + var _collectionIcons; CollectionControlModel _collectionControl = new CollectionControlModel(); - void showInSnackBar(String value) { - Fluttertoast.showToast( - msg: value, - toastLength: Toast.LENGTH_SHORT, - gravity: ToastGravity.CENTER, - timeInSecForIos: 1, - backgroundColor: Colors.grey, - textColor: Colors.white); - } - + final GlobalKey _scaffoldKey = GlobalKey(); @override void initState() { super.initState(); - _collectionControl.getRouterByName(Uri.encodeComponent(widget.title.trim())).then((list) { - + _collectionControl + .getRouterByName(Uri.encodeComponent(widget.title.trim())) + .then((list) { list.forEach((item) { - if(widget.title.trim() == item['name']){ + if (widget.title.trim() == item['name']) { _router = item['router']; } }); @@ -58,13 +49,15 @@ class _WebViewPageState extends State { _getCollection() { if (_hasCollected) { // 删除操作 - _collectionControl.deleteByName(Uri.encodeComponent(widget.title.trim())).then((result) { + _collectionControl + .deleteByName(Uri.encodeComponent(widget.title.trim())) + .then((result) { if (result > 0 && this.mounted) { setState(() { _hasCollected = false; }); - showInSnackBar('已取消收藏'); - + _scaffoldKey.currentState + .showSnackBar(SnackBar(content: Text('已取消收藏'))); if (ApplicationEvent.event != null) { ApplicationEvent.event .fire(CollectionEvent(widget.title, _router, true)); @@ -76,7 +69,9 @@ class _WebViewPageState extends State { } else { // 插入操作 _collectionControl - .insert(Collection(name:Uri.encodeComponent(widget.title.trim()) , router: widget.url)) + .insert(Collection( + name: Uri.encodeComponent(widget.title.trim()), + router: widget.url)) .then((result) { if (this.mounted) { setState(() { @@ -87,8 +82,8 @@ class _WebViewPageState extends State { ApplicationEvent.event .fire(CollectionEvent(widget.title, _router, false)); } - - showInSnackBar('收藏成功'); + _scaffoldKey.currentState + .showSnackBar(SnackBar(content: Text('收藏成功'))); } }); } @@ -101,21 +96,26 @@ class _WebViewPageState extends State { } else { _collectionIcons = Icons.favorite_border; } - return WebviewScaffold( - url: widget.url, + return Scaffold( + key: _scaffoldKey, appBar: AppBar( title: Text(widget.title), actions: [ new IconButton( tooltip: 'goBack home', onPressed: _getCollection, - icon: Icon(_collectionIcons,), + icon: Icon( + _collectionIcons, + ), ), ], ), - withZoom: false, - withLocalStorage: true, - withJavascript: true, + body: WebviewScaffold( + url: widget.url, + withZoom: false, + withLocalStorage: true, + withJavascript: true, + ), ); } } diff --git a/lib/views/welcome_page/fourth_page.dart b/lib/views/welcome_page/fourth_page.dart index 6c80423e..26ec7df1 100644 --- a/lib/views/welcome_page/fourth_page.dart +++ b/lib/views/welcome_page/fourth_page.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:flutter_go/components/fourth_page_feature/page_dragger.dart'; -import 'package:flutter_go/components/fourth_page_feature/page_reveal.dart'; -import 'package:flutter_go/components/fourth_page_feature/pager_indicator.dart'; -import 'package:flutter_go/components/fourth_page_feature/pages.dart'; +import 'package:flutter_go/views/fourth_page/page_dragger.dart'; +import 'package:flutter_go/views/fourth_page/page_reveal.dart'; +import 'package:flutter_go/views/fourth_page/pager_indicator.dart'; +import 'package:flutter_go/views/fourth_page/pages.dart'; class FourthPage extends StatefulWidget { @override diff --git a/lib/views/widget_page.dart b/lib/views/widget_page/widget_page.dart similarity index 97% rename from lib/views/widget_page.dart rename to lib/views/widget_page/widget_page.dart index baa6666b..9abde027 100644 --- a/lib/views/widget_page.dart +++ b/lib/views/widget_page/widget_page.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_go/components/cate_card.dart'; -import '../model/cat.dart'; +import 'package:flutter_go/model/cat.dart'; class WidgetPage extends StatefulWidget { final db; diff --git a/lib/widgets/components/Bar/AppBar/index.dart b/lib/widgets/components/Bar/AppBar/index.dart index 5282d352..82bdf8c1 100644 --- 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'; diff --git a/lib/widgets/components/Bar/BottomAppBar/index.dart b/lib/widgets/components/Bar/BottomAppBar/index.dart index 4e70c2f6..18c2d159 100644 --- 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'; diff --git a/lib/widgets/components/Bar/ButtonBar/index.dart b/lib/widgets/components/Bar/ButtonBar/index.dart index bce2b1ce..8c9de1ff 100644 --- 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'; diff --git a/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart b/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart index d6dbc972..80f27150 100644 --- 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'; diff --git a/lib/widgets/components/Bar/SliverAppBar/index.dart b/lib/widgets/components/Bar/SliverAppBar/index.dart index 4205f09d..367b5216 100644 --- 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'; diff --git a/lib/widgets/components/Bar/SnackBar/index.dart b/lib/widgets/components/Bar/SnackBar/index.dart index 4e7adbb2..2047f783 100644 --- 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'; diff --git a/lib/widgets/components/Bar/SnackBarAction/index.dart b/lib/widgets/components/Bar/SnackBarAction/index.dart index 4d213c0c..964eefd8 100644 --- 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; diff --git a/lib/widgets/components/Bar/TabBar/index.dart b/lib/widgets/components/Bar/TabBar/index.dart index bb2b364d..e8474d19 100644 --- 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'; diff --git a/lib/widgets/components/Card/Card/index.dart b/lib/widgets/components/Card/Card/index.dart index 0ee2d452..5ee1fbb5 100644 --- 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'; diff --git a/lib/widgets/components/Chip/Chip/index.dart b/lib/widgets/components/Chip/Chip/index.dart index ac24f469..89496515 100644 --- 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 = ''' diff --git a/lib/widgets/components/Chip/ChipTheme/index.dart b/lib/widgets/components/Chip/ChipTheme/index.dart index e4ff62fe..ecf2865a 100644 --- 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 = ''' diff --git a/lib/widgets/components/Chip/ChipThemeData/index.dart b/lib/widgets/components/Chip/ChipThemeData/index.dart index 908b4c6f..bc2d7599 100644 --- 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 = ''' diff --git a/lib/widgets/components/Chip/ChoiceChip/index.dart b/lib/widgets/components/Chip/ChoiceChip/index.dart index 62f43080..31e75a8c 100644 --- 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 = ''' diff --git a/lib/widgets/components/Chip/FilterChip/index.dart b/lib/widgets/components/Chip/FilterChip/index.dart index a7a7db79..d57aea7b 100644 --- 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 = ''' diff --git a/lib/widgets/components/Chip/RawChip/index.dart b/lib/widgets/components/Chip/RawChip/index.dart index abebb064..10fff9e8 100644 --- 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 = ''' diff --git a/lib/widgets/components/Chip/inputChip/index.dart b/lib/widgets/components/Chip/inputChip/index.dart index af0f09ab..99f62d4f 100644 --- 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 = ''' diff --git a/lib/widgets/components/Dialog/AboutDialog/index.dart b/lib/widgets/components/Dialog/AboutDialog/index.dart index ea0c01ac..6aae793c 100644 --- 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'; diff --git a/lib/widgets/components/Dialog/AlertDialog/index.dart b/lib/widgets/components/Dialog/AlertDialog/index.dart index e9364564..829496e3 100644 --- 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'; diff --git a/lib/widgets/components/Dialog/Dialog/index.dart b/lib/widgets/components/Dialog/Dialog/index.dart index 626cdc92..371c1ad8 100644 --- 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'; diff --git a/lib/widgets/components/Dialog/SimpleDialog/index.dart b/lib/widgets/components/Dialog/SimpleDialog/index.dart index 4f607d73..3475f063 100644 --- 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'; diff --git a/lib/widgets/components/Grid/GridPaper/index.dart b/lib/widgets/components/Grid/GridPaper/index.dart index 1044d44a..118aef20 100644 --- 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'; diff --git a/lib/widgets/components/Grid/GridTile/index.dart b/lib/widgets/components/Grid/GridTile/index.dart index f1b119b1..2bf3c7e7 100644 --- 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'; diff --git a/lib/widgets/components/Grid/GridTileBar/index.dart b/lib/widgets/components/Grid/GridTileBar/index.dart index b19b8abd..66b67469 100644 --- 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'; diff --git a/lib/widgets/components/Grid/GridView/index.dart b/lib/widgets/components/Grid/GridView/index.dart index dac9fcd2..fe20e46a 100644 --- 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'; diff --git a/lib/widgets/components/Grid/SliverGrid/index.dart b/lib/widgets/components/Grid/SliverGrid/index.dart index 6b8c2a6a..926387af 100644 --- 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'; diff --git a/lib/widgets/components/LIst/AnimatedList/demo.dart b/lib/widgets/components/LIst/AnimatedList/demo.dart index 04617de1..78f457fb 100644 --- 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); diff --git a/lib/widgets/components/LIst/AnimatedList/index.dart b/lib/widgets/components/LIst/AnimatedList/index.dart index 39a82dcf..2392ab46 100644 --- 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'; diff --git a/lib/widgets/components/LIst/ListBody/index.dart b/lib/widgets/components/LIst/ListBody/index.dart index 8dc071da..1699540b 100644 --- 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'; diff --git a/lib/widgets/components/LIst/ListView/index.dart b/lib/widgets/components/LIst/ListView/index.dart index 375d50ad..1bbebf52 100644 --- 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'; diff --git a/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart b/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart index fe1628fc..8bbe3dce 100644 --- 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 { _checkedValues = [_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 diff --git a/lib/widgets/components/Menu/CheckedPopupMenuItem/index.dart b/lib/widgets/components/Menu/CheckedPopupMenuItem/index.dart index ddbed396..3264f1f8 100644 --- 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 = ''' diff --git a/lib/widgets/components/Menu/DropdownMenuItem/index.dart b/lib/widgets/components/Menu/DropdownMenuItem/index.dart index 4d50b003..9180cd4e 100644 --- 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'; diff --git a/lib/widgets/components/Menu/PopupMenuButton/demo.dart b/lib/widgets/components/Menu/PopupMenuButton/demo.dart index 0a54f9d4..f992f0f1 100644 --- 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 { void showMenuSelection(String value) { if ([_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() { diff --git a/lib/widgets/components/Menu/PopupMenuButton/index.dart b/lib/widgets/components/Menu/PopupMenuButton/index.dart index ae6b45e9..cc98d67b 100644 --- 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 = ''' diff --git a/lib/widgets/components/Menu/PopupMenuDivider/demo.dart b/lib/widgets/components/Menu/PopupMenuDivider/demo.dart index e5ec33e5..94e2f8df 100644 --- 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 { + 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( + child: ListTile( + title: const Text('An item with a sectioned menu'), + trailing: PopupMenuButton( padding: EdgeInsets.zero, onSelected: showInSnackBar, itemBuilder: (BuildContext context) => >[ - const PopupMenuItem( - value: 'Preview', - child: ListTile( - leading: Icon(Icons.visibility), - title: Text('Preview') - ) - ), - const PopupMenuItem( - value: 'Share', - child: ListTile( - leading: Icon(Icons.person_add), - title: Text('Share') - ) - ), - const PopupMenuItem( - value: 'Get Link', - child: ListTile( - leading: Icon(Icons.link), - title: Text('Get link') - ) - ), - const PopupMenuDivider(), - const PopupMenuItem( - value: 'Remove', - child: ListTile( - leading: Icon(Icons.delete), - title: Text('Remove') - ) - ) - ] - ) - ), + const PopupMenuItem( + value: 'Preview', + child: ListTile( + leading: Icon(Icons.visibility), + title: Text('Preview'))), + const PopupMenuItem( + value: 'Share', + child: ListTile( + leading: Icon(Icons.person_add), + title: Text('Share'))), + const PopupMenuItem( + value: 'Get Link', + child: ListTile( + leading: Icon(Icons.link), + title: Text('Get link'))), + const PopupMenuDivider(), + const PopupMenuItem( + value: 'Remove', + child: ListTile( + leading: Icon(Icons.delete), title: Text('Remove'))) + ])), ); } -} \ No newline at end of file +} diff --git a/lib/widgets/components/Menu/PopupMenuDivider/index.dart b/lib/widgets/components/Menu/PopupMenuDivider/index.dart index f504ac82..92beca57 100644 --- 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 = ''' diff --git a/lib/widgets/components/Menu/PopupMenuEntry/index.dart b/lib/widgets/components/Menu/PopupMenuEntry/index.dart index e398bd8d..e5c46fe9 100644 --- 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 = ''' diff --git a/lib/widgets/components/Menu/PopupMenuItem/index.dart b/lib/widgets/components/Menu/PopupMenuItem/index.dart index a5aa8090..f8b8e315 100644 --- 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 = ''' diff --git a/lib/widgets/components/Menu/PopupMenuItemState/index.dart b/lib/widgets/components/Menu/PopupMenuItemState/index.dart index 036c5eeb..b86d20dc 100644 --- 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 = ''' diff --git a/lib/widgets/components/Navigation/BottomNavigationBar/index.dart b/lib/widgets/components/Navigation/BottomNavigationBar/index.dart index 46860484..c73376fc 100644 --- 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; diff --git a/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart b/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart index 00b042df..c1589873 100644 --- 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'; diff --git a/lib/widgets/components/Panel/ExpansionPanel/index.dart b/lib/widgets/components/Panel/ExpansionPanel/index.dart index fba23ad7..6e8c8072 100644 --- 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 = ''' diff --git a/lib/widgets/components/Panel/ExpansionPanelList/index.dart b/lib/widgets/components/Panel/ExpansionPanelList/index.dart index ede5dfcc..4117bd4e 100644 --- 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 = ''' diff --git a/lib/widgets/components/Panel/ExpansionPanelRadio/index.dart b/lib/widgets/components/Panel/ExpansionPanelRadio/index.dart index 8c9c3c6f..25f87de7 100644 --- 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 = ''' diff --git a/lib/widgets/components/Pick/DayPicker/index.dart b/lib/widgets/components/Pick/DayPicker/index.dart index d171fc18..3eb2c430 100644 --- 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 = ''' diff --git a/lib/widgets/components/Pick/MonthPicker/index.dart b/lib/widgets/components/Pick/MonthPicker/index.dart index cba6ca2a..8ff651a0 100644 --- 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 = ''' diff --git a/lib/widgets/components/Pick/ShowdatePicker/index.dart b/lib/widgets/components/Pick/ShowdatePicker/index.dart index b19a4c64..3ed5a1dc 100644 --- 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 = ''' diff --git a/lib/widgets/components/Pick/YearPicker/index.dart b/lib/widgets/components/Pick/YearPicker/index.dart index cdce256e..db6c88ed 100644 --- 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 = ''' diff --git a/lib/widgets/components/Progress/CircularProgressIndicator/index.dart b/lib/widgets/components/Progress/CircularProgressIndicator/index.dart index ac0367c9..5a44e5e7 100644 --- 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 = ''' diff --git a/lib/widgets/components/Progress/LinearProgressIndicator/index.dart b/lib/widgets/components/Progress/LinearProgressIndicator/index.dart index 0f1082a0..9d2c1a32 100644 --- 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 = ''' diff --git a/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart b/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart index a29d07ca..bd447cc9 100644 --- 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 = ''' ### **简介** diff --git a/lib/widgets/components/Scaffold/Scaffold/index.dart b/lib/widgets/components/Scaffold/Scaffold/index.dart index 9415293e..95b0d9ce 100644 --- 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'; diff --git a/lib/widgets/components/Scaffold/ScaffoldState/index.dart b/lib/widgets/components/Scaffold/ScaffoldState/index.dart index 2abc155c..1993424b 100644 --- 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'; diff --git a/lib/widgets/components/Scroll/BoxScrollView/index.dart b/lib/widgets/components/Scroll/BoxScrollView/index.dart index 31e892f9..0c155d66 100644 --- 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 = ''' diff --git a/lib/widgets/components/Scroll/CustomScrollView/demo.dart b/lib/widgets/components/Scroll/CustomScrollView/demo.dart index d6dcc443..2d23f2ed 100644 --- 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) { diff --git a/lib/widgets/components/Scroll/CustomScrollView/index.dart b/lib/widgets/components/Scroll/CustomScrollView/index.dart index 88f2e9d4..13940ed1 100644 --- 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 = ''' diff --git a/lib/widgets/components/Scroll/NestedScrollView/index.dart b/lib/widgets/components/Scroll/NestedScrollView/index.dart index f9786607..1fdc125f 100644 --- 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 = ''' diff --git a/lib/widgets/components/Scroll/ScrollMetrics/index.dart b/lib/widgets/components/Scroll/ScrollMetrics/index.dart index 48b3fe02..86be701c 100644 --- 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 = ''' diff --git a/lib/widgets/components/Scroll/ScrollPhysics/index.dart b/lib/widgets/components/Scroll/ScrollPhysics/index.dart index 4af9aa12..bb8bfddc 100644 --- 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 = ''' diff --git a/lib/widgets/components/Scroll/ScrollView/index.dart b/lib/widgets/components/Scroll/ScrollView/index.dart index 9dbe8887..8ec5aad3 100644 --- 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'; diff --git a/lib/widgets/components/Scroll/Scrollable/index.dart b/lib/widgets/components/Scroll/Scrollable/index.dart index d8f94a7e..8ec4c9f3 100644 --- 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 = ''' diff --git a/lib/widgets/components/Scroll/ScrollbarPainter/index.dart b/lib/widgets/components/Scroll/ScrollbarPainter/index.dart index 5cb56ce0..0914a6d8 100644 --- 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 = ''' diff --git a/lib/widgets/components/Tab/Tab/index.dart b/lib/widgets/components/Tab/Tab/index.dart index f2815315..165fb9e0 100644 --- 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 = ''' diff --git a/lib/widgets/elements/Form/Button/DropdownButton/index.dart b/lib/widgets/elements/Form/Button/DropdownButton/index.dart index 4274f5dc..b6f98d4e 100644 --- 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'; diff --git a/lib/widgets/elements/Form/Button/FlatButton/index.dart b/lib/widgets/elements/Form/Button/FlatButton/index.dart index 58fa6ba3..faf80259 100644 --- 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'; diff --git a/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart b/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart index efabb752..e7cbb728 100644 --- 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'; diff --git a/lib/widgets/elements/Form/Button/IconButton/demo.dart b/lib/widgets/elements/Form/Button/IconButton/demo.dart index cb7a9baa..d59f5a13 100644 --- 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; diff --git a/lib/widgets/elements/Form/Button/IconButton/index.dart b/lib/widgets/elements/Form/Button/IconButton/index.dart index 1d742771..278173b9 100644 --- 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'; diff --git a/lib/widgets/elements/Form/Button/OutlineButton/index.dart b/lib/widgets/elements/Form/Button/OutlineButton/index.dart index 8c2aaa26..8ab15911 100644 --- 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'; diff --git a/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart b/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart index bb708a73..1ddcc856 100644 --- 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'; diff --git a/lib/widgets/elements/Form/Button/RaisedButton/index.dart b/lib/widgets/elements/Form/Button/RaisedButton/index.dart index 26d7ad7e..9342f00e 100644 --- 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'; diff --git a/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart b/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart index 3bffb8cd..24a44bd8 100644 --- 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'; diff --git a/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart b/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart index aeb49130..b99b354c 100644 --- 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'; diff --git a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart index ba41a1cc..f065e227 100644 --- 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'; diff --git a/lib/widgets/elements/Form/Input/TextField/index.dart b/lib/widgets/elements/Form/Input/TextField/index.dart index 1b353f52..3bb65ae5 100644 --- 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'; diff --git a/lib/widgets/elements/Form/Radio/Radio/index.dart b/lib/widgets/elements/Form/Radio/Radio/index.dart index bfbaf098..0d8a280b 100644 --- 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 diff --git a/lib/widgets/elements/Form/Radio/RadioListTile/index.dart b/lib/widgets/elements/Form/Radio/RadioListTile/index.dart index eaac6d60..b7a32288 100644 --- 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 diff --git a/lib/widgets/elements/Form/Slider/Slider/index.dart b/lib/widgets/elements/Form/Slider/Slider/index.dart index 2f6a6dfc..42392f36 100644 --- 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 = ''' diff --git a/lib/widgets/elements/Form/Slider/SliderTheme/index.dart b/lib/widgets/elements/Form/Slider/SliderTheme/index.dart index a21eaa90..b930fef2 100644 --- 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 = ''' diff --git a/lib/widgets/elements/Form/Slider/SliderThemeData/index.dart b/lib/widgets/elements/Form/Slider/SliderThemeData/index.dart index 647d1bba..43e7b736 100644 --- 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 = ''' diff --git a/lib/widgets/elements/Form/Switch/AnimatedSwitcher/index.dart b/lib/widgets/elements/Form/Switch/AnimatedSwitcher/index.dart index 357c5fe5..b2eeff2a 100644 --- 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 = ''' diff --git a/lib/widgets/elements/Form/Switch/Switch/index.dart b/lib/widgets/elements/Form/Switch/Switch/index.dart index 75b30205..ce55a73a 100644 --- 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 = ''' diff --git a/lib/widgets/elements/Form/Switch/SwitchListTile/index.dart b/lib/widgets/elements/Form/Switch/SwitchListTile/index.dart index a87c3240..ab935c09 100644 --- 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 = ''' diff --git a/lib/widgets/elements/Form/Text/RichText/index.dart b/lib/widgets/elements/Form/Text/RichText/index.dart index 23fe2b8d..d74bef29 100644 --- 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 = """ ### **简介** diff --git a/lib/widgets/elements/Form/Text/Text/index.dart b/lib/widgets/elements/Form/Text/Text/index.dart index 3f9edb77..774df12d 100644 --- 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 = """ ### **简介** diff --git a/lib/widgets/elements/Frame/Align/Align/index.dart b/lib/widgets/elements/Frame/Align/Align/index.dart index c33438d3..46432a8f 100644 --- 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 = """ diff --git a/lib/widgets/elements/Frame/Box/ConstrainedBox/index.dart b/lib/widgets/elements/Frame/Box/ConstrainedBox/index.dart index b9fbc78c..17d29295 100644 --- 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 = ''' diff --git a/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart b/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart index 8ad78bbd..79f4073d 100644 --- 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 = """### **简介** diff --git a/lib/widgets/elements/Frame/Box/Fittedbox/index.dart b/lib/widgets/elements/Frame/Box/Fittedbox/index.dart index 18fac673..ef624730 100644 --- 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 = """ diff --git a/lib/widgets/elements/Frame/Box/LimitedBox/index.dart b/lib/widgets/elements/Frame/Box/LimitedBox/index.dart index 89dfdb58..fb7afc41 100644 --- 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 = """ diff --git a/lib/widgets/elements/Frame/Box/OverflowBox/index.dart b/lib/widgets/elements/Frame/Box/OverflowBox/index.dart index b0f49279..a67669a8 100644 --- 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简介** diff --git a/lib/widgets/elements/Frame/Box/RenderBox/index.dart b/lib/widgets/elements/Frame/Box/RenderBox/index.dart index df740656..d0f3d6a2 100644 --- 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 = ''' ### **简介** diff --git a/lib/widgets/elements/Frame/Box/RotatedBox/index.dart b/lib/widgets/elements/Frame/Box/RotatedBox/index.dart index 2b4748f5..986f1922 100644 --- 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 = ''' diff --git a/lib/widgets/elements/Frame/Box/SizeBox/index.dart b/lib/widgets/elements/Frame/Box/SizeBox/index.dart index dab70e6d..e3f05461 100644 --- 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 { diff --git a/lib/widgets/elements/Frame/Box/SizedOverflowBox/index.dart b/lib/widgets/elements/Frame/Box/SizedOverflowBox/index.dart index 6554d17d..961981d4 100644 --- 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简介** diff --git a/lib/widgets/elements/Frame/Box/TextBox/index.dart b/lib/widgets/elements/Frame/Box/TextBox/index.dart index cc48e960..f47298ee 100644 --- 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简介** > 是一个包含一段文本的矩形 diff --git a/lib/widgets/elements/Frame/Box/UnconstrainedBox/index.dart b/lib/widgets/elements/Frame/Box/UnconstrainedBox/index.dart index 42f60123..a3db5461 100644 --- 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 = """### **简介** diff --git a/lib/widgets/elements/Frame/Expanded/Expanded/index.dart b/lib/widgets/elements/Frame/Expanded/Expanded/index.dart index c7d5a736..8500a80f 100644 --- 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 = ''' diff --git a/lib/widgets/elements/Frame/Layout/Center/index.dart b/lib/widgets/elements/Frame/Layout/Center/index.dart index 96382d0e..1b32b881 100644 --- 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 = """### **简介** diff --git a/lib/widgets/elements/Frame/Layout/Column/index.dart b/lib/widgets/elements/Frame/Layout/Column/index.dart index bd190513..a03c8655 100644 --- 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 = """### **简介** diff --git a/lib/widgets/elements/Frame/Layout/Container/index.dart b/lib/widgets/elements/Frame/Layout/Container/index.dart index 6fbf8e97..67803119 100644 --- a/lib/widgets/elements/Frame/Layout/Container/index.dart +++ b/lib/widgets/elements/Frame/Layout/Container/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 = """### **简介** diff --git a/lib/widgets/elements/Frame/Layout/Row/index.dart b/lib/widgets/elements/Frame/Layout/Row/index.dart index a4e0d041..a93001df 100644 --- a/lib/widgets/elements/Frame/Layout/Row/index.dart +++ b/lib/widgets/elements/Frame/Layout/Row/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 = """### **简介** diff --git a/lib/widgets/elements/Frame/Spacing/AnimatedPadding/index.dart b/lib/widgets/elements/Frame/Spacing/AnimatedPadding/index.dart index bc1ea654..ee21afce 100644 --- a/lib/widgets/elements/Frame/Spacing/AnimatedPadding/index.dart +++ b/lib/widgets/elements/Frame/Spacing/AnimatedPadding/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-14 17:02:20 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './animatedPadding_demo.dart'; const contentDesc0 = ''' diff --git a/lib/widgets/elements/Frame/Spacing/Padding/index.dart b/lib/widgets/elements/Frame/Spacing/Padding/index.dart index 1a345608..f0876a47 100644 --- a/lib/widgets/elements/Frame/Spacing/Padding/index.dart +++ b/lib/widgets/elements/Frame/Spacing/Padding/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-14 17:01:55 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './padding_demo.dart'; const contentDesc0=''' diff --git a/lib/widgets/elements/Frame/Spacing/SliverPadding/index.dart b/lib/widgets/elements/Frame/Spacing/SliverPadding/index.dart index b919a156..788a4979 100644 --- a/lib/widgets/elements/Frame/Spacing/SliverPadding/index.dart +++ b/lib/widgets/elements/Frame/Spacing/SliverPadding/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-14 17:06:36 */ import 'package:flutter/material.dart'; -import 'package:flutter_go/common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './sliverpadding_demo.dart'; const contentDesc0 = ''' diff --git a/lib/widgets/elements/Frame/Spacing/SliverPadding/sliverpadding_demo.dart b/lib/widgets/elements/Frame/Spacing/SliverPadding/sliverpadding_demo.dart index f609a239..27bd4a9f 100644 --- a/lib/widgets/elements/Frame/Spacing/SliverPadding/sliverpadding_demo.dart +++ b/lib/widgets/elements/Frame/Spacing/SliverPadding/sliverpadding_demo.dart @@ -5,7 +5,8 @@ * @Last Modified time: 2018-11-28 20:36:17 */ import 'package:flutter/material.dart'; -import './product_list.dart'; +import 'package:flutter_go/widgets/components/Scroll/CustomScrollView/product_list.dart'; + class SliverPaddingDemo extends StatelessWidget { diff --git a/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart b/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart index bdafe5e3..a0103001 100644 --- a/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart +++ b/lib/widgets/elements/Frame/Stack/IndexedStack/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 _stackText0 = """### **简介** diff --git a/lib/widgets/elements/Frame/Stack/Stack/index.dart b/lib/widgets/elements/Frame/Stack/Stack/index.dart index 6cdf56b9..f25d059b 100644 --- a/lib/widgets/elements/Frame/Stack/Stack/index.dart +++ b/lib/widgets/elements/Frame/Stack/Stack/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 _stackText0 = """### **简介** diff --git a/lib/widgets/elements/Frame/Table/Table/index.dart b/lib/widgets/elements/Frame/Table/Table/index.dart index c3137d7d..ac961f07 100644 --- a/lib/widgets/elements/Frame/Table/Table/index.dart +++ b/lib/widgets/elements/Frame/Table/Table/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 './table_demo.dart'; const contentDesc0 = ''' diff --git a/lib/widgets/elements/Media/Icon/Icon/index.dart b/lib/widgets/elements/Media/Icon/Icon/index.dart index 83be570d..98532f8b 100644 --- a/lib/widgets/elements/Media/Icon/Icon/index.dart +++ b/lib/widgets/elements/Media/Icon/Icon/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 Text = ''' diff --git a/lib/widgets/elements/Media/Icon/IconData/index.dart b/lib/widgets/elements/Media/Icon/IconData/index.dart index 7c8479be..1f04174c 100644 --- a/lib/widgets/elements/Media/Icon/IconData/index.dart +++ b/lib/widgets/elements/Media/Icon/IconData/index.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'demo.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const Text = ''' ### **简介** diff --git a/lib/widgets/elements/Media/Icon/IconTheme/index.dart b/lib/widgets/elements/Media/Icon/IconTheme/index.dart index 19eb194a..5747d8b7 100644 --- a/lib/widgets/elements/Media/Icon/IconTheme/index.dart +++ b/lib/widgets/elements/Media/Icon/IconTheme/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 Text = ''' diff --git a/lib/widgets/elements/Media/Icon/IconThemeData/index.dart b/lib/widgets/elements/Media/Icon/IconThemeData/index.dart index 289b52d3..0a1c2900 100644 --- a/lib/widgets/elements/Media/Icon/IconThemeData/index.dart +++ b/lib/widgets/elements/Media/Icon/IconThemeData/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 Text = ''' diff --git a/lib/widgets/elements/Media/Icon/ImageIcon/index.dart b/lib/widgets/elements/Media/Icon/ImageIcon/index.dart index 1848e3cb..a5d2acd3 100644 --- a/lib/widgets/elements/Media/Icon/ImageIcon/index.dart +++ b/lib/widgets/elements/Media/Icon/ImageIcon/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 Text = ''' diff --git a/lib/widgets/elements/Media/Image/AssetImage/index.dart b/lib/widgets/elements/Media/Image/AssetImage/index.dart index 6290d1a8..cb9dc1c7 100644 --- a/lib/widgets/elements/Media/Image/AssetImage/index.dart +++ b/lib/widgets/elements/Media/Image/AssetImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-11-16 15:09:12 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './assetImage_demo.dart'; const contentText0 = ''' diff --git a/lib/widgets/elements/Media/Image/DecorationImage/index.dart b/lib/widgets/elements/Media/Image/DecorationImage/index.dart index 072d36e6..25d40d4c 100644 --- a/lib/widgets/elements/Media/Image/DecorationImage/index.dart +++ b/lib/widgets/elements/Media/Image/DecorationImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-11-16 15:12:39 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './decorationImage_demo.dart'; diff --git a/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart b/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart index 9aabe6fe..20d83db6 100644 --- a/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart +++ b/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-11-16 15:09:12 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const contentText0 = ''' ### **简介** diff --git a/lib/widgets/elements/Media/Image/ExactAssetImage/index.dart b/lib/widgets/elements/Media/Image/ExactAssetImage/index.dart index 350e48d2..b8b1af2d 100644 --- a/lib/widgets/elements/Media/Image/ExactAssetImage/index.dart +++ b/lib/widgets/elements/Media/Image/ExactAssetImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-08 14:12:21 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './exact_asset_image_demo.dart'; const contentText0 = ''' diff --git a/lib/widgets/elements/Media/Image/FadeInImage/index.dart b/lib/widgets/elements/Media/Image/FadeInImage/index.dart index a84461a9..6854f130 100644 --- a/lib/widgets/elements/Media/Image/FadeInImage/index.dart +++ b/lib/widgets/elements/Media/Image/FadeInImage/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 './fade_in_image_demo.dart'; diff --git a/lib/widgets/elements/Media/Image/FileImage/index.dart b/lib/widgets/elements/Media/Image/FileImage/index.dart index 22e52f19..7119d097 100644 --- a/lib/widgets/elements/Media/Image/FileImage/index.dart +++ b/lib/widgets/elements/Media/Image/FileImage/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 './file_image_demo.dart'; const contentText0 = ''' diff --git a/lib/widgets/elements/Media/Image/Image/index.dart b/lib/widgets/elements/Media/Image/Image/index.dart index 87adcd10..4d89505c 100644 --- a/lib/widgets/elements/Media/Image/Image/index.dart +++ b/lib/widgets/elements/Media/Image/Image/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; import './demo.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const String content0 = ''' ### **简介** diff --git a/lib/widgets/elements/Media/Image/MemoryImage/index.dart b/lib/widgets/elements/Media/Image/MemoryImage/index.dart index fb7fb42d..a7d42d87 100644 --- a/lib/widgets/elements/Media/Image/MemoryImage/index.dart +++ b/lib/widgets/elements/Media/Image/MemoryImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-08 20:48:28 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './memory_image_demo.dart'; const String _contentText0 = ''' diff --git a/lib/widgets/elements/Media/Image/NetworkImage/index.dart b/lib/widgets/elements/Media/Image/NetworkImage/index.dart index e03c55d7..b417e84c 100644 --- a/lib/widgets/elements/Media/Image/NetworkImage/index.dart +++ b/lib/widgets/elements/Media/Image/NetworkImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-08 17:32:57 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './network_image_demo.dart'; const contentText0 = ''' diff --git a/lib/widgets/elements/Media/Image/RawImage/index.dart b/lib/widgets/elements/Media/Image/RawImage/index.dart index 2fb7b03f..902f4a43 100644 --- a/lib/widgets/elements/Media/Image/RawImage/index.dart +++ b/lib/widgets/elements/Media/Image/RawImage/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; import './raw_image_demo.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const contentText0 = ''' ### **简介** diff --git a/lib/widgets/elements/Media/Image/paintImage/index.dart b/lib/widgets/elements/Media/Image/paintImage/index.dart index 51faa110..47f4b33d 100644 --- a/lib/widgets/elements/Media/Image/paintImage/index.dart +++ b/lib/widgets/elements/Media/Image/paintImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-08 20:19:01 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const String contentText0 = ''' ### **非Widget 待删除** diff --git a/lib/widgets/themes/Cupertino/CupertinoApp/index.dart b/lib/widgets/themes/Cupertino/CupertinoApp/index.dart index 21adb1d7..124c1658 100644 --- a/lib/widgets/themes/Cupertino/CupertinoApp/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoApp/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-07 15:52:45 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoButton/index.dart b/lib/widgets/themes/Cupertino/CupertinoButton/index.dart index 28c9d9f9..4f69f315 100644 --- a/lib/widgets/themes/Cupertino/CupertinoButton/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoButton/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoButton 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart b/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart index 04e73dec..8ed9822e 100644 --- a/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart +++ b/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart @@ -26,11 +26,19 @@ class CupertinoColorsFullDefault extends StatefulWidget { * */ class _CupertinoColorsFullDefault extends State { +<<<<<<< HEAD Widget setColorsView(cupertinoColors){ return Container( width: MediaQuery.of(context).size.width-100, padding: const EdgeInsets.all(10.0), child:Text('activeBlue',style:TextStyle(color:Colors.white)), +======= + Widget setColorsView(cupertinoColors,String colorName){ + return Container( + width: MediaQuery.of(context).size.width-100, + padding: const EdgeInsets.all(10.0), + child:Text(colorName,style:TextStyle(color:Colors.white)), +>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa decoration:BoxDecoration(color: cupertinoColors) ); } @@ -38,13 +46,13 @@ class _CupertinoColorsFullDefault extends State { Widget build(BuildContext context) { return Column( children: [ - setColorsView(CupertinoColors.activeBlue), - setColorsView(CupertinoColors.activeGreen), - setColorsView(CupertinoColors.black), - setColorsView(CupertinoColors.destructiveRed), - setColorsView(CupertinoColors.inactiveGray), - setColorsView(CupertinoColors.lightBackgroundGray), - setColorsView(CupertinoColors.white) + setColorsView(CupertinoColors.activeBlue,'activeBlue'), + setColorsView(CupertinoColors.activeGreen,'activeGreen'), + setColorsView(CupertinoColors.black,'black'), + setColorsView(CupertinoColors.destructiveRed,'destructiveRed'), + setColorsView(CupertinoColors.inactiveGray,'inactiveGray'), + setColorsView(CupertinoColors.lightBackgroundGray,'lightBackgroundGray'), + setColorsView(CupertinoColors.white,'white') ], ); } diff --git a/lib/widgets/themes/Cupertino/CupertinoColors/index.dart b/lib/widgets/themes/Cupertino/CupertinoColors/index.dart index b68cc15b..d8f5e6ca 100644 --- a/lib/widgets/themes/Cupertino/CupertinoColors/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoColors/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoButton 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart b/lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart index 12751a1a..0fca342c 100644 --- a/lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart +++ b/lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_go/common/icon_names.dart' as icon_names; +import 'package:flutter_go/resources/icon_names.dart' as icon_names; /* * CupertinoIcons 默认的实例 diff --git a/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart b/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart index 54026940..93b60c1d 100644 --- a/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoButton 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart index 548170a0..939e791c 100644 --- a/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoNavigationBar 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' @@ -46,7 +46,7 @@ class _DemoState extends State { demoBox.CupertinoNavigationBarFullDefault(), SizedBox(height:50) ], - title: 'CupertinoApp', + title: 'CupertinoNavigationBar', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoNavigationBar-class.html', codeUrl: '/themes/Cupertino/CupertinoNavigationBar/demo.dart', ); diff --git a/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart b/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart index 3b442b76..e61ebc04 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoPageRoute 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart b/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart index 050346ff..4e1808de 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoPageScaffold 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart b/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart index 30ab6e2e..24e93819 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoPicker 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart b/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart index 742a6134..24d5a09a 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoPopupSurface 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart b/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart index cf8c4906..8e598703 100644 --- a/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_go/common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart b/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart index 061146de..2eb2d7c8 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_go/common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart b/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart index 55489213..84794ac4 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart @@ -1,5 +1,9 @@ import 'package:flutter/material.dart'; +<<<<<<< HEAD import 'package:flutter_go/common/widget_demo.dart'; +======= +import 'package:flutter_go/components/widget_demo.dart'; +>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart index 610eb1fd..d3b4d9dc 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart @@ -1,5 +1,9 @@ import 'package:flutter/material.dart'; +<<<<<<< HEAD import 'package:flutter_go/common/widget_demo.dart'; +======= +import 'package:flutter_go/components/widget_demo.dart'; +>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart b/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart index 2ac6ea35..911457a0 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart @@ -1,5 +1,9 @@ import 'package:flutter/material.dart'; +<<<<<<< HEAD import 'package:flutter_go/common/widget_demo.dart'; +======= +import 'package:flutter_go/components/widget_demo.dart'; +>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart index 2bdba82f..511a5a09 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart @@ -1,5 +1,9 @@ import 'package:flutter/material.dart'; +<<<<<<< HEAD import 'package:flutter_go/common/widget_demo.dart'; +======= +import 'package:flutter_go/components/widget_demo.dart'; +>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart index 433f8e6c..b58ecf66 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart @@ -1,5 +1,9 @@ import 'package:flutter/material.dart'; +<<<<<<< HEAD import 'package:flutter_go/common/widget_demo.dart'; +======= +import 'package:flutter_go/components/widget_demo.dart'; +>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart index a3d447ce..3793299b 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart @@ -1,5 +1,9 @@ import 'package:flutter/material.dart'; +<<<<<<< HEAD import 'package:flutter_go/common/widget_demo.dart'; +======= +import 'package:flutter_go/components/widget_demo.dart'; +>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart b/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart index f641f43d..0c19f2f6 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart @@ -1,5 +1,9 @@ import 'package:flutter/material.dart'; +<<<<<<< HEAD import 'package:flutter_go/common/widget_demo.dart'; +======= +import 'package:flutter_go/components/widget_demo.dart'; +>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Material/MaterialAccentColor/index.dart b/lib/widgets/themes/Material/MaterialAccentColor/index.dart index 66f39a3a..3e29db7d 100644 --- a/lib/widgets/themes/Material/MaterialAccentColor/index.dart +++ b/lib/widgets/themes/Material/MaterialAccentColor/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_go/common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart'; const Text0 = ''' diff --git a/lib/widgets/themes/Material/MaterialApp/index.dart b/lib/widgets/themes/Material/MaterialApp/index.dart index 9fce5d86..d6a9918b 100644 --- a/lib/widgets/themes/Material/MaterialApp/index.dart +++ b/lib/widgets/themes/Material/MaterialApp/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-07 15:52:45 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const String content0 = ''' ### **简介** diff --git a/lib/widgets/themes/Material/MaterialButton/index.dart b/lib/widgets/themes/Material/MaterialButton/index.dart index 6658e2f2..7716f8a5 100644 --- a/lib/widgets/themes/Material/MaterialButton/index.dart +++ b/lib/widgets/themes/Material/MaterialButton/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-27 16:35:39 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/themes/Material/MaterialColor/demo.dart b/lib/widgets/themes/Material/MaterialColor/demo.dart index 393524ba..cd43abbc 100644 --- a/lib/widgets/themes/Material/MaterialColor/demo.dart +++ b/lib/widgets/themes/Material/MaterialColor/demo.dart @@ -204,7 +204,7 @@ class ColorDemo extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - height: 1000.0, + height: 400.0, child: DefaultTabController( length: allPalettes.length, child: Scaffold( diff --git a/lib/widgets/themes/Material/MaterialColor/index.dart b/lib/widgets/themes/Material/MaterialColor/index.dart index 106346a1..2d115912 100644 --- a/lib/widgets/themes/Material/MaterialColor/index.dart +++ b/lib/widgets/themes/Material/MaterialColor/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-27 16:35:39 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/themes/Material/MaterialPageRoute/index.dart b/lib/widgets/themes/Material/MaterialPageRoute/index.dart index 0408084d..f4060185 100644 --- a/lib/widgets/themes/Material/MaterialPageRoute/index.dart +++ b/lib/widgets/themes/Material/MaterialPageRoute/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_go/common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const Text0 = ''' diff --git a/lib/widgets/themes/Material/MergeableMaterialItem/index.dart b/lib/widgets/themes/Material/MergeableMaterialItem/index.dart index 7bd1a322..291de1f0 100644 --- a/lib/widgets/themes/Material/MergeableMaterialItem/index.dart +++ b/lib/widgets/themes/Material/MergeableMaterialItem/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 = ''' diff --git a/pubspec.yaml b/pubspec.yaml index a4020b99..55e3b622 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -25,7 +25,6 @@ dependencies: sqflite: ^0.12.1 flutter_markdown: ^0.2.0 url_launcher: ^4.0.1 - fluttertoast: ^2.2.2 # 本地存储、收藏功能 shared_preferences: ^0.4.3 dio: ^1.0.6 @@ -174,17 +173,18 @@ flutter: - assets/app.db - assets/images/ - assets/fonts/ - - lib/common/example_code_parser.dart - - lib/common/syntax_highlighter.dart + - lib/utils/example_code_parser.dart + - lib/utils/syntax_highlighter.dart fonts: - family: FlamanteRoma fonts: - asset: assets/fonts/Flamante-Roma-Medium.ttf - - asset: assets/fonts/Lato-Bold.ttf - asset: assets/fonts/Flamante-Roma-MediumItalic.ttf - style: italic + - family: LatoBold + fonts: + - asset: assets/fonts/Lato-Bold.ttf # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg diff --git a/tools/getPR.sh b/tools/getPR.sh new file mode 100644 index 00000000..c9e86974 --- /dev/null +++ b/tools/getPR.sh @@ -0,0 +1,18 @@ + +#!/bin/bash + +# pr 日志生成器，自动 pr 工具抓取器，抓取两周前至今的,提交数据，并去重。 +# 生成一个 http 页面，打印成 markdown 格式 +# run $ bash tools/getPR.sh + +# git log --pretty="%h - %s - %ad" --author=ryan --since=2.weeks --no-merges > tools/log.txt + +logs=`git log --date=iso --since=2.weeks --no-merges --pretty=format:'{"commit": "-%h","author": "%aN <%aE>","date": "%ad","message": "%s"},'` + +log1=${logs} + +# echo ${log1%*,} + +echo '{"pr_req":['${log1%*,}']}' > tools/log.json + +node ./tools/parsLog.js \ No newline at end of file diff --git a/tools/parsLog.js b/tools/parsLog.js new file mode 100644 index 00000000..ab6108a8 --- /dev/null +++ b/tools/parsLog.js @@ -0,0 +1,70 @@ +var path = require('path'); //系统路径模块 +var fs = require('fs'); //文件模块 +var http = require('http'); +var child_process = require('child_process'); + +var file = path.join(__dirname, './log.json'); //文件路径，__dirname为当前运行js文件的目录 + //读取json文件 +fs.readFile(file, 'utf-8', function(err, data) { + if (err) { + res.send('文件读取失败'); + } else { + // res.send(data); + if(data) { + const obj = JSON.parse(data); + const newObj ={}; + obj.pr_req.map((item,i)=>{ + const key = encodeURIComponent(item.message); + newObj[key] ={date: new Date(item.date).toLocaleDateString(),msg:item.message}; + }) + const newObjCategory = Object.values(newObj); + const categorys ={}; + newObjCategory.map((item)=>{ + if(!categorys[item.date]) { + categorys[item.date] =[]; + }else { + categorys[item.date].push(item.msg); + } + }) + //console.log('----------->',categorys); + rendHtml(categorys); + } + + } +}); + + +function rendHtml(categorys){ + http.createServer(function (req, res) { + var html = buildHtml(categorys); + res.writeHead(200, { + 'Content-Type': 'text/html;charset=utf-8', + //'Content-Length': html.length, + 'Expires': new Date().toUTCString() + }); + + res.end(html); + }).listen(8889,"127.0.0.1"); + + console.log("Server running at http://127.0.0.1:8889/"); + child_process.exec(`start "http://127.0.0.1:8080"`); + + function buildHtml(obj) { + var header = ''; + var body = ''; + var content = ''; + for(var i in obj) { + let liContent = `
    #### ${i}`; + const list = obj[i]; + list.map((it,index)=>{ + liContent += `
  •   - [x] ${it}
    • ` + }) + liContent += `
`; + + content += liContent; + } + // console.log('content===>',content) + return '' + + '
' + header + '
' + content + ''; + }; +} \ No newline at end of file