diff --git a/android/build.gradle b/android/build.gradle index d4225c79..e81b1a1d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.0' } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 9372d0f3..03824124 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Thu Jan 10 15:37:36 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/assets/images/nothing.png b/assets/images/nothing.png new file mode 100644 index 00000000..1279985f Binary files /dev/null and b/assets/images/nothing.png differ diff --git a/lib/common/iconNames.dart b/lib/common/iconNames.dart index a9d0f02a..e8ce0e71 100644 --- a/lib/common/iconNames.dart +++ b/lib/common/iconNames.dart @@ -6,7 +6,6 @@ * email: zhu.yan@alibaba-inc.com * tartget: FlatButton 的示例 */ -import 'package:fluro/fluro.dart'; import 'package:flutter/material.dart'; diff --git a/lib/common/list_view_item.dart b/lib/common/list_view_item.dart new file mode 100644 index 00000000..cef7d7a4 --- /dev/null +++ b/lib/common/list_view_item.dart @@ -0,0 +1,53 @@ +import 'package:flutter/material.dart'; +import 'package:url_launcher/url_launcher.dart'; + +class ListViewItem extends StatelessWidget { + final String itemUrl; + final String itemTitle; + final String data; + + const ListViewItem({Key key, this.itemUrl, this.itemTitle, this.data}) + : super(key: key); + + void _launchURL(String url, BuildContext context) async { + + if (await canLaunch(url)) { + await launch(url); + } else { + throw 'Could not launch $url'; + } + + } + + @override + Widget build(BuildContext context) { + return Card( + color: Colors.white, + elevation: 4.0, + margin: new EdgeInsets.symmetric(horizontal: 10.0, vertical: 6.0), + child: ListTile( + onTap: () { + _launchURL(itemUrl, context); + }, + title: Padding( + child: Text( + itemTitle, + style: TextStyle(color: Colors.black, fontSize: 15.0), + ), + padding: EdgeInsets.only(top: 10.0), + ), + subtitle: Row( + children: [ + Padding( + child: Text(data, + style: TextStyle(color: Colors.black54, fontSize: 10.0)), + padding: EdgeInsets.only(top: 10.0, bottom: 10.0), + ) + ], + ), + trailing: + Icon(Icons.keyboard_arrow_right, color: Colors.grey, size: 30.0), + ), + ); + } +} diff --git a/lib/common/myListView.dart b/lib/common/myListView.dart deleted file mode 100644 index 457c4023..00000000 --- a/lib/common/myListView.dart +++ /dev/null @@ -1,55 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher.dart'; - -class ListViewItem extends StatelessWidget { - final String itemUrl; - final String itemTitle; - final String data; - - const ListViewItem({Key key, this.itemUrl, this.itemTitle, this.data}) - : super(key: key); - - - void _launchURL(String url,BuildContext context) async { - if (url.contains("https") || url.contains("http")) { - if (await canLaunch(url)) { - await launch(url); - } else { - throw 'Could not launch $url'; - } - }else{ - Navigator.of(context).pushNamed(url); - } - } - - - @override - Widget build(BuildContext context) { - return Card( - color: Colors.white, - elevation: 4.0, - margin: new EdgeInsets.symmetric(horizontal: 10.0, vertical: 6.0), - child: ListTile( - onTap: () { - _launchURL(itemUrl,context); - }, - title: Padding( - child: Text( - itemTitle, - style: TextStyle(color: Colors.black, fontSize: 15.0), - ), - padding: EdgeInsets.only(top: 10.0), - ), - subtitle: Row( - children: [ - Padding( - child: Text(data, - style: TextStyle(color: Colors.black54, fontSize: 10.0)), - padding: EdgeInsets.only(top: 10.0, bottom: 10.0), - ) - ], - ), - trailing: Icon(Icons.keyboard_arrow_right, - color: Colors.grey, size: 30.0))); - } -} diff --git a/lib/common/provider.dart b/lib/common/provider.dart index d178c46c..8540d671 100644 --- a/lib/common/provider.dart +++ b/lib/common/provider.dart @@ -14,18 +14,21 @@ class Provider { //Get a location using getDatabasesPath String databasesPath = await getDatabasesPath(); String path = join(databasesPath, 'flutter.db'); - List list; - // try { - // db = await openDatabase(path, readOnly: true); + List tables; + try { + db = await openDatabase(path); + tables = await db + .rawQuery('SELECT name FROM sqlite_master WHERE type = "table"'); + print('${tables.length} 7891'); + } catch (e) { + print("Error $e"); + } - // } catch (e) { - // print("Error $e"); - // } - - if (db == null) { + if (tables.length < 3) { // Delete the database await deleteDatabase(path); - + // 关闭上面打开的db，否则无法执行open + db.close(); ByteData data = await rootBundle.load(join("assets", "app.db")); List bytes = data.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes); diff --git a/lib/common/sql.dart b/lib/common/sql.dart index 5bb10f69..b6dd620a 100644 --- a/lib/common/sql.dart +++ b/lib/common/sql.dart @@ -69,7 +69,7 @@ class Sql extends BaseModel { /// @mods [And, Or] default is Or /// search({'name': "hanxu', 'id': 1}; /// - Future search({Map conditions, String Mods = 'Or'}) async { + Future search({Map conditions, String mods = 'Or'}) async { if (conditions == null || conditions.isEmpty) { return this.get(); } @@ -88,7 +88,7 @@ class Sql extends BaseModel { } if (index >= 0 && index < conditions.length -1) { - stringConditions = '$stringConditions $Mods'; + stringConditions = '$stringConditions $mods'; } index++; }); diff --git a/lib/common/widget-demo.dart b/lib/common/widget-demo.dart index 7c82237e..b359e4d3 100644 --- a/lib/common/widget-demo.dart +++ b/lib/common/widget-demo.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; -import '../routers/application.dart'; class WidgetDemo extends StatelessWidget { final Widget child; diff --git a/lib/common/widget_demo.dart b/lib/common/widget_demo.dart index 6120592c..45adedd3 100644 --- a/lib/common/widget_demo.dart +++ b/lib/common/widget_demo.dart @@ -10,6 +10,8 @@ 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'; class WidgetDemo extends StatefulWidget { final List contentList; @@ -34,7 +36,6 @@ class WidgetDemo extends StatefulWidget { class _WidgetDemoState extends State { bool _hasCollected = false; CollectionControlModel _collectionControl = new CollectionControlModel(); - Collection _collection; Color _collectionColor; List widgetDemosList = new WidgetDemoList().getDemos(); String _router = ''; @@ -87,9 +88,11 @@ class _WidgetDemoState extends State { _router = item.routerName; } }); - setState(() { - _hasCollected = list.length > 0; - }); + if (this.mounted) { + setState(() { + _hasCollected = list.length > 0; + }); + } }); } @@ -103,6 +106,11 @@ class _WidgetDemoState extends State { _hasCollected = false; }); showInSnackBar('已取消收藏'); + + if (ApplicationEvent.event != null) { + ApplicationEvent.event + .fire(CollectionEvent(widget.title, _router, true)); + } return; } print('删除错误'); @@ -116,12 +124,19 @@ class _WidgetDemoState extends State { setState(() { _hasCollected = true; }); + + if (ApplicationEvent.event != null) { + ApplicationEvent.event + .fire(CollectionEvent(widget.title, _router, false)); + } + showInSnackBar('收藏成功'); } }); } } + @override Widget build(BuildContext context) { if (_hasCollected) { @@ -170,6 +185,7 @@ class _WidgetDemoState extends State { ), floatingActionButton: FloatingActionButton( onPressed: _getCollection, + mini: true, tooltip: '收藏', child: Icon( Icons.star, diff --git a/lib/components/CompList.dart b/lib/components/CompList.dart index 864e6db8..580c41da 100644 --- a/lib/components/CompList.dart +++ b/lib/components/CompList.dart @@ -1,10 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_rookie_book/views/Detail.dart'; + + class CompList extends StatefulWidget { @override State createState() { - // TODO: implement createState return new ListState(); } } diff --git a/lib/components/ListRefresh.dart b/lib/components/ListRefresh.dart index dd6a2466..bf58eb30 100644 --- a/lib/components/ListRefresh.dart +++ b/lib/components/ListRefresh.dart @@ -7,14 +7,12 @@ * tartget: FlatButton 的示例 */ import 'package:flutter/material.dart'; -import 'dart:math'; - class ListRefresh extends StatefulWidget { final renderItem; final requestApi; - const ListRefresh([this.requestApi,this.renderItem]) : super(); + const ListRefresh([this.requestApi, this.renderItem]) : super(); @override State createState() => listRefresh(); @@ -34,7 +32,8 @@ class listRefresh extends State { _getMoreData(); _scrollController.addListener(() { // 如果下拉的当前位置到scroll的最下面 - if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent) { + if (_scrollController.position.pixels == + _scrollController.position.maxScrollExtent) { _getMoreData(); } }); @@ -43,7 +42,7 @@ class listRefresh extends State { /* * 回弹效果 * */ - backElasticEffect(){ + backElasticEffect() { // double edge = 50.0; // double offsetFromBottom = _scrollController.position.maxScrollExtent - _scrollController.position.pixels; // if (offsetFromBottom < edge) { // 添加一个动画没有更多数据的时候 ListView 向下移动覆盖正在加载更多数据的标志 @@ -58,18 +57,22 @@ class listRefresh extends State { * list探底，执行的具体事件 * */ Future _getMoreData() async { - if (!isLoading && _hasMore) { // 如果上一次异步请求数据完成 同时有数据可以加载 + if (!isLoading && _hasMore) { + // 如果上一次异步请求数据完成 同时有数据可以加载 setState(() => isLoading = true); //if(_hasMore){ // 还有数据可以拉新 List newEntries = await mokeHttpRequest(); //if (newEntries.isEmpty) { _hasMore = (_pageIndex <= _pageTotal); - setState(() { - items.addAll(newEntries); - isLoading = false; - }); + if (this.mounted) { + setState(() { + items.addAll(newEntries); + isLoading = false; + }); + } backElasticEffect(); - }else if (!isLoading && !_hasMore){ // 这样判断,减少以后的绘制 + } else if (!isLoading && !_hasMore) { + // 这样判断,减少以后的绘制 _pageIndex = 0; backElasticEffect(); } @@ -79,12 +82,12 @@ class listRefresh extends State { * 伪装吐出新数据 * */ Future mokeHttpRequest() async { - if(widget.requestApi is Function){ - final listObj = await widget.requestApi({'pageIndex':_pageIndex}); + if (widget.requestApi is Function) { + final listObj = await widget.requestApi({'pageIndex': _pageIndex}); _pageIndex = listObj['pageIndex']; _pageTotal = listObj['total']; return listObj['list']; - }else { + } else { return Future.delayed(Duration(seconds: 2), () { return []; }); @@ -97,20 +100,23 @@ class listRefresh extends State { * */ Future _handleRefresh() async { List newEntries = await mokeHttpRequest(); - setState(() { - items.clear(); - items.addAll(newEntries); - isLoading = false; - _hasMore = true; - return null; - }); + if (this.mounted) { + setState(() { + items.clear(); + items.addAll(newEntries); + isLoading = false; + _hasMore = true; + return null; + }); + } } /* * 加载中的提示 * */ Widget _buildLoadText() { - return Container(child: Padding( + return Container( + child: Padding( padding: const EdgeInsets.all(18.0), child: Center( child: Text("数据没有更多了！！！"), @@ -122,23 +128,28 @@ class listRefresh extends State { * 上提加载loading的widget,如果数据到达极限，显示没有更多 * */ Widget _buildProgressIndicator() { - if(_hasMore){ + if (_hasMore) { return new Padding( padding: const EdgeInsets.all(8.0), child: new Center( - child:Column( - children: [ - new Opacity( - opacity: isLoading ? 1.0 : 0.0, - child: new CircularProgressIndicator(valueColor: AlwaysStoppedAnimation(Colors.blue)), - ), - SizedBox(height:20.0), - Text('稍等片刻更精彩...',style: TextStyle(fontSize: 14.0),) - ],) - //child: - ), + child: Column( + children: [ + new Opacity( + opacity: isLoading ? 1.0 : 0.0, + child: new CircularProgressIndicator( + valueColor: AlwaysStoppedAnimation(Colors.blue)), + ), + SizedBox(height: 20.0), + Text( + '稍等片刻更精彩...', + style: TextStyle(fontSize: 14.0), + ) + ], + ) + //child: + ), ); - }else { + } else { return _buildLoadText(); } } @@ -152,11 +163,11 @@ class listRefresh extends State { @override Widget build(BuildContext context) { return new RefreshIndicator( - child:ListView.builder( + child: ListView.builder( itemCount: items.length + 1, itemBuilder: (context, index) { - if(index == 0 && index != items.length){ - return Container(height:0); + if (index == 0 && index != items.length) { + return Container(height: 0); } if (index == items.length) { //return _buildLoadText(); @@ -165,7 +176,7 @@ class listRefresh extends State { //print('itemsitemsitemsitems:${items[index].title}'); //return ListTile(title: Text("Index${index}:${items[index].title}")); if (widget.renderItem is Function) { - return widget.renderItem(index,items[index]); + return widget.renderItem(index, items[index]); } //return makeCard(index,items[index]); } @@ -175,4 +186,4 @@ class listRefresh extends State { onRefresh: _handleRefresh, ); } -} \ No newline at end of file +} diff --git a/lib/components/Pagination.dart b/lib/components/Pagination.dart index 86b16b88..61b3b5d4 100644 --- a/lib/components/Pagination.dart +++ b/lib/components/Pagination.dart @@ -8,7 +8,7 @@ import '../model/story.dart'; import 'package:url_launcher/url_launcher.dart'; class Pagination extends StatelessWidget { - static const String routeName = '/material/page-selector'; + static final String routeName = '/material/page-selector'; static final List icons = [ const Icon(Icons.event, semanticLabel: 'Event'), const Icon(Icons.home, semanticLabel: 'Home'), @@ -18,9 +18,9 @@ class Pagination extends StatelessWidget { const Icon(Icons.language, semanticLabel: 'Language'), ]; - List bannerStories = []; + final List bannerStories = []; - List arr = [ + final List arr = [ {'image': 'https://img.alicdn.com/tfs/TB1W4hMAwHqK1RjSZJnXXbNLpXa-519-260.jpg', 'type': 0, 'id': 9695909, 'url': 'https://www.zhihu.com/question/294145797/answer/551162834', 'title': '为什么阿里巴巴、腾讯和 Google 之类的企业都在使用 Flutter 开发 App？'}, {'image': 'https://img.alicdn.com/tfs/TB1XmFIApzqK1RjSZSgXXcpAVXa-720-338.jpg', 'type': 0, 'id': 9695859, 'url': 'https://zhuanlan.zhihu.com/p/51696594', 'title': 'Flutter 1.0 正式发布: Google 的便携 UI 工具包'}, {'image': 'https://img.alicdn.com/tfs/TB1mClCABLoK1RjSZFuXXXn0XXa-600-362.jpg', 'type': 0, 'id': 96956491409, 'url':'https://zhuanlan.zhihu.com/p/53497167','title': 'Flutter 示范应用现已开源 — 万物起源(The History of Everything)'}, @@ -35,7 +35,7 @@ class Pagination extends StatelessWidget { } } - List _PageSelector(BuildContext context) { + List _pageSelector(BuildContext context) { List list = []; /// super.initState(); arr.forEach((item) { @@ -57,7 +57,7 @@ class Pagination extends StatelessWidget { Column( //physics: AlwaysScrollableScrollPhysics(), //padding: EdgeInsets.only(), - children: _PageSelector(context) + children: _pageSelector(context) ); } } diff --git a/lib/components/SearchInput.dart b/lib/components/SearchInput.dart index 638ce4d1..36155575 100644 --- a/lib/components/SearchInput.dart +++ b/lib/components/SearchInput.dart @@ -138,7 +138,6 @@ class _MaterialSearchState extends State { _loading = true; }); - //TODO: debounce widget.results too var results = await widget.getResults(_criteria); if (!mounted) { diff --git a/lib/components/markdown.dart b/lib/components/markdown.dart index 0983f7a8..ba7ea5d3 100644 --- a/lib/components/markdown.dart +++ b/lib/components/markdown.dart @@ -8,7 +8,6 @@ final hightlighter = new HighLight(); class HighLight extends md.SyntaxHighlighter { @override TextSpan format(String source) { - // TODO: implement format final SyntaxHighlighterStyle style = SyntaxHighlighterStyle.lightThemeStyle(); return TextSpan( style: const TextStyle(fontSize: 10.0), @@ -22,11 +21,10 @@ class HighLight extends md.SyntaxHighlighter { class MarkdownBody extends StatelessWidget { - String data; + final String data; MarkdownBody(this.data); @override Widget build(BuildContext context) { - // TODO: implement build return md.MarkdownBody(data: data, syntaxHighlighter: new HighLight()); } } \ No newline at end of file diff --git a/lib/components/widget_item.dart b/lib/components/widget_item.dart index 8968e68c..20648fa0 100644 --- a/lib/components/widget_item.dart +++ b/lib/components/widget_item.dart @@ -72,16 +72,16 @@ class WidgetItem extends StatelessWidget { padding: const EdgeInsets.symmetric(vertical: 30.0, horizontal: 10.0), height: 150.0, child: Column( - mainAxisAlignment: MainAxisAlignment.center, - mainAxisSize: MainAxisSize.max, - children: [ - widgetIcon, - SizedBox( - height: 8.0, - ), - Text(_widgetName), - ], - ) , + mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: MainAxisSize.max, + children: [ + widgetIcon, + SizedBox( + height: 8.0, + ), + Text(_widgetName), + ], + ), ), ); } diff --git a/lib/components/widget_item_container.dart b/lib/components/widget_item_container.dart index 5f56a66b..2ddf3029 100644 --- a/lib/components/widget_item_container.dart +++ b/lib/components/widget_item_container.dart @@ -8,7 +8,7 @@ class WidgetItemContainer extends StatelessWidget { final List categories; final bool isWidgetPoint; // 所有的可用demos; - List widgetDemosList = new WidgetDemoList().getDemos(); + final List widgetDemosList = new WidgetDemoList().getDemos(); WidgetItemContainer( {Key key, @@ -41,7 +41,7 @@ class WidgetItemContainer extends StatelessWidget { targetRouter = item.routerName; } }); - Application.router.navigateTo(context, "${targetRouter}"); + Application.router.navigateTo(context, "$targetRouter"); } else { Application.router .navigateTo(context, "/category/${item.name}"); diff --git a/lib/event/event-bus.dart b/lib/event/event-bus.dart new file mode 100644 index 00000000..ce2123df --- /dev/null +++ b/lib/event/event-bus.dart @@ -0,0 +1,5 @@ +import 'package:event_bus/event_bus.dart'; + +class ApplicationEvent{ + static EventBus event; +} \ No newline at end of file diff --git a/lib/event/event-model.dart b/lib/event/event-model.dart new file mode 100644 index 00000000..f72f0cb6 --- /dev/null +++ b/lib/event/event-model.dart @@ -0,0 +1,7 @@ +class CollectionEvent{ + final String widgetName; + final String router; + final bool isRemove; + // token uid... + CollectionEvent(this.widgetName,this.router,this.isRemove); +} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 0eff5e0f..40191ce5 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,7 +4,6 @@ import 'package:flutter/rendering.dart'; import 'views/FirstPage.dart'; import 'views/widgetPage.dart'; -import 'views/ThirdPage.dart'; import 'views/FourthPage.dart'; import 'views/collection_page.dart'; import 'routers/routers.dart'; @@ -14,6 +13,8 @@ import 'model/widget.dart'; import './widgets/index.dart'; import 'package:flutter_rookie_book/components/SearchInput.dart'; + + const int ThemeColor = 0xFFC91B3A; class MyApp extends StatelessWidget { @@ -81,7 +82,6 @@ class _MyHomePageState extends State @override void initState() { - // TODO: implement initState super.initState(); controller = new TabController( initialIndex: 0, vsync: this, length: 4); // 这里的length 决定有多少个底导 submenus @@ -111,7 +111,7 @@ class _MyHomePageState extends State targetRouter = item.routerName; } }); - Application.router.navigateTo(context, "${targetRouter}"); + Application.router.navigateTo(context, "$targetRouter"); } Widget buildSearchInput(BuildContext context) { @@ -184,11 +184,11 @@ class _MyHomePageState extends State } } - void _onDataChange(val) { - if (this.mounted) { - setState(() { - data = val; - }); - } - } + // void _onDataChange(val) { + // if (this.mounted) { + // setState(() { + // data = val; + // }); + // } + // } } diff --git a/lib/model/base.dart b/lib/model/base.dart index ad1ff092..cff6fb06 100644 --- a/lib/model/base.dart +++ b/lib/model/base.dart @@ -1,5 +1,5 @@ import 'package:sqflite/sqflite.dart'; -import 'dart:async'; + class BaseModel{ Database db; diff --git a/lib/model/cat.dart b/lib/model/cat.dart index 7ec34431..bf86764d 100644 --- a/lib/model/cat.dart +++ b/lib/model/cat.dart @@ -1,6 +1,5 @@ -import 'base.dart'; + import 'dart:async'; -import 'dart:convert'; import '../common/sql.dart'; abstract class CatInterface{ diff --git a/lib/model/widget.dart b/lib/model/widget.dart index 606f9d84..db9afcc4 100644 --- a/lib/model/widget.dart +++ b/lib/model/widget.dart @@ -1,4 +1,4 @@ -import 'base.dart'; + import 'dart:async'; import '../common/sql.dart'; import "package:flutter/material.dart"; diff --git a/lib/routers/application.dart b/lib/routers/application.dart index 05cba554..0005b856 100644 --- a/lib/routers/application.dart +++ b/lib/routers/application.dart @@ -1,6 +1,5 @@ import 'package:fluro/fluro.dart'; import 'package:flutter/material.dart'; -import '../widgets/index.dart'; class Application { static Router router; static TabController controller; diff --git a/lib/routers/routers.dart b/lib/routers/routers.dart index 7e0bc2da..4848a990 100644 --- a/lib/routers/routers.dart +++ b/lib/routers/routers.dart @@ -2,7 +2,6 @@ import 'package:fluro/fluro.dart'; import 'package:flutter/material.dart'; import '../widgets/index.dart'; -import '../model/widget.dart'; import './router_handler.dart'; class Routes { diff --git a/lib/views/FirstPage.dart b/lib/views/FirstPage.dart index 0cf6f1ea..203f14d6 100644 --- a/lib/views/FirstPage.dart +++ b/lib/views/FirstPage.dart @@ -1,30 +1,25 @@ import 'dart:async'; - import 'package:flutter/material.dart'; -import 'package:flutter_rookie_book/common/myListView.dart'; -//import 'package:flutter_rookie_book/components/CompList.dart'; +import 'package:flutter_rookie_book/common/list_view_item.dart'; import 'package:flutter_rookie_book/components/ListRefresh.dart' as listComp; import 'package:flutter_rookie_book/components/Pagination.dart'; - import './widgetFeature/FirstPageItem.dart'; import '../common/net_utils.dart'; - import 'package:flutter_rookie_book/common/iconNames.dart'; -import '../common/sql.dart'; -import 'dart:async'; - -import 'package:url_launcher/url_launcher.dart'; class FirstPage extends StatefulWidget { @override FirstPageState createState() => new FirstPageState(); } -class FirstPageState extends State { +class FirstPageState extends State with AutomaticKeepAliveClientMixin{ + + + @override + bool get wantKeepAlive => true; @override void initState() { - // TODO: implement initState super.initState(); } @@ -68,6 +63,7 @@ class FirstPageState extends State { @override Widget build(BuildContext context) { + super.build(context); return new Column( children: [ new Container( diff --git a/lib/views/FourthPage.dart b/lib/views/FourthPage.dart index 37aa6cd4..c4c44af3 100644 --- a/lib/views/FourthPage.dart +++ b/lib/views/FourthPage.dart @@ -1,4 +1,4 @@ -import 'dart:async'; + import 'package:flutter/material.dart'; import '../components/CompList.dart'; diff --git a/lib/views/ThirdPage.dart b/lib/views/ThirdPage.dart deleted file mode 100644 index 3b49594f..00000000 --- a/lib/views/ThirdPage.dart +++ /dev/null @@ -1,69 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/material.dart'; -import '../common/eventBus.dart'; - -class ThirdPage extends StatefulWidget { - ThirdPage({Key key, this.data2ThirdPage, this.callback}) : super(key: key); - final callback; - String data2ThirdPage; - - @override - ThirdPageState createState() => new ThirdPageState(); -} - -class ThirdPageState extends State { - - String data = ''; - String inputTxt; - TextEditingController controller = new TextEditingController(); - - void initState() { - //print('data4Two' + widget.data2ThirdPage); - data = widget.data2ThirdPage; - } - - void firedA() { - widget.callback('$inputTxt'); - } - - void firedB() { - eventBus.fire(new MyEvent('$inputTxt')); - } - - void _onChanged(String value) { - setState(() { - inputTxt = value; - }); - } - - - @override - Widget build(BuildContext context) { - return new Center( - child: new Column(children: [ - new Container( - padding: new EdgeInsets.only(bottom: 15.0), - child: new Text('子组件2'), - ), - new Container( - padding: new EdgeInsets.only(bottom: 10.0), - child: new Text('父传子:' + data), - ), - new Container( - margin: new EdgeInsets.only(bottom: 40.0), - child: new TextField( - controller: controller, - onChanged: _onChanged, - decoration: (new InputDecoration(labelText: '请输入你要发送的值')))), - new Container( - child: new RaisedButton( - onPressed: firedA, child: new Text('to父组件'))), - new Container( - child: new RaisedButton( - onPressed: firedB, child: new Text('to兄弟组件'))) - ] - ) - ); - } -} diff --git a/lib/views/category.dart b/lib/views/category.dart index 1faa7e5c..0bcd850e 100644 --- a/lib/views/category.dart +++ b/lib/views/category.dart @@ -61,7 +61,6 @@ class _CategoryHome extends State { // 假设进入这个界面的parent一定存在 Cat parentCat = catHistory.last; - int depth = catHistory.length; // 继续搜索显示下一级depth: depth + 1, parentId: parentCat.id List _categories = @@ -92,7 +91,7 @@ class _CategoryHome extends State { targetRouter = item.routerName; } }); - Application.router.navigateTo(context, "${targetRouter}"); + Application.router.navigateTo(context, "$targetRouter"); } Widget _buildContent() { diff --git a/lib/views/collection_page.dart b/lib/views/collection_page.dart index 55dc5ea8..6e99f80e 100644 --- a/lib/views/collection_page.dart +++ b/lib/views/collection_page.dart @@ -6,30 +6,128 @@ */ import 'package:flutter/material.dart'; import '../model/collection.dart'; +import '../routers/application.dart'; +import '../event/event-bus.dart'; +import '../event/event-model.dart'; +import 'package:event_bus/event_bus.dart'; class CollectionPage extends StatefulWidget { _CollectionPageState createState() => _CollectionPageState(); } -class _CollectionPageState extends State { +class _CollectionPageState extends State + with AutomaticKeepAliveClientMixin { + _CollectionPageState() { + final eventBus = new EventBus(); + ApplicationEvent.event = eventBus; + } CollectionControlModel _collectionControl = new CollectionControlModel(); List _collectionList = []; + ScrollController _scrollController = new ScrollController(); + + @override + bool get wantKeepAlive => true; + @override void initState() { - // TODO: implement initState super.initState(); + _getList(); + ApplicationEvent.event.on().listen((event) { + _getList(); + }); + } + + @override + void dispose() { + _scrollController.dispose(); + super.dispose(); + } + + void _getList() { + _collectionList.clear(); + _collectionControl.getAllCollection().then((resultList) { + resultList.forEach((item) { + _collectionList.add(item); + }); + if (this.mounted) { + setState(() { + _collectionList = _collectionList; + }); + } + }); + } + + Widget _renderList(context, index) { + if (index == 0) { + return Container( + height: 40.0, + padding: const EdgeInsets.only(left: 10.0), + child: Row( + children: [ + Icon( + Icons.warning, + size: 22.0, + ), + SizedBox( + width: 5.0, + ), + Text('模拟器重新运行会丢失收藏'), + ], + ), + ); + } + return Container( + padding: const EdgeInsets.all(10.0), + margin: const EdgeInsets.only(bottom: 7.0), + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + new BoxShadow( + color: const Color(0xFFd0d0d0), + blurRadius: 1.0, + spreadRadius: 2.0, + offset: Offset(3.0, 2.0), + ), + ], + ), + child: ListTile( + title: Text( + _collectionList[index - 1].name, + style: TextStyle(fontSize: 17.0), + ), + trailing: + Icon(Icons.keyboard_arrow_right, color: Colors.grey, size: 30.0), + onTap: () { + Application.router + .navigateTo(context, "${_collectionList[index - 1].router}"); + }, + ), + ); } @override Widget build(BuildContext context) { - _collectionControl.getAllCollection().then((resultList) { - _collectionList = resultList; - _collectionList.forEach((item){ - print(item.toMap()); - }); - }); - return Container( - child: Text('敬请期待'), + super.build(context); + if (_collectionList.length == 0) { + return ListView( + children: [ + Column( + children: [ + Image.asset( + 'assets/images/nothing.png', + fit: BoxFit.contain, + width: MediaQuery.of(context).size.width / 2, + ), + Text('暂无收藏，赶紧去收藏一个吧!'), + ], + ), + ], + ); + } + return ListView.builder( + itemBuilder: _renderList, + itemCount: _collectionList.length + 1, + controller: _scrollController, ); } } diff --git a/lib/views/widgetPage.dart b/lib/views/widgetPage.dart index d87d4bef..c1382258 100644 --- a/lib/views/widgetPage.dart +++ b/lib/views/widgetPage.dart @@ -1,3 +1,9 @@ +/* + * @Author: 一凨 + * @Date: 2019-01-11 14:39:48 + * @Last Modified by: 一凨 + * @Last Modified time: 2019-01-11 14:40:09 + */ import 'package:flutter/material.dart'; import 'widgetPage/cate_card.dart'; import '../model/cat.dart'; @@ -13,7 +19,7 @@ class WidgetPage extends StatefulWidget { SecondPageState createState() => new SecondPageState(catModel); } -class SecondPageState extends State { +class SecondPageState extends State with AutomaticKeepAliveClientMixin{ CatControlModel catModel; SecondPageState(this.catModel) : super(); @@ -23,6 +29,10 @@ class SecondPageState extends State { List categories = []; + @override + bool get wantKeepAlive => true; + + @override void initState() { super.initState(); renderCats(); @@ -41,7 +51,6 @@ class SecondPageState extends State { Widget buildGrid() { // 存放最后的widget List tiles = []; - Widget content; for (Cat item in categories) { tiles.add(new CateCard(category: item)); } @@ -52,6 +61,7 @@ class SecondPageState extends State { @override Widget build(BuildContext context) { + super.build(context); if (categories.length == 0) { return ListView( children: [new Container()], @@ -63,10 +73,4 @@ class SecondPageState extends State { ); } - void _onChanged(String value) { - setState(() { - active = value; - data = '90'; - }); - } } diff --git a/lib/widgets/components/Bar/AppBar/demo.dart b/lib/widgets/components/Bar/AppBar/demo.dart index c2e4a0e5..7e596cbb 100644 --- a/lib/widgets/components/Bar/AppBar/demo.dart +++ b/lib/widgets/components/Bar/AppBar/demo.dart @@ -7,7 +7,6 @@ * tartget: AppBar 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/Bar/AppBar/index.dart b/lib/widgets/components/Bar/AppBar/index.dart index 7a84a0bf..17f11a10 100644 --- a/lib/widgets/components/Bar/AppBar/index.dart +++ b/lib/widgets/components/Bar/AppBar/index.dart @@ -7,7 +7,7 @@ * tartget: AppBar 的示例 */ import '../../../../common/widget_demo.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -48,18 +48,18 @@ class _DemoState extends State { return WidgetDemo( title: 'AppBar', codeUrl: 'componentss/Bar/AppBar/demo.dart', - contentList: [ allDemoBoxs(context, this) ], + contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/AppBar-class.html', ); } } -/** +/* * 所有的 AppBar widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allDemoBoxs(BuildContext context, _DemoState that) { +Widget allCheckboxs(BuildContext context, _DemoState that) { return Container( //padding: new EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0), child: Column( diff --git a/lib/widgets/components/Bar/BottomAppBar/demo.dart b/lib/widgets/components/Bar/BottomAppBar/demo.dart index 7f42a9e5..cea79ea4 100644 --- a/lib/widgets/components/Bar/BottomAppBar/demo.dart +++ b/lib/widgets/components/Bar/BottomAppBar/demo.dart @@ -6,6 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: BottomAppBar 的示例 */ + import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/Bar/BottomAppBar/index.dart b/lib/widgets/components/Bar/BottomAppBar/index.dart index 312fb054..9c6fa6a8 100644 --- a/lib/widgets/components/Bar/BottomAppBar/index.dart +++ b/lib/widgets/components/Bar/BottomAppBar/index.dart @@ -7,6 +7,7 @@ * tartget: BottomAppBar 的示例 */ import '../../../../common/widget_demo.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -24,11 +25,6 @@ const String _Text1 = > 通常与Scaffold和FloatingActionButton一起使用。 """; -const String _Text2 = -"""### **进阶用法** -> BottomAppBar -- -"""; class Demo extends StatefulWidget { static const String routeName = '/components//Bar/BottomAppBar'; @@ -43,18 +39,18 @@ class _DemoState extends State { return WidgetDemo( title: 'BottomAppBar', codeUrl: 'componentss/Bar/BottomAppBar/demo.dart', - contentList: [allDomeBoxs(context, this)], + contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/BottomAppBar-class.html', ); } } -/** +/* * 所有的 BottomAppBar widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allDomeBoxs(BuildContext context, _DemoState that) { +Widget allCheckboxs(BuildContext context, _DemoState that) { return Container( //padding: new EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0), child: Column( diff --git a/lib/widgets/components/Bar/ButtonBar/demo.dart b/lib/widgets/components/Bar/ButtonBar/demo.dart index 00c2debc..0ce89f0b 100644 --- a/lib/widgets/components/Bar/ButtonBar/demo.dart +++ b/lib/widgets/components/Bar/ButtonBar/demo.dart @@ -7,7 +7,6 @@ * tartget: ButtonBar 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/Bar/ButtonBar/index.dart b/lib/widgets/components/Bar/ButtonBar/index.dart index cc745120..4fe39eba 100644 --- a/lib/widgets/components/Bar/ButtonBar/index.dart +++ b/lib/widgets/components/Bar/ButtonBar/index.dart @@ -7,7 +7,7 @@ * tartget: ButtonBar 的示例 */ import '../../../../common/widget_demo.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -26,11 +26,6 @@ const String _Text1 = - 当Directionality为TextDirection.ltr时，按钮栏的子项右对齐，最后一个子项成为最右边的子项。当Directionality TextDirection.rtl时，子项被左对齐，最后一个子项成为最左边的子项。 """; -const String _Text2 = -"""### **进阶用法** -> ButtonBar -- -"""; class Demo extends StatefulWidget { static const String routeName = '/components/Bar/ButtonBar'; @@ -44,19 +39,19 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'ButtonBar', - codeUrl: 'componentss//Bar/ButtonBar/demo.dart', - contentList: [allDemoBoxs(context, this)], + codeUrl: 'components/Bar/ButtonBar/demo.dart', + contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/ButtonBar-class.html', ); } } -/** +/* * 所有的 ButtonBar widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allDemoBoxs(BuildContext context, _DemoState that) { +Widget allCheckboxs(BuildContext context, _DemoState that) { return Container( //padding: new EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0), child: Column( diff --git a/lib/widgets/components/Bar/FlexibleSpaceBar/demo.dart b/lib/widgets/components/Bar/FlexibleSpaceBar/demo.dart index b9fac16b..ca1aeb8b 100644 --- a/lib/widgets/components/Bar/FlexibleSpaceBar/demo.dart +++ b/lib/widgets/components/Bar/FlexibleSpaceBar/demo.dart @@ -7,7 +7,7 @@ * tartget: FlexibleSpaceBar 的示例 */ -import 'dart:math'; + import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart b/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart index 5c85aa3a..fe39cfb0 100644 --- a/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart +++ b/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart @@ -7,7 +7,7 @@ * tartget: FlexibleSpaceBar 的示例 */ import '../../../../common/widget_demo.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -27,11 +27,6 @@ const String _Text1 = - 要调整 AppBar 大小,必须将其包装在 FlexibleSpaceBar.createSettings 返回的 widget 中 ，以将大小调整信息传递给 FlexibleSpaceBar。 """; -const String _Text2 = -"""### **进阶用法** -> FlexibleSpaceBar -- -"""; class Demo extends StatefulWidget { static const String routeName = '/components//Bar/FlexibleSpaceBar'; @@ -45,19 +40,19 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'FlexibleSpaceBar', - codeUrl: 'Bar/FlexibleSpaceBar/demo.dart', - contentList: [allDemoBoxs(context, this)], + codeUrl: 'components/Bar/FlexibleSpaceBar/demo.dart', + contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/FlexibleSpaceBar-class.html', ); } } -/** +/* * 所有的 FlexibleSpaceBar widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allDemoBoxs(BuildContext context, _DemoState that) { +Widget allCheckboxs(BuildContext context, _DemoState that) { return Container( //padding: new EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0), child: Column( diff --git a/lib/widgets/components/Bar/SliverAppBar/demo.dart b/lib/widgets/components/Bar/SliverAppBar/demo.dart index f99a104d..f2e964a8 100644 --- a/lib/widgets/components/Bar/SliverAppBar/demo.dart +++ b/lib/widgets/components/Bar/SliverAppBar/demo.dart @@ -7,7 +7,6 @@ * tartget: SliverAppBar 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/Bar/SliverAppBar/index.dart b/lib/widgets/components/Bar/SliverAppBar/index.dart index 7063439c..32992053 100644 --- a/lib/widgets/components/Bar/SliverAppBar/index.dart +++ b/lib/widgets/components/Bar/SliverAppBar/index.dart @@ -7,7 +7,7 @@ * tartget: SliverAppBar 的示例 */ import '../../../../common/widget_demo.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -41,18 +41,18 @@ class _DemoState extends State { return WidgetDemo( title: 'SliverAppBar', codeUrl: 'componentss/Bar/SliverAppBar/demo.dart', - contentList: [allDemoBoxs(context, this)], + contentList:[allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/SliverAppBar-class.html', ); } } -/** +/* * 所有的 SliverAppBar widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allDemoBoxs(BuildContext context, _DemoState that) { +Widget allCheckboxs(BuildContext context, _DemoState that) { return Container( //padding: new EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0), child: Column( diff --git a/lib/widgets/components/Bar/SnackBar/demo.dart b/lib/widgets/components/Bar/SnackBar/demo.dart index 24b677d8..b5573a61 100644 --- a/lib/widgets/components/Bar/SnackBar/demo.dart +++ b/lib/widgets/components/Bar/SnackBar/demo.dart @@ -7,7 +7,7 @@ * tartget: SnackBar 的示例 */ -import 'dart:math'; + import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/Bar/SnackBar/index.dart b/lib/widgets/components/Bar/SnackBar/index.dart index ddfa971a..e60fe054 100644 --- a/lib/widgets/components/Bar/SnackBar/index.dart +++ b/lib/widgets/components/Bar/SnackBar/index.dart @@ -7,7 +7,7 @@ * tartget: SnackBar 的示例 */ import '../../../../common/widget_demo.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -27,11 +27,6 @@ const String _Text1 = - 要控制SnackBar保持可见的时间，请指定持续时间。 """; -const String _Text2 = -"""### **进阶用法** -> SnackBar -- -"""; class Demo extends StatefulWidget { static const String routeName = '/components//Bar/SnackBar'; @@ -46,18 +41,18 @@ class _DemoState extends State { return WidgetDemo( title: 'SnackBar', codeUrl: 'componentss/Bar/SnackBar/demo.dart', - contentList: [allDemoBoxs(context, this)], + contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/SnackBar-class.html', ); } } -/** +/* * 所有的 SnackBar widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allDemoBoxs(BuildContext context, _DemoState that) { +Widget allCheckboxs(BuildContext context, _DemoState that) { return Container( //padding: new EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0), child: Column( diff --git a/lib/widgets/components/Bar/SnackBarAction/demo.dart b/lib/widgets/components/Bar/SnackBarAction/demo.dart index 56251f56..e4c4547f 100644 --- a/lib/widgets/components/Bar/SnackBarAction/demo.dart +++ b/lib/widgets/components/Bar/SnackBarAction/demo.dart @@ -7,10 +7,8 @@ * tartget: SnackBarAction 的示例 */ -import 'dart:math'; -import 'dart:async'; import 'package:flutter/material.dart'; -import 'demo.dart'; + class SnackBarActionDemo extends StatefulWidget { _Demo createState() => _Demo(); diff --git a/lib/widgets/components/Bar/SnackBarAction/index.dart b/lib/widgets/components/Bar/SnackBarAction/index.dart index 47257ead..bd4f62a0 100644 --- a/lib/widgets/components/Bar/SnackBarAction/index.dart +++ b/lib/widgets/components/Bar/SnackBarAction/index.dart @@ -7,10 +7,7 @@ * tartget: SnackBarAction 的示例 */ import '../../../../common/widget_demo.dart'; -import 'dart:math'; import 'package:flutter/material.dart'; - -import '../../../../components/markdown.dart'; import './demo.dart' as SnackBarDemo; const String _Text0 = """ diff --git a/lib/widgets/components/Bar/TabBar/demo.dart b/lib/widgets/components/Bar/TabBar/demo.dart index 208ca175..83caba93 100644 --- a/lib/widgets/components/Bar/TabBar/demo.dart +++ b/lib/widgets/components/Bar/TabBar/demo.dart @@ -7,7 +7,6 @@ * tartget: TabBar 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; class TabBarDemo extends StatefulWidget { diff --git a/lib/widgets/components/Bar/TabBar/index.dart b/lib/widgets/components/Bar/TabBar/index.dart index 23dcd527..78270cad 100644 --- a/lib/widgets/components/Bar/TabBar/index.dart +++ b/lib/widgets/components/Bar/TabBar/index.dart @@ -7,8 +7,6 @@ * tartget: SnackBarAction 的示例 */ import '../../../../common/widget_demo.dart'; - -import 'dart:math'; import 'package:flutter/material.dart'; import './demo.dart'; diff --git a/lib/widgets/components/Card/Card/demo.dart b/lib/widgets/components/Card/Card/demo.dart index bc3c1d1f..107a6bd5 100644 --- a/lib/widgets/components/Card/Card/demo.dart +++ b/lib/widgets/components/Card/Card/demo.dart @@ -7,7 +7,6 @@ * tartget: Card 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/Card/Card/index.dart b/lib/widgets/components/Card/Card/index.dart index 66e2bc49..7d3586a3 100644 --- a/lib/widgets/components/Card/Card/index.dart +++ b/lib/widgets/components/Card/Card/index.dart @@ -7,7 +7,7 @@ * tartget: Card 的示例 */ import '../../../../common/widget_demo.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -25,11 +25,6 @@ const String _Text1 = > 此示例显示了创建卡片窗口组件，其中显示了相册信息和两个操作 """; -const String _Text2 = -"""### **进阶用法** -> Card -- -"""; class Demo extends StatefulWidget { static const String routeName = '/components/Card/Card'; @@ -43,19 +38,19 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'Card', - codeUrl: 'componentss/Card/Card/demo.dart', - contentList: [allDemoBoxs(context, this)], + codeUrl: 'components/Card/Card/demo.dart', + contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/Card-class.html', ); } } -/** +/* * 所有的 Card widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allDemoBoxs(BuildContext context, _DemoState that) { +Widget allCheckboxs(BuildContext context, _DemoState that) { return Container( //padding: new EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0), child: Column( diff --git a/lib/widgets/components/Chip/RawChip/demo.dart b/lib/widgets/components/Chip/RawChip/demo.dart index 7c1ca948..a6d5d6ad 100644 --- a/lib/widgets/components/Chip/RawChip/demo.dart +++ b/lib/widgets/components/Chip/RawChip/demo.dart @@ -27,8 +27,7 @@ final List _lists=[ const InputEntry('web', 'W'), ]; -List _inputs=[]; -Iterable get RawChipWidget sync*{ +Iterable get _rawChipWidget sync*{ for(InputEntry value in _lists){ yield Padding( padding: const EdgeInsets.all(4.0), @@ -57,7 +56,7 @@ Iterable get RawChipWidget sync*{ return Column( children: [ Wrap( - children: RawChipWidget.toList(), + children: _rawChipWidget.toList(), ), ], diff --git a/lib/widgets/components/Dialog/AboutDialog/demo.dart b/lib/widgets/components/Dialog/AboutDialog/demo.dart index 1720af86..df03d3a2 100644 --- a/lib/widgets/components/Dialog/AboutDialog/demo.dart +++ b/lib/widgets/components/Dialog/AboutDialog/demo.dart @@ -7,8 +7,6 @@ * tartget: xxx */ -import 'dart:math'; -import 'dart:async'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Dialog/AlertDialog/demo.dart b/lib/widgets/components/Dialog/AlertDialog/demo.dart index 99373b37..8d68c838 100644 --- a/lib/widgets/components/Dialog/AlertDialog/demo.dart +++ b/lib/widgets/components/Dialog/AlertDialog/demo.dart @@ -7,8 +7,6 @@ * tartget: xxx */ -import 'dart:math'; -import 'dart:async'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Dialog/Dialog/demo.dart b/lib/widgets/components/Dialog/Dialog/demo.dart index 006e8b65..b2911327 100644 --- a/lib/widgets/components/Dialog/Dialog/demo.dart +++ b/lib/widgets/components/Dialog/Dialog/demo.dart @@ -7,8 +7,6 @@ * tartget: xxx */ -import 'dart:math'; -import 'dart:async'; import 'package:flutter/material.dart'; @@ -72,7 +70,7 @@ class _DialogMoreDemo extends State { value += 1; }); }, - child: Text("我是一个Dialog, 点我更新value: ${value}"), + child: Text("我是一个Dialog, 点我更新value: $value"), ) ); } @@ -105,3 +103,4 @@ class _DialogMoreDemo extends State { ); } } + diff --git a/lib/widgets/components/Dialog/SimpleDialog/demo.dart b/lib/widgets/components/Dialog/SimpleDialog/demo.dart index 29d689f7..9e9b002a 100644 --- a/lib/widgets/components/Dialog/SimpleDialog/demo.dart +++ b/lib/widgets/components/Dialog/SimpleDialog/demo.dart @@ -7,8 +7,6 @@ * tartget: xxx */ -import 'dart:math'; -import 'dart:async'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Grid/GridTile/demo.dart b/lib/widgets/components/Grid/GridTile/demo.dart index bb5d62dc..2936e155 100644 --- a/lib/widgets/components/Grid/GridTile/demo.dart +++ b/lib/widgets/components/Grid/GridTile/demo.dart @@ -7,8 +7,6 @@ * tartget: xxx */ -import 'dart:math'; -import 'dart:async'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Grid/GridTileBar/demo.dart b/lib/widgets/components/Grid/GridTileBar/demo.dart index 640511b2..adf85f36 100644 --- a/lib/widgets/components/Grid/GridTileBar/demo.dart +++ b/lib/widgets/components/Grid/GridTileBar/demo.dart @@ -7,8 +7,6 @@ * tartget: xxx */ -import 'dart:math'; -import 'dart:async'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Grid/GridView/demo.dart b/lib/widgets/components/Grid/GridView/demo.dart index 640511b2..adf85f36 100644 --- a/lib/widgets/components/Grid/GridView/demo.dart +++ b/lib/widgets/components/Grid/GridView/demo.dart @@ -7,8 +7,6 @@ * tartget: xxx */ -import 'dart:math'; -import 'dart:async'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/LIst/AnimatedList/demo.dart b/lib/widgets/components/LIst/AnimatedList/demo.dart index 74d89522..04617de1 100644 --- a/lib/widgets/components/LIst/AnimatedList/demo.dart +++ b/lib/widgets/components/LIst/AnimatedList/demo.dart @@ -1,4 +1,4 @@ -import 'dart:async'; + import 'package:flutter/material.dart'; import './model.dart'; diff --git a/lib/widgets/components/LIst/AnimatedList/index.dart b/lib/widgets/components/LIst/AnimatedList/index.dart index 48ffdff4..39a82dcf 100644 --- a/lib/widgets/components/LIst/AnimatedList/index.dart +++ b/lib/widgets/components/LIst/AnimatedList/index.dart @@ -39,19 +39,19 @@ class Demo extends StatefulWidget { } class _DemoState extends State { - var animatedList = null; + State animatedList; @override Widget build(BuildContext context) { return WidgetDemo( title: 'AnimatedList', - codeUrl: 'componentss/List/AnimatedList/demo.dart', + codeUrl: 'components/List/AnimatedList/demo.dart', contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/AnimatedList-class.html', ); } } -/** +/* * 所有的 AnimatedList widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget diff --git a/lib/widgets/components/LIst/ListBody/demo.dart b/lib/widgets/components/LIst/ListBody/demo.dart index 73dbbe13..76a1f679 100644 --- a/lib/widgets/components/LIst/ListBody/demo.dart +++ b/lib/widgets/components/LIst/ListBody/demo.dart @@ -7,7 +7,6 @@ * tartget: ListBody 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/LIst/ListBody/index.dart b/lib/widgets/components/LIst/ListBody/index.dart index e208093f..8dc071da 100644 --- a/lib/widgets/components/LIst/ListBody/index.dart +++ b/lib/widgets/components/LIst/ListBody/index.dart @@ -7,7 +7,7 @@ * tartget: ListBody 的示例 */ import '../../../../common/widget_demo.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -41,19 +41,19 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'ListBody', - codeUrl: 'componentss/List/ListBody/demo.dart', - contentList: [allDemoBoxs(context, this)], + codeUrl: 'components/List/ListBody/demo.dart', + contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/ListBody-class.html', ); } } -/** +/* * 所有的 ListBody widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allDemoBoxs(BuildContext context, _DemoState that) { +Widget allCheckboxs(BuildContext context, _DemoState that) { return Container( //padding: new EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0), child: Column( diff --git a/lib/widgets/components/LIst/ListView/demo.dart b/lib/widgets/components/LIst/ListView/demo.dart index cafab8da..d4f80a1e 100644 --- a/lib/widgets/components/LIst/ListView/demo.dart +++ b/lib/widgets/components/LIst/ListView/demo.dart @@ -7,7 +7,6 @@ * tartget: ListView 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* @@ -86,8 +85,8 @@ class ListViewLessDefault extends StatelessWidget { dense:true, // item 直观感受是整体大小 contentPadding: EdgeInsets.all(10.0),// item 内容内边距 enabled:true, - onTap:(){print('点击:${index}');},// item onTap 点击事件 - onLongPress:(){print('长按:${index}');},// item onLongPress 长按事件 + onTap:(){print('点击:$index');},// item onTap 点击事件 + onLongPress:(){print('长按:$index');},// item onLongPress 长按事件 selected:false, // item 是否选中状态 ); }, @@ -111,8 +110,8 @@ class ListViewLessDefault extends StatelessWidget { dense:true, // item 直观感受是整体大小 contentPadding: EdgeInsets.all(10.0),// item 内容内边距 enabled:true, - onTap:(){print('点击:${index}');},// item onTap 点击事件 - onLongPress:(){print('长按:${index}');},// item onLongPress 长按事件 + onTap:(){print('点击:$index');},// item onTap 点击事件 + onLongPress:(){print('长按:$index');},// item onLongPress 长按事件 selected:false, // item 是否选中状态 ); }, diff --git a/lib/widgets/components/LIst/ListView/index.dart b/lib/widgets/components/LIst/ListView/index.dart index 50e16a67..375d50ad 100644 --- a/lib/widgets/components/LIst/ListView/index.dart +++ b/lib/widgets/components/LIst/ListView/index.dart @@ -7,7 +7,6 @@ * tartget: ListView 的示例 */ import '../../../../common/widget_demo.dart'; -import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -68,19 +67,19 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'ListView', - codeUrl: 'componentss/List/ListView/demo.dart', - contentList: [allDemoBoxs(context, this)], + codeUrl: '/componentss/List/ListView/demo.dart', + contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/ListView-class.html', ); } } -/** +/* * 所有的 ListView widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allDemoBoxs(BuildContext context, _DemoState that) { +Widget allCheckboxs(BuildContext context, _DemoState that) { return Container( //padding: new EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0), child: Column( diff --git a/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart b/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart index acb9f5d3..fe1628fc 100644 --- a/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart +++ b/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart @@ -13,7 +13,6 @@ class CheckedPopupMenuItemDemo extends StatefulWidget { } class _CheckedPopupMenuItemDemoState extends State { - final GlobalKey _scaffoldKey = GlobalKey(); List _checkedValues; final String _checkedValue1 = 'One'; diff --git a/lib/widgets/components/Menu/index.dart b/lib/widgets/components/Menu/index.dart index 6c1d4cf3..697fad9d 100644 --- a/lib/widgets/components/Menu/index.dart +++ b/lib/widgets/components/Menu/index.dart @@ -12,7 +12,6 @@ import './DropdownMenuItem/index.dart' as DropdownMenuItem; import './PopupMenuButton/index.dart' as PopupMenuButton; import './PopupMenuDivider/index.dart' as PopupMenuDivider; import './PopupMenuEntry/index.dart' as PopupMenuEntry; -import './PopupMenuItem/index.dart' as PopupMenuItem; import './PopupMenuItemState/index.dart' as PopupMenuItemState; diff --git a/lib/widgets/components/Navigation/BottomNavigationBar/demo.dart b/lib/widgets/components/Navigation/BottomNavigationBar/demo.dart index eb79430c..270f815c 100644 --- a/lib/widgets/components/Navigation/BottomNavigationBar/demo.dart +++ b/lib/widgets/components/Navigation/BottomNavigationBar/demo.dart @@ -7,7 +7,6 @@ * tartget: BottomNavigationBar 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/Navigation/BottomNavigationBar/index.dart b/lib/widgets/components/Navigation/BottomNavigationBar/index.dart index cb40f249..1dfe3880 100644 --- a/lib/widgets/components/Navigation/BottomNavigationBar/index.dart +++ b/lib/widgets/components/Navigation/BottomNavigationBar/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: BottomNavigationBar 的示例 */ -import '../../../../routers/application.dart'; + import 'package:flutter/material.dart'; import '../../../../common/widget_demo.dart'; @@ -42,7 +42,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'BottomNavigationBar', - codeUrl: '${Application.github['widgetsURL']}components/Navigation/BottomNavigationBar/demo.dart', + codeUrl: 'components/Navigation/BottomNavigationBar/demo.dart', contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/BottomNavigationBar-class.html', bottomNaviBar:BottomNavigationBarDemo.BottomNavigationBarFullDefault() @@ -50,7 +50,7 @@ class _DemoState extends State { } } -/** +/* * 所有的 BottomNavigationBar widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget diff --git a/lib/widgets/components/Navigation/BottomNavigationBarItem/demo.dart b/lib/widgets/components/Navigation/BottomNavigationBarItem/demo.dart index 4554f235..7287ab06 100644 --- a/lib/widgets/components/Navigation/BottomNavigationBarItem/demo.dart +++ b/lib/widgets/components/Navigation/BottomNavigationBarItem/demo.dart @@ -7,7 +7,6 @@ * tartget: BottomNavigationBarItem 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart b/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart index 9071e9fd..5ae71489 100644 --- a/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart +++ b/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart @@ -7,8 +7,7 @@ * tartget: BottomNavigationBarItem 的示例 */ import '../../../../common/widget_demo.dart'; -import '../../../../routers/application.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -26,11 +25,6 @@ const String _Text1 = > 这个类很少单独使用。通常嵌入在上面的一个底部 bottom navigation widgets 中。 """; -const String _Text2 = -"""### **进阶用法** -> BottomNavigationBarItem -- -"""; class Demo extends StatefulWidget { static const String routeName = '/components/Navigation/BottomNavigationBarItem'; @@ -44,14 +38,14 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'BottomNavigationBarItem', - codeUrl: '${Application.github['widgetsURL']}components/Bar/BottomNavigationBarItem/demo.dart', + codeUrl: 'components/Bar/BottomNavigationBarItem/demo.dart', contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/BottomNavigationBarItem-class.html', ); } } -/** +/* * 所有的 BottomNavigationBarItem widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget diff --git a/lib/widgets/components/Panel/ExpansionPanelList/demo.dart b/lib/widgets/components/Panel/ExpansionPanelList/demo.dart index 10b12839..278c09bb 100644 --- a/lib/widgets/components/Panel/ExpansionPanelList/demo.dart +++ b/lib/widgets/components/Panel/ExpansionPanelList/demo.dart @@ -15,7 +15,7 @@ enum Location { typedef DemoItemBodyBuilder = Widget Function(DemoItem item); typedef ValueToString = String Function(T value); -/** +/* * google flutter 详情多个例子地址： * https://github.com/flutter/flutter/blob/master/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart */ @@ -135,11 +135,6 @@ class _ExpansionPanelsDemoState extends State { hint: 'Select location', valueToString: (Location location) => location.toString().split('.')[1], builder: (DemoItem item) { - void close() { - setState(() { - item.isExpanded = false; - }); - } return Form( child: Builder( builder: (BuildContext context) { diff --git a/lib/widgets/components/Pick/YearPicker/demo.dart b/lib/widgets/components/Pick/YearPicker/demo.dart index 11abcb62..34e211d9 100644 --- a/lib/widgets/components/Pick/YearPicker/demo.dart +++ b/lib/widgets/components/Pick/YearPicker/demo.dart @@ -1,8 +1,8 @@ /* * @Author: xiaojia.dxj * @Date: 2018-12-17 15:37:32 - * @Last Modified by: xiaojia.dxj - * @Last Modified time: 2018-12-18 19:12:32 + * @Last Modified by: 一凨 + * @Last Modified time: 2019-01-11 15:17:26 */ import 'dart:async'; diff --git a/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart b/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart index 16ca025c..a29d07ca 100644 --- a/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart +++ b/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart @@ -6,7 +6,6 @@ */ import 'package:flutter/material.dart'; import '../../../../common/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 e4430cea..4af9aa12 100644 --- a/lib/widgets/components/Scroll/ScrollPhysics/index.dart +++ b/lib/widgets/components/Scroll/ScrollPhysics/index.dart @@ -5,7 +5,6 @@ * @Last Modified time: 2018-12-15 21:26:11 */ import 'package:flutter/material.dart'; -import 'package:flutter/material.dart'; import '../../../../common/widget_demo.dart'; import './demo.dart'; diff --git a/lib/widgets/elements/Form/Button/DropdownButton/demo.dart b/lib/widgets/elements/Form/Button/DropdownButton/demo.dart index 06eeacd2..2bf5b846 100644 --- a/lib/widgets/elements/Form/Button/DropdownButton/demo.dart +++ b/lib/widgets/elements/Form/Button/DropdownButton/demo.dart @@ -6,7 +6,6 @@ * email: zhu.yan@alibaba-inc.com * tartget: DropdownButton 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* @@ -14,15 +13,15 @@ import 'package:flutter/material.dart'; * isDisabled:是否是禁用，isDisabled 默认为true * */ class DropdownButtonDefault extends StatelessWidget { - List generateItemList() { - List items = new List(); - DropdownMenuItem item1 = new DropdownMenuItem( + List generateItemList() { + final List items = new List(); + final DropdownMenuItem item1 = new DropdownMenuItem( value: '张三', child: new Text('张三')); - DropdownMenuItem item2 = new DropdownMenuItem( + final DropdownMenuItem item2 = new DropdownMenuItem( value: '李四', child: new Text('李四')); - DropdownMenuItem item3 = new DropdownMenuItem( + final DropdownMenuItem item3 = new DropdownMenuItem( value: '王二', child: new Text('王二')); - DropdownMenuItem item4 = new DropdownMenuItem( + final DropdownMenuItem item4 = new DropdownMenuItem( value: '麻子', child: new Text('麻子')); items.add(item1); items.add(item2); diff --git a/lib/widgets/elements/Form/Button/DropdownButton/index.dart b/lib/widgets/elements/Form/Button/DropdownButton/index.dart index 8bc852b0..156ab0a1 100644 --- a/lib/widgets/elements/Form/Button/DropdownButton/index.dart +++ b/lib/widgets/elements/Form/Button/DropdownButton/index.dart @@ -8,6 +8,7 @@ * 对应文档地址:https://docs.flutter.io/flutter/material/DropdownButton-class.html */ import '../../../../../common/widget_demo.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -56,7 +57,7 @@ class _DemoState extends State { } } -/** +/* * 所有的 DropdownButton 按钮 */ Widget allDropdownButtons(BuildContext context,_DemoState that){ diff --git a/lib/widgets/elements/Form/Button/FlatButton/demo.dart b/lib/widgets/elements/Form/Button/FlatButton/demo.dart index 106bd912..45352b5f 100644 --- a/lib/widgets/elements/Form/Button/FlatButton/demo.dart +++ b/lib/widgets/elements/Form/Button/FlatButton/demo.dart @@ -16,7 +16,7 @@ import 'package:flutter/material.dart'; class FlatButtonDefault extends StatelessWidget { final bool isDisabled; - const FlatButtonDefault([bool this.isDisabled = true]) + const FlatButtonDefault([ this.isDisabled = true]) : assert(isDisabled != null), super(); @@ -39,7 +39,7 @@ class FlatButtonIconDefault extends StatelessWidget { final IconData icon; const FlatButtonIconDefault( - [bool this.isDisabled = true, IconData this.icon = Icons.add_circle]) + [ this.isDisabled = true, this.icon = Icons.add_circle]) : super(); Color _randomColor() { @@ -73,10 +73,10 @@ class FlatButtonCustom extends StatelessWidget { final VoidCallback onPressed; const FlatButtonCustom([ - String this.txt = '自定义按钮', - Color this.color = Colors.blueAccent, - ShapeBorder this.shape, - VoidCallback this.onPressed + this.txt = '自定义按钮', + this.color = Colors.blueAccent, + this.shape, + this.onPressed ]) :super(); @override diff --git a/lib/widgets/elements/Form/Button/FlatButton/index.dart b/lib/widgets/elements/Form/Button/FlatButton/index.dart index e5f4f1c7..c293eab9 100644 --- a/lib/widgets/elements/Form/Button/FlatButton/index.dart +++ b/lib/widgets/elements/Form/Button/FlatButton/index.dart @@ -8,39 +8,12 @@ * 对应文档地址:https://docs.flutter.io/flutter/material/FlatButton-class.html */ import '../../../../../common/widget_demo.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import './demo.dart' as flatButton; -const String _markdownData = """# Markdown Example -Markdown allows you to easily include formatted text, images, and even formatted Dart code in your app. -## Styling -Style text as _italic_, __bold__, or `inline code`. -- Use bulleted lists -- To better clarify -- Your points -## Links -You can use [hyperlinks](hyperlink) in markdown -## Images -You can include images: -![Flutter logo](https://flutter.io/images/flutter-mark-square-100.png#100x100) -## Markdown widget -This is an example of how to create your own Markdown widget: - new Markdown(data: 'Hello _world_!'); -## Code blocks -Formatted Dart code looks really pretty too: -``` -void main() { - runApp(new MaterialApp( - home: new Scaffold( - body: new Markdown(data: markdownData) - ) - )); -} -``` -Enjoy! -"""; const String _flatText0 = @@ -88,7 +61,7 @@ class _DemoState extends State { } } -/** +/* * 所有的 FlatButton 按钮 */ Widget allFlatButtons(BuildContext context){ diff --git a/lib/widgets/elements/Form/Button/FloatingActionButton/demo.dart b/lib/widgets/elements/Form/Button/FloatingActionButton/demo.dart index ecf373aa..f4188499 100644 --- a/lib/widgets/elements/Form/Button/FloatingActionButton/demo.dart +++ b/lib/widgets/elements/Form/Button/FloatingActionButton/demo.dart @@ -6,7 +6,6 @@ * email: zhu.yan@alibaba-inc.com * tartget: OutlineButton 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* @@ -16,7 +15,7 @@ import 'package:flutter/material.dart'; class FloatingActionButtonDefault extends StatelessWidget { final bool isDisabled; - const FloatingActionButtonDefault([bool this.isDisabled = true]) + const FloatingActionButtonDefault([ this.isDisabled = true]) : assert(isDisabled != null), super(); @@ -41,10 +40,10 @@ class FloatingActionButtonCustom extends StatelessWidget { final VoidCallback onPressed; const FloatingActionButtonCustom( - [String this.txt = '自定义按钮', - Color this.color = Colors.orange, - ShapeBorder this.shape, - VoidCallback this.onPressed]) + [ this.txt = '自定义按钮', + this.color = Colors.orange, + this.shape, + this.onPressed]) : super(); @override @@ -93,10 +92,10 @@ class FloatingActionButtonCustom2 extends StatelessWidget { final VoidCallback onPressed; const FloatingActionButtonCustom2( - [String this.txt = '自定义按钮', - Color this.color = Colors.orange, - ShapeBorder this.shape, - VoidCallback this.onPressed]) + [ this.txt = '自定义按钮', + this.color = Colors.orange, + this.shape, + this.onPressed]) : super(); @override diff --git a/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart b/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart index 0c921769..63768cff 100644 --- a/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart +++ b/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart @@ -14,8 +14,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import './demo.dart' as floatingActionButton; -const String _floatingActionTitle = - 'FloatingAction Button 示例'; const String _floatingActionText0 = """### **简介** @@ -68,7 +66,7 @@ class _DemoState extends State { } } -/** +/* * 所有的 FloatingActionButton 按钮 */ Widget allFloatingActionButtons(BuildContext context,_DemoState that){ @@ -105,26 +103,26 @@ Widget allFloatingActionButtons(BuildContext context,_DemoState that){ * alert 弹框 * context:容器的父级 * */ -void _showMessage(String name, BuildContext context) { - showDialog( - // alert 的父级 - context: context, - builder: (BuildContext context) { - return AlertDialog( - title: new Text('提示'), - content: new Text(name), - actions: [ - new FlatButton( - // alert 的取消按钮 - onPressed: () { - // 取消的事件 - Navigator.of(context).pop(true); - }, - child: new Text('取消')) - ]); - } - ); -} +// void _showMessage(String name, BuildContext context) { +// showDialog( +// // alert 的父级 +// context: context, +// builder: (BuildContext context) { +// return AlertDialog( +// title: new Text('提示'), +// content: new Text(name), +// actions: [ +// new FlatButton( +// // alert 的取消按钮 +// onPressed: () { +// // 取消的事件 +// Navigator.of(context).pop(true); +// }, +// child: new Text('取消')) +// ]); +// } +// ); +// } /* * 带align的text diff --git a/lib/widgets/elements/Form/Button/IconButton/demo.dart b/lib/widgets/elements/Form/Button/IconButton/demo.dart index 62be1b02..8f18ef00 100644 --- a/lib/widgets/elements/Form/Button/IconButton/demo.dart +++ b/lib/widgets/elements/Form/Button/IconButton/demo.dart @@ -19,7 +19,7 @@ final int len = IconNames.Names.length; class IconButtonDefault extends StatelessWidget { final bool isDisabled; - const IconButtonDefault([bool this.isDisabled = true]) + const IconButtonDefault([ this.isDisabled = true]) : assert(isDisabled != null), super(); @@ -43,10 +43,10 @@ class IconButtonCustom extends StatelessWidget { final VoidCallback onPressed; const IconButtonCustom( - [String this.txt = '自定义按钮', - Color this.color = Colors.blueAccent, - ShapeBorder this.shape, - VoidCallback this.onPressed]) + [ this.txt = '自定义按钮', + this.color = Colors.blueAccent, + this.shape, + this.onPressed]) : super(); getIcons(){ diff --git a/lib/widgets/elements/Form/Button/IconButton/index.dart b/lib/widgets/elements/Form/Button/IconButton/index.dart index ad00008b..8518228f 100644 --- a/lib/widgets/elements/Form/Button/IconButton/index.dart +++ b/lib/widgets/elements/Form/Button/IconButton/index.dart @@ -60,7 +60,7 @@ class _DemoState extends State { } } -/** +/* * 所有的 IconButton 按钮 */ Widget allIconButtons(BuildContext context,_DemoState that){ diff --git a/lib/widgets/elements/Form/Button/OutlineButton/demo.dart b/lib/widgets/elements/Form/Button/OutlineButton/demo.dart index 58212c76..582d7135 100644 --- a/lib/widgets/elements/Form/Button/OutlineButton/demo.dart +++ b/lib/widgets/elements/Form/Button/OutlineButton/demo.dart @@ -16,7 +16,7 @@ import 'package:flutter/material.dart'; class OutlineButtonDefault extends StatelessWidget { final bool isDisabled; - const OutlineButtonDefault([bool this.isDisabled = true]) + const OutlineButtonDefault([ this.isDisabled = true]) : assert(isDisabled != null), super(); @@ -39,7 +39,7 @@ class OutlineButtonIconDefault extends StatelessWidget { final IconData icon; const OutlineButtonIconDefault( - [bool this.isDisabled = true, IconData this.icon = Icons.add_circle]) + [ this.isDisabled = true, this.icon = Icons.add_circle]) : super(); @override @@ -66,10 +66,10 @@ class OutlineButtonCustom extends StatelessWidget { final VoidCallback onPressed; const OutlineButtonCustom( - [String this.txt = '自定义按钮', - Color this.color = Colors.blueAccent, - ShapeBorder this.shape, - VoidCallback this.onPressed]) + [ this.txt = '自定义按钮', + this.color = Colors.blueAccent, + this.shape, + this.onPressed]) : super(); @override diff --git a/lib/widgets/elements/Form/Button/OutlineButton/index.dart b/lib/widgets/elements/Form/Button/OutlineButton/index.dart index 5d23c6b1..ec9f460c 100644 --- a/lib/widgets/elements/Form/Button/OutlineButton/index.dart +++ b/lib/widgets/elements/Form/Button/OutlineButton/index.dart @@ -69,7 +69,7 @@ class _DemoState extends State { } } -/** +/* * 所有的 OutlineButton 按钮 */ Widget allOutlineButtons(BuildContext context,_DemoState that){ @@ -130,26 +130,26 @@ Widget allOutlineButtons(BuildContext context,_DemoState that){ * alert 弹框 * context:容器的父级 * */ -void _showMessage(String name, BuildContext context) { - showDialog( - // alert 的父级 - context: context, - builder: (BuildContext context) { - return AlertDialog( - title: new Text('提示'), - content: new Text(name), - actions: [ - new FlatButton( - // alert 的取消按钮 - onPressed: () { - // 取消的事件 - Navigator.of(context).pop(true); - }, - child: new Text('取消')) - ]); - } - ); -} +// void _showMessage(String name, BuildContext context) { +// showDialog( +// // alert 的父级 +// context: context, +// builder: (BuildContext context) { +// return AlertDialog( +// title: new Text('提示'), +// content: new Text(name), +// actions: [ +// new FlatButton( +// // alert 的取消按钮 +// onPressed: () { +// // 取消的事件 +// Navigator.of(context).pop(true); +// }, +// child: new Text('取消')) +// ]); +// } +// ); +// } /* * 带align的text diff --git a/lib/widgets/elements/Form/Button/PopupMenuButton/demo.dart b/lib/widgets/elements/Form/Button/PopupMenuButton/demo.dart index 0015ee41..beb27696 100644 --- a/lib/widgets/elements/Form/Button/PopupMenuButton/demo.dart +++ b/lib/widgets/elements/Form/Button/PopupMenuButton/demo.dart @@ -6,7 +6,6 @@ * email: zhu.yan@alibaba-inc.com * tartget: RaisedButton 的示例 */ -import 'dart:math'; import 'package:flutter/material.dart'; /* @@ -20,7 +19,7 @@ class PopupMenuButtonDefault extends StatelessWidget { final String type; const PopupMenuButtonDefault( - [String this.type = 'default1', bool this.isDisabled = true]) + [ this.type = 'default1', this.isDisabled = true]) : assert(isDisabled != null), super(); @@ -107,7 +106,7 @@ class PopupMenuButtonCustom extends StatelessWidget { label: Text( '自定义按钮', style: TextStyle(color: Colors.white), semanticsLabel: 'FLAT BUTTON'), - // onPressed:(){} // 激活状态按钮 + onPressed:(){} // 激活状态按钮 ), // 打开时放置菜单的z坐标。这可以控制菜单下方阴影的大小。 elevation:10.0, diff --git a/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart b/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart index d65e2633..2675f690 100644 --- a/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart +++ b/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart @@ -9,7 +9,7 @@ */ import '../../../../../common/widget_demo.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import './demo.dart' as popupMenuButton; @@ -37,8 +37,9 @@ const String _titleText2 = """ class Demo extends StatefulWidget { static const String routeName = '/element/Form/Button/PopupMenuButton'; final Map options = {'defaultSelect': '选项二的内容'}; - @override final _DemoState self = _DemoState(); + + @override _DemoState createState() => self; } diff --git a/lib/widgets/elements/Form/Button/RaisedButton/demo.dart b/lib/widgets/elements/Form/Button/RaisedButton/demo.dart index 45be5193..0ddece9d 100644 --- a/lib/widgets/elements/Form/Button/RaisedButton/demo.dart +++ b/lib/widgets/elements/Form/Button/RaisedButton/demo.dart @@ -16,7 +16,7 @@ import 'package:flutter/material.dart'; class RaisedButtonDefault extends StatelessWidget { final bool isDisabled; - const RaisedButtonDefault([bool this.isDisabled = true]) + const RaisedButtonDefault([ this.isDisabled = true]) : assert(isDisabled != null), super(); @@ -39,7 +39,7 @@ class RaisedButtonIconDefault extends StatelessWidget { final IconData icon; const RaisedButtonIconDefault( - [bool this.isDisabled = true, IconData this.icon = Icons.add_circle]) + [ this.isDisabled = true, this.icon = Icons.add_circle]) : super(); Color _randomColor() { @@ -73,10 +73,10 @@ class RaisedButtonCustom extends StatelessWidget { final VoidCallback onPressed; const RaisedButtonCustom( - [String this.txt = '自定义按钮', - Color this.color = Colors.blueAccent, - ShapeBorder this.shape, - VoidCallback this.onPressed]) + [ this.txt = '自定义按钮', + this.color = Colors.blueAccent, + this.shape, + this.onPressed]) : super(); @override diff --git a/lib/widgets/elements/Form/Button/RaisedButton/index.dart b/lib/widgets/elements/Form/Button/RaisedButton/index.dart index d29797ef..dbbd466b 100644 --- a/lib/widgets/elements/Form/Button/RaisedButton/index.dart +++ b/lib/widgets/elements/Form/Button/RaisedButton/index.dart @@ -69,7 +69,7 @@ class _DemoState extends State { } } -/** +/* * 所有的 RaisedButton 按钮 */ Widget allRaisedButtons(BuildContext context,_DemoState that){ @@ -130,26 +130,26 @@ Widget allRaisedButtons(BuildContext context,_DemoState that){ * alert 弹框 * context:容器的父级 * */ -void _showMessage(String name, BuildContext context) { - showDialog( - // alert 的父级 - context: context, - builder: (BuildContext context) { - return AlertDialog( - title: new Text('提示'), - content: new Text(name), - actions: [ - new FlatButton( - // alert 的取消按钮 - onPressed: () { - // 取消的事件 - Navigator.of(context).pop(true); - }, - child: new Text('取消')) - ]); - } - ); -} +// void _showMessage(String name, BuildContext context) { +// showDialog( +// // alert 的父级 +// context: context, +// builder: (BuildContext context) { +// return AlertDialog( +// title: new Text('提示'), +// content: new Text(name), +// actions: [ +// new FlatButton( +// // alert 的取消按钮 +// onPressed: () { +// // 取消的事件 +// Navigator.of(context).pop(true); +// }, +// child: new Text('取消')) +// ]); +// } +// ); +// } /* * 带align的text diff --git a/lib/widgets/elements/Form/Button/RawMaterialButton/demo.dart b/lib/widgets/elements/Form/Button/RawMaterialButton/demo.dart index f2386338..3b309a0b 100644 --- a/lib/widgets/elements/Form/Button/RawMaterialButton/demo.dart +++ b/lib/widgets/elements/Form/Button/RawMaterialButton/demo.dart @@ -16,7 +16,7 @@ import 'package:flutter/material.dart'; class RawMaterialButtonDefault extends StatelessWidget { final bool isDisabled; - const RawMaterialButtonDefault([bool this.isDisabled = true]) + const RawMaterialButtonDefault([ this.isDisabled = true]) : assert(isDisabled != null), super(); @@ -39,10 +39,10 @@ class RawMaterialButtonCustom extends StatelessWidget { final VoidCallback onPressed; const RawMaterialButtonCustom( - [String this.txt = '自定义按钮', - Color this.color = Colors.blueAccent, - ShapeBorder this.shape, - VoidCallback this.onPressed]) + [ this.txt = '自定义按钮', + this.color = Colors.blueAccent, + this.shape, + this.onPressed]) : super(); @override diff --git a/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart b/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart index 982675e9..5f982401 100644 --- a/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart +++ b/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart @@ -58,7 +58,7 @@ class _DemoState extends State { } } -/** +/* * 所有的 RawMaterialButton 按钮 */ Widget allRawMaterialButtons(BuildContext context,_DemoState that){ @@ -102,26 +102,26 @@ Widget allRawMaterialButtons(BuildContext context,_DemoState that){ * alert 弹框 * context:容器的父级 * */ -void _showMessage(String name, BuildContext context) { - showDialog( - // alert 的父级 - context: context, - builder: (BuildContext context) { - return AlertDialog( - title: new Text('提示'), - content: new Text(name), - actions: [ - new FlatButton( - // alert 的取消按钮 - onPressed: () { - // 取消的事件 - Navigator.of(context).pop(true); - }, - child: new Text('取消')) - ]); - } - ); -} +// void _showMessage(String name, BuildContext context) { +// showDialog( +// // alert 的父级 +// context: context, +// builder: (BuildContext context) { +// return AlertDialog( +// title: new Text('提示'), +// content: new Text(name), +// actions: [ +// new FlatButton( +// // alert 的取消按钮 +// onPressed: () { +// // 取消的事件 +// Navigator.of(context).pop(true); +// }, +// child: new Text('取消')) +// ]); +// } +// ); +// } /* * 带align的text diff --git a/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart b/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart index 2e94bb8d..60ebf8c8 100644 --- a/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart +++ b/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart @@ -16,7 +16,7 @@ import 'package:flutter/material.dart'; class CheckboxDefault extends StatefulWidget{ final int index; final parent; - const CheckboxDefault([this.parent,int this.index = -1]) : super(); + const CheckboxDefault([this.parent, this.index = -1]) : super(); @override State createState() =>_CheckboxDefault(); } @@ -47,7 +47,7 @@ class CheckboxSelect extends StatelessWidget { final widget; final parent; - const CheckboxSelect([this.widget,this.parent,int this.index = -1]) + const CheckboxSelect([this.widget,this.parent, this.index = -1]) : super(); @override diff --git a/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart b/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart index 00f4d369..ae8047f2 100644 --- a/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart +++ b/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart @@ -8,7 +8,7 @@ * 对应文档地址:https://docs.flutter.io/flutter/material/Checkbox-class.html */ import '../../../../../common/widget_demo.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -54,7 +54,7 @@ class _DemoState extends State { } } -/** +/* * 所有的 Checkbox 按钮 */ Widget allCheckboxs(BuildContext context,_DemoState that){ diff --git a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/demo.dart b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/demo.dart index eba60a7e..bae9572c 100644 --- a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/demo.dart +++ b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/demo.dart @@ -7,7 +7,6 @@ * tartget: CheckboxListTile 的示例 */ -import 'dart:math'; 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 3f6261bd..db524c76 100644 --- a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart +++ b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart @@ -7,9 +7,8 @@ * tartget: CheckboxListTile 的示例 */ import '../../../../../common/widget_demo.dart'; -import 'dart:math'; + import 'package:flutter/material.dart'; -import 'package:flutter/scheduler.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import './demo.dart' as CheckboxListTileDemo; @@ -38,7 +37,7 @@ const String _CheckboxListTileText2 = class Demo extends StatefulWidget { static const String routeName = '/element/Form/Checkbox/CheckboxListTile'; - bool valBool = true; + final bool valBool = true; @override _DemoState createState() => _DemoState(); } @@ -55,7 +54,7 @@ class _DemoState extends State { } } -/** +/* * 所有的 CheckboxListTile widget * context: 运行上下文 * that: 指向有状态的 StatefulWidget diff --git a/lib/widgets/elements/Form/Input/TextField/index.dart b/lib/widgets/elements/Form/Input/TextField/index.dart index 3a4e6550..1b353f52 100644 --- a/lib/widgets/elements/Form/Input/TextField/index.dart +++ b/lib/widgets/elements/Form/Input/TextField/index.dart @@ -10,48 +10,47 @@ import '../../../../../common/widget_demo.dart'; import 'package:flutter/material.dart'; -import './text_field_demo.dart' ; +import './text_field_demo.dart'; - -const String _textFieldText0 = -"""### **简介** -> Text Field “文本字段” -- 文本字段允许用户输入文本，无论是硬件键盘还是屏幕键盘。 -- 每当用户更改字段中的文本时，文本字段就会调用Onchange的回调。 -- 如果用户指示他们在字段中输入完成（例如，通过按软键盘上的按钮），则文本字段调用onSubmitted回调。 +const String _textFieldText0 = """### **简介** +> TextField 最常用的文本输入widget +- 该 widget 作为文本输入框，可以接收用户以屏幕按键或者键盘输入的文本信息，该信息可以用于消息传递，搜索体验等 +- 用户修改文本信息时，Onchange会被调用，获取到最新的文本信息 +- 已知用户输入的字段文本输入完毕时（例如，通过按软键盘上的按钮确认输入完毕），该widget会调用onSubmitted回调 """; -const String _textFieldText1 = -"""### **基本用法** -> 参数的默认的按钮和禁用按钮 -- 默认情况下，文本字段具有在文本字段下方绘制分隔符的修饰。 -- 您可以使用装饰属性来控制装饰，例如通过添加标签或图标。如果将装饰属性设置为空，则将完全删除装饰，包括装饰引入的额外填充，以节省标签的空间。 -- 如果装饰是非null（这是默认的），文本字段需要它的祖先之一是一个材质widget。当文本字段被敲击时，墨水溅到材料上的油漆被触发。 -- 若要将TeXFieldField集成到其他FieldFieldWrices窗体中，请考虑使用TeTFrimeField。"""; +const String _textFieldText1 = """### **基本用法** +> 参数控制默认的按钮和禁用按钮 +- 默认情况下，TextField 下方有一个下划线进行修饰。 +- 您可以使用decoration属性来控制该widget样式，例如通过添加标签或图标。如果将decoration属性设置为空，则将完全删除装饰，包括装饰引入的额外填充，以节省标签的空间。 +- 如果decoration属性是非null（这是默认的），文本字段需要它的父类是一个Material widget。当文本字段被点击时，会出发被点击的效果。 +- 若要将TextField和其他FormFild集成到Form中，请考虑使用TeTFrimeField。"""; -const String _textFieldText2 = -"""### **进阶用法** -> 实现稍微复杂点的效果，键盘就变成了数字优先，为输入框做一些其他的效果，如提示文字，icon、标签文字等 +const String _textFieldText2 = """### **进阶用法** +> 实现稍微复杂点的效果，TextField 的输入以数字优先，为输入框做一些其他的效果，如提示文字，icon、标签文字等 - 增加一个keyboardType属性，把keyboardType设置为 TextInputType.number ，让TextField获得焦点的时候弹出的键盘就变成了数字优先。 - 新增decoration属性，设置相关属性，可以发现当我们的TextField获得焦点时，图标会自动变色，提示文字会自动上移。 -- onChanged是每次输入框内每次文字变更触发的回调，onSubmitted是用户提交而触发的回调。 +- onChanged是输入框内每次文字变更触发的回调方法，onSubmitted是用户提交而触发的回调方法。 - 每当用户改变输入框内的文字，都会在控制台输出现在的字符串.与onSubmitted用法相同。 """; class Demo extends StatefulWidget { static const String routeName = 'elements/Form/Input/TextField'; + @override _DemoState createState() => _DemoState(); } class _DemoState extends State { String buttonShapeType = 'border'; // 边框类型 - void setButtonShapeType(){ - String _buttonShapeType = (buttonShapeType == 'border') ? 'radius' : 'border'; - this.setState((){ + void setButtonShapeType() { + String _buttonShapeType = + (buttonShapeType == 'border') ? 'radius' : 'border'; + this.setState(() { buttonShapeType = _buttonShapeType; }); } + @override Widget build(BuildContext context) { return WidgetDemo( @@ -68,4 +67,3 @@ class _DemoState extends State { ); } } - diff --git a/lib/widgets/elements/Form/Radio/Radio/index.dart b/lib/widgets/elements/Form/Radio/Radio/index.dart index 11e52c41..bfbaf098 100644 --- a/lib/widgets/elements/Form/Radio/Radio/index.dart +++ b/lib/widgets/elements/Form/Radio/Radio/index.dart @@ -9,7 +9,6 @@ import 'package:flutter/material.dart'; import '../../../../../common/widget_demo.dart'; -import 'package:flutter_markdown/flutter_markdown.dart'; import 'demo.dart'; const content1 = """ # Radio diff --git a/lib/widgets/elements/Frame/Align/Align/demo.dart b/lib/widgets/elements/Frame/Align/Align/demo.dart index 18067138..288c1003 100644 --- a/lib/widgets/elements/Frame/Align/Align/demo.dart +++ b/lib/widgets/elements/Frame/Align/Align/demo.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -/** +/* * Author: xiaojia.dxj * Date: 2018/11/22 * Email: xiaojia.dxj@alibaba-inc.com @@ -14,7 +14,7 @@ class AlignAlignment extends StatelessWidget { final Alignment status; final String dec; - const AlignAlignment(Alignment this.status, String this.dec) : super(); + const AlignAlignment( this.status, this.dec) : super(); @override Widget build(BuildContext context) { @@ -39,8 +39,8 @@ class AlignFactor extends StatelessWidget { final double hFactor; final String dec; - const AlignFactor(Alignment this.status, double this.wFactor, - double this.hFactor, String this.dec) + const AlignFactor( this.status, this.wFactor, + this.hFactor, this.dec) : super(); @override diff --git a/lib/widgets/elements/Frame/Align/Align/index.dart b/lib/widgets/elements/Frame/Align/Align/index.dart index 7531bb23..05422f0e 100644 --- a/lib/widgets/elements/Frame/Align/Align/index.dart +++ b/lib/widgets/elements/Frame/Align/Align/index.dart @@ -41,12 +41,12 @@ class _DemoState extends State { contentList: [ _flatText0, _flatText1, - _AlignCreate() + _alignCreate() ], ); } - Column _AlignCreate() { + Column _alignCreate() { return new Column( children: [ SizedBox(height: 10.0), diff --git a/lib/widgets/elements/Frame/Axis/crossAxis/index.dart b/lib/widgets/elements/Frame/Axis/crossAxis/index.dart index 6ed7d70c..804339b7 100644 --- a/lib/widgets/elements/Frame/Axis/crossAxis/index.dart +++ b/lib/widgets/elements/Frame/Axis/crossAxis/index.dart @@ -11,7 +11,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'crossAxis', - child: Column( + contentList: [Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( @@ -39,7 +39,7 @@ class _DemoState extends State { margin: const EdgeInsets.all(10.0), ), ], - ), + )], docUrl: 'https://docs.flutter.io/flutter/widgets/Padding-class.html', ); } diff --git a/lib/widgets/elements/Frame/Axis/flipAxis/index.dart b/lib/widgets/elements/Frame/Axis/flipAxis/index.dart index c5d00594..1928570b 100644 --- a/lib/widgets/elements/Frame/Axis/flipAxis/index.dart +++ b/lib/widgets/elements/Frame/Axis/flipAxis/index.dart @@ -37,7 +37,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'flipAxis', - child: Flex( + contentList: [Flex( direction: _direction, mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.max, @@ -72,7 +72,7 @@ class _DemoState extends State { onPressed: _changeDirection, ) ], - ), + )], docUrl: 'https://docs.flutter.io/flutter/painting/flipAxis.html', ); } diff --git a/lib/widgets/elements/Frame/Axis/index.dart b/lib/widgets/elements/Frame/Axis/index.dart deleted file mode 100644 index 1d98fcb5..00000000 --- a/lib/widgets/elements/Frame/Axis/index.dart +++ /dev/null @@ -1,24 +0,0 @@ -import 'package:flutter/material.dart'; -import '../../../../model/widget.dart'; - -import './crossAxis/index.dart' as crossAxis; -import './flipAxis/index.dart' as flipAxis; -import './mainAxis/index.dart' as mainAxis; - -List widgetPoints = [ - WidgetPoint( - name: 'crossAxis', - routerName: crossAxis.Demo.routeName, - buildRouter: (BuildContext context) => crossAxis.Demo(), - ), - WidgetPoint( - name: 'flipAxis', - routerName: flipAxis.Demo.routeName, - buildRouter: (BuildContext context) => flipAxis.Demo(), - ), - WidgetPoint( - name: 'mainAxis', - routerName: mainAxis.Demo.routeName, - buildRouter: (BuildContext context) => mainAxis.Demo(), - ), -]; diff --git a/lib/widgets/elements/Frame/Axis/mainAxis/index.dart b/lib/widgets/elements/Frame/Axis/mainAxis/index.dart index 9540c54e..4b6e088e 100644 --- a/lib/widgets/elements/Frame/Axis/mainAxis/index.dart +++ b/lib/widgets/elements/Frame/Axis/mainAxis/index.dart @@ -11,7 +11,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'mainAxis', - child: Flex( + contentList: [Flex( direction: Axis.vertical, mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.max, @@ -42,9 +42,8 @@ class _DemoState extends State { margin: const EdgeInsets.all(10.0), ), ], - ), - docUrl: - 'https://docs.flutter.io/flutter/material/MergeableMaterial/mainAxis.html', + )], + docUrl: 'https://docs.flutter.io/flutter/material/MergeableMaterial/mainAxis.html', ); } } diff --git a/lib/widgets/elements/Frame/Box/ConstrainedBox/demo.dart b/lib/widgets/elements/Frame/Box/ConstrainedBox/demo.dart index 5405b6ef..341e48ec 100644 --- a/lib/widgets/elements/Frame/Box/ConstrainedBox/demo.dart +++ b/lib/widgets/elements/Frame/Box/ConstrainedBox/demo.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -/** +/* * Author: xiaojia.dxj * Date: 2018/11/22 * Email: xiaojia.dxj@alibaba-inc.com diff --git a/lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart b/lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart index a32fe44a..e0204834 100644 --- a/lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart +++ b/lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -/** +/* * Author: xiaojia.dxj * Date: 2018/11/22 * Email: xiaojia.dxj@alibaba-inc.com diff --git a/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart b/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart index 32645d8d..8ea20760 100644 --- a/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart +++ b/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart @@ -32,13 +32,13 @@ class _DemoState extends State { contentList: [ _Text, _Text1, - _DecoratedBoxCreate(), + _decoratedBoxCreate(), ], docUrl: 'https://docs.flutter.io/flutter/widgets/DecoratedBox-class.html', ); } - Column _DecoratedBoxCreate() { + Column _decoratedBoxCreate() { return new Column( children: [ Container( diff --git a/lib/widgets/elements/Frame/Box/Fittedbox/demo.dart b/lib/widgets/elements/Frame/Box/Fittedbox/demo.dart index b1022cc7..4f949a0b 100644 --- a/lib/widgets/elements/Frame/Box/Fittedbox/demo.dart +++ b/lib/widgets/elements/Frame/Box/Fittedbox/demo.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -/** +/* * Author: xiaojia.dxj * Date: 2018/12/2 * Email: xiaojia.dxj@alibaba-inc.com @@ -13,9 +13,9 @@ import 'package:flutter/widgets.dart'; class FittedBoxDefault extends StatelessWidget { final BoxFit curfit; - String dec; + final String dec; - FittedBoxDefault({Key key, BoxFit this.curfit, this.dec}); + FittedBoxDefault({Key key, this.curfit, this.dec}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/elements/Frame/Box/Fittedbox/index.dart b/lib/widgets/elements/Frame/Box/Fittedbox/index.dart index 85160d42..f5c58a10 100644 --- a/lib/widgets/elements/Frame/Box/Fittedbox/index.dart +++ b/lib/widgets/elements/Frame/Box/Fittedbox/index.dart @@ -42,12 +42,12 @@ class _DemoState extends State { contentList: [ Text0, Text1, - _FittedBoxCreate(), + _fittedBoxCreate(), ], ); } - Column _FittedBoxCreate() { + Column _fittedBoxCreate() { return Column( children: [ Row( diff --git a/lib/widgets/elements/Frame/Box/OverflowBox/demo.dart b/lib/widgets/elements/Frame/Box/OverflowBox/demo.dart index 8966df6e..535a9d44 100644 --- a/lib/widgets/elements/Frame/Box/OverflowBox/demo.dart +++ b/lib/widgets/elements/Frame/Box/OverflowBox/demo.dart @@ -2,19 +2,19 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; class OverflowBoxDefault extends StatelessWidget { - double curmaxHeight; - double curmaxWidth; - double curHeight; - double curWidth; - AlignmentGeometry curalignment; + final double curmaxHeight; + final double curmaxWidth; + final double curHeight; + final double curWidth; + final AlignmentGeometry curalignment; OverflowBoxDefault( {Key key, - double this.curmaxHeight, - double this.curmaxWidth, - double this.curWidth, - double this.curHeight, - AlignmentGeometry this.curalignment}) + this.curmaxHeight, + this.curmaxWidth, + this.curWidth, + this.curHeight, + this.curalignment}) : super(key: key); @override diff --git a/lib/widgets/elements/Frame/Box/OverflowBox/index.dart b/lib/widgets/elements/Frame/Box/OverflowBox/index.dart index a2458df9..504de5c5 100644 --- a/lib/widgets/elements/Frame/Box/OverflowBox/index.dart +++ b/lib/widgets/elements/Frame/Box/OverflowBox/index.dart @@ -5,7 +5,6 @@ * @Last Modified time: 2019-01-08 15:56:31 */ import 'package:flutter/material.dart'; -import 'package:flutter_markdown/flutter_markdown.dart'; import '../../../../../common/widget_demo.dart'; import './demo.dart' as overflowBox; @@ -39,12 +38,12 @@ class _DemoState extends State { contentList: [ Text0, Text1, - _OverflowBoxCreate(), + _overflowBoxCreate(), ], ); } - Row _OverflowBoxCreate() { + Row _overflowBoxCreate() { return Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ diff --git a/lib/widgets/elements/Frame/Box/RenderBox/index.dart b/lib/widgets/elements/Frame/Box/RenderBox/index.dart index 58539a94..df740656 100644 --- a/lib/widgets/elements/Frame/Box/RenderBox/index.dart +++ b/lib/widgets/elements/Frame/Box/RenderBox/index.dart @@ -6,7 +6,6 @@ */ import 'package:flutter/material.dart'; import '../../../../../common/widget_demo.dart'; -import './demo.dart' as sizeBox; const String _Text = ''' ### **简介** @@ -35,13 +34,13 @@ class _DemoState extends State { codeUrl: 'elements/Frame/Box/RenderBox/demo.dart', contentList: [ _Text, - _SizeBoxCreate(), + _sizeBoxCreate(), ], docUrl: 'https://docs.flutter.io/flutter/widgets/RenderBox-class.html', ); } - Column _SizeBoxCreate() { + Column _sizeBoxCreate() { return new Column( children: [ /** diff --git a/lib/widgets/elements/Frame/Box/SizeBox/index.dart b/lib/widgets/elements/Frame/Box/SizeBox/index.dart index 36ee028f..dab70e6d 100644 --- a/lib/widgets/elements/Frame/Box/SizeBox/index.dart +++ b/lib/widgets/elements/Frame/Box/SizeBox/index.dart @@ -21,13 +21,13 @@ class _DemoState extends State { title: 'Table', codeUrl: 'elements/Frame/Box/SizedBox/demo.dart', contentList: [ - _SizeBoxCreate(), + _sizeBoxCreate(), ], docUrl: 'https://docs.flutter.io/flutter/widgets/SizedBox-class.html', ); } - Column _SizeBoxCreate() { + Column _sizeBoxCreate() { return new Column( children: [ new Text("SizedBox", diff --git a/lib/widgets/elements/Frame/Box/SizedOverflowBox/demo.dart b/lib/widgets/elements/Frame/Box/SizedOverflowBox/demo.dart index 3eb7f24c..034f9bc4 100644 --- a/lib/widgets/elements/Frame/Box/SizedOverflowBox/demo.dart +++ b/lib/widgets/elements/Frame/Box/SizedOverflowBox/demo.dart @@ -8,9 +8,9 @@ class SizeOverflowBoxDefault extends StatelessWidget { SizeOverflowBoxDefault( {Key key, - double this.curSizeWidth, - double this.curSizeHeight, - String this.text}) + this.curSizeWidth, + this.curSizeHeight, + this.text}) : super(key: key); @override @@ -36,7 +36,7 @@ class SizeBoxDefault extends StatelessWidget { final double curWidth; final double curHeight; - SizeBoxDefault({Key key, double this.curHeight, double this.curWidth}) + SizeBoxDefault({Key key, this.curHeight, this.curWidth}) : super(key: key); @override diff --git a/lib/widgets/elements/Frame/Box/TextBox/index.dart b/lib/widgets/elements/Frame/Box/TextBox/index.dart index 75d79d9e..cc48e960 100644 --- a/lib/widgets/elements/Frame/Box/TextBox/index.dart +++ b/lib/widgets/elements/Frame/Box/TextBox/index.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import '../../../../../common/widget_demo.dart'; -import './demo.dart' as TextBox; const String _Text = """### **TextBox简介** > 是一个包含一段文本的矩形 diff --git a/lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart b/lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart index a56e2db5..398e5333 100644 --- a/lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart +++ b/lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; class ExpandedDemo extends StatelessWidget { - TextStyle txtColor = TextStyle(color: Colors.white); + final TextStyle txtColor = TextStyle(color: Colors.white); @override Widget build(BuildContext context) { return Column( diff --git a/lib/widgets/elements/Frame/Layout/Column/demo.dart b/lib/widgets/elements/Frame/Layout/Column/demo.dart index 246e314c..e94c8a78 100644 --- a/lib/widgets/elements/Frame/Layout/Column/demo.dart +++ b/lib/widgets/elements/Frame/Layout/Column/demo.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -/** +/* * Author: xiaojia.dxj * Date: 2018/11/22 * Email: xiaojia.dxj@alibaba-inc.com diff --git a/lib/widgets/elements/Frame/Layout/Container/demo.dart b/lib/widgets/elements/Frame/Layout/Container/demo.dart index e7853f80..110359ef 100644 --- a/lib/widgets/elements/Frame/Layout/Container/demo.dart +++ b/lib/widgets/elements/Frame/Layout/Container/demo.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -/** +/* * Author: xiaojia.dxj * Date: 2018/11/22 * Email: xiaojia.dxj@alibaba-inc.com diff --git a/lib/widgets/elements/Frame/Layout/Row/demo.dart b/lib/widgets/elements/Frame/Layout/Row/demo.dart index 0cac6995..cdf370e0 100644 --- a/lib/widgets/elements/Frame/Layout/Row/demo.dart +++ b/lib/widgets/elements/Frame/Layout/Row/demo.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -/** +/* * Author: xiaojia.dxj * Date: 2018/11/22 * Email: xiaojia.dxj@alibaba-inc.com @@ -10,7 +10,7 @@ import 'package:flutter/widgets.dart'; * Describle:Row */ class RowMainAxisAlignment extends StatelessWidget { - /** + /* * > mainAxisAlignment属性 * - MainAxisAlignment.spaceEvenly/spaceAround/spaceBetween, - spaceEvenly：将主轴方向空白区域均分，使得children之间空间相等，包括首尾childre @@ -23,7 +23,7 @@ class RowMainAxisAlignment extends StatelessWidget { */ final MainAxisAlignment status; - /** + /* * > CrossAxisAlignment 属性 - crossAxisAlignment: CrossAxisAlignment.center/end/start, - 即，根据设定的位置交叉对齐 @@ -35,7 +35,7 @@ class RowMainAxisAlignment extends StatelessWidget { final CrossAxisAlignment crossStatus; const RowMainAxisAlignment( - MainAxisAlignment this.status, CrossAxisAlignment this.crossStatus) + this.status, this.crossStatus) : super(); @override diff --git a/lib/widgets/elements/Frame/Layout/Row/index.dart b/lib/widgets/elements/Frame/Layout/Row/index.dart index 119aa3de..7c480400 100644 --- a/lib/widgets/elements/Frame/Layout/Row/index.dart +++ b/lib/widgets/elements/Frame/Layout/Row/index.dart @@ -43,12 +43,12 @@ class _DemoState extends State { contentList: [ Text0, Text1, - _RowCreate(), + _rowCreate(), ], ); } - Column _RowCreate() { + Column _rowCreate() { return new Column( children: [ RowLayout(), diff --git a/lib/widgets/elements/Frame/Stack/IndexedStack/demo.dart b/lib/widgets/elements/Frame/Stack/IndexedStack/demo.dart index ba239ad8..bcf289cc 100644 --- a/lib/widgets/elements/Frame/Stack/IndexedStack/demo.dart +++ b/lib/widgets/elements/Frame/Stack/IndexedStack/demo.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -/** +/* * Author: xiaojia.dxj * Date: 2018/11/22 * Email: xiaojia.dxj@alibaba-inc.com @@ -12,7 +12,7 @@ import 'package:flutter/material.dart'; class StackDefault extends StatelessWidget { final int currIndex; - const StackDefault(int this.currIndex) : super(); + const StackDefault( this.currIndex) : super(); @override Widget build(BuildContext context) { @@ -54,7 +54,7 @@ class StackDefault extends StatelessWidget { class StackIndex extends StatelessWidget { final int currIndex; - const StackIndex(int this.currIndex) : super(); + const StackIndex( this.currIndex) : super(); @override Widget build(BuildContext context) { diff --git a/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart b/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart index 6215777b..22185831 100644 --- a/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart +++ b/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_markdown/flutter_markdown.dart'; import '../../../../../common/widget_demo.dart'; import './demo.dart'; @@ -22,7 +21,6 @@ class Demo extends StatefulWidget { } class _DemoState extends State { - String _desc = "IndexedStack 使用"; int currIndex = 0; void _indexAdd() { @@ -45,12 +43,12 @@ class _DemoState extends State { contentList: [ _stackText0, _stackText1, - _IndexedStackCreate(), + _indexedStackCreate(), ], ); } - Column _IndexedStackCreate() { + Column _indexedStackCreate() { return new Column( children: [ SizedBox( diff --git a/lib/widgets/elements/Frame/Stack/Stack/demo.dart b/lib/widgets/elements/Frame/Stack/Stack/demo.dart index ea32f633..4af0df05 100644 --- a/lib/widgets/elements/Frame/Stack/Stack/demo.dart +++ b/lib/widgets/elements/Frame/Stack/Stack/demo.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -/** +/* * Author: xiaojia.dxj * Date: 2018/11/22 * Email: xiaojia.dxj@alibaba-inc.com diff --git a/lib/widgets/elements/Frame/Stack/Stack/index.dart b/lib/widgets/elements/Frame/Stack/Stack/index.dart index 165c523f..35d60a09 100644 --- a/lib/widgets/elements/Frame/Stack/Stack/index.dart +++ b/lib/widgets/elements/Frame/Stack/Stack/index.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_markdown/flutter_markdown.dart'; import '../../../../../common/widget_demo.dart'; import './demo.dart'; @@ -36,7 +35,6 @@ class Demo extends StatefulWidget { } class _DemoState extends State { - String _desc = "Stack 使用"; @override Widget build(BuildContext context) { @@ -47,7 +45,7 @@ class _DemoState extends State { docUrl: 'https://docs.flutter.io/flutter/widgets/Stack-class.html', contentList: [ _stackText0, - _StackCreate(), + _stackCreate(), _stackText1, new Container( width: 300.0, @@ -67,7 +65,7 @@ class _DemoState extends State { ); } - Column _StackCreate() { + Column _stackCreate() { return new Column( children: [ Column( diff --git a/lib/widgets/elements/Media/Canvas/index.dart b/lib/widgets/elements/Media/Canvas/index.dart index a47f241e..e3e60ec0 100644 --- a/lib/widgets/elements/Media/Canvas/index.dart +++ b/lib/widgets/elements/Media/Canvas/index.dart @@ -1 +1 @@ -import 'package:flutter/material.dart'; +// import 'package:flutter/material.dart'; diff --git a/lib/widgets/elements/Media/Icon/Icon/demo.dart b/lib/widgets/elements/Media/Icon/Icon/demo.dart index dd023565..6b5d2fc4 100644 --- a/lib/widgets/elements/Media/Icon/Icon/demo.dart +++ b/lib/widgets/elements/Media/Icon/Icon/demo.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; class IconDemo extends StatelessWidget { - Color curColor = Colors.red; + final Color curColor; IconDemo({Key key, this.curColor}) : super(); diff --git a/lib/widgets/elements/Media/Icon/IconData/demo.dart b/lib/widgets/elements/Media/Icon/IconData/demo.dart index 5c7e1b5e..4dae9660 100644 --- a/lib/widgets/elements/Media/Icon/IconData/demo.dart +++ b/lib/widgets/elements/Media/Icon/IconData/demo.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; class IconDataDemo extends StatelessWidget { - Color curColor = Colors.red; + final Color curColor ; IconDataDemo({Key key, this.curColor}) : super(); diff --git a/lib/widgets/elements/Media/Icon/IconTheme/demo.dart b/lib/widgets/elements/Media/Icon/IconTheme/demo.dart index b7a309bf..53fa28a0 100644 --- a/lib/widgets/elements/Media/Icon/IconTheme/demo.dart +++ b/lib/widgets/elements/Media/Icon/IconTheme/demo.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; class IconThemeDemo extends StatelessWidget { - Color curColor = Colors.white; + final Color curColor ; IconThemeDemo({Key key, this.curColor}) : super(); @@ -25,7 +25,7 @@ class IconThemeDemo extends StatelessWidget { } class IconThemeDemo2 extends StatelessWidget { - Color curColor = Colors.white; + final Color curColor ; final double curSize; IconThemeDemo2({Key key, this.curColor, this.curSize}) : super(); diff --git a/lib/widgets/elements/Media/Icon/IconThemeData/demo.dart b/lib/widgets/elements/Media/Icon/IconThemeData/demo.dart index 41b54267..4fb49517 100644 --- a/lib/widgets/elements/Media/Icon/IconThemeData/demo.dart +++ b/lib/widgets/elements/Media/Icon/IconThemeData/demo.dart @@ -8,8 +8,8 @@ import 'package:flutter/material.dart'; class IconThemeDemo extends StatelessWidget { - Color curColor = Colors.white; - double curOpacity; + final Color curColor ; + final double curOpacity; IconThemeDemo({Key key, this.curColor, this.curOpacity}) : super(); @@ -29,7 +29,7 @@ class IconThemeDemo extends StatelessWidget { } class IconThemeDemo2 extends StatelessWidget { - Color curColor = Colors.white; + final Color curColor ; final double curSize; IconThemeDemo2({Key key, this.curColor, this.curSize}) : super(); diff --git a/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart b/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart index 1037a169..9aabe6fe 100644 --- a/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart +++ b/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart @@ -6,8 +6,6 @@ */ import 'package:flutter/material.dart'; import '../../../../../common/widget_demo.dart'; -import './decoration_image_painter_demo.dart'; -import 'dart:ui'; const contentText0 = ''' ### **简介** diff --git a/lib/widgets/elements/Media/Image/paintImage/index.dart b/lib/widgets/elements/Media/Image/paintImage/index.dart index da9eae7a..51faa110 100644 --- a/lib/widgets/elements/Media/Image/paintImage/index.dart +++ b/lib/widgets/elements/Media/Image/paintImage/index.dart @@ -6,7 +6,6 @@ */ import 'package:flutter/material.dart'; import '../../../../../common/widget_demo.dart'; -import './paint_image_demo.dart'; const String contentText0 = ''' ### **非Widget 待删除** diff --git a/lib/widgets/elements/Media/Image/precacheImage/index.dart b/lib/widgets/elements/Media/Image/precacheImage/index.dart index d315f08c..5d6e832f 100644 --- a/lib/widgets/elements/Media/Image/precacheImage/index.dart +++ b/lib/widgets/elements/Media/Image/precacheImage/index.dart @@ -5,7 +5,6 @@ * @Last Modified time: 2018-11-16 15:09:12 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; class Demo extends StatefulWidget { static const String routeName = '/element/Media/Image/precacheImage'; diff --git a/lib/widgets/themes/Material/MaterialColor/demo.dart b/lib/widgets/themes/Material/MaterialColor/demo.dart index 003163b3..393524ba 100644 --- a/lib/widgets/themes/Material/MaterialColor/demo.dart +++ b/lib/widgets/themes/Material/MaterialColor/demo.dart @@ -14,7 +14,7 @@ class Palette { final String name; final MaterialColor primary; - /** + /* * MaterialAccentColor：定义单一的色滴，颜色的阴影用索引表示， * 索引比较小的颜色比较浅，较大的索引较暗 */