diff --git a/lib/common/widget_demo.dart b/lib/common/widget_demo.dart index 9747dd43..6120592c 100644 --- a/lib/common/widget_demo.dart +++ b/lib/common/widget_demo.dart @@ -16,13 +16,16 @@ class WidgetDemo extends StatefulWidget { final String docUrl; final String title; final String codeUrl; + final Widget bottomNaviBar; WidgetDemo( {Key key, @required this.title, @required this.contentList, @required this.codeUrl, - @required this.docUrl}) + @required this.docUrl, + this.bottomNaviBar, + }) : super(key: key); _WidgetDemoState createState() => _WidgetDemoState(); @@ -174,6 +177,8 @@ class _WidgetDemoState extends State { ), backgroundColor: Theme.of(context).primaryColor, ), + bottomNavigationBar: (widget.bottomNaviBar is Widget) ? widget + .bottomNaviBar : null ); } } diff --git a/lib/widgets/components/Bar/AppBar/demo.dart b/lib/widgets/components/Bar/AppBar/demo.dart index d9bf58e8..c2e4a0e5 100644 --- a/lib/widgets/components/Bar/AppBar/demo.dart +++ b/lib/widgets/components/Bar/AppBar/demo.dart @@ -11,8 +11,8 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 -* index 当前checkbox 的索引值 +* Checkbox 默认AppBar的实例 +* index 当前AppBar 的索引值 * */ class AppBarLessDefaultComplex extends StatefulWidget { const AppBarLessDefaultComplex() : super(); diff --git a/lib/widgets/components/Bar/AppBar/index.dart b/lib/widgets/components/Bar/AppBar/index.dart index 06da2b87..7a84a0bf 100644 --- a/lib/widgets/components/Bar/AppBar/index.dart +++ b/lib/widgets/components/Bar/AppBar/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: AppBar 的示例 */ -import '../../../../common/widget-demo.dart'; -import '../../../../routers/application.dart'; +import '../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -48,8 +47,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'AppBar', - codeUrl: '${Application.github['widgetsURL']}componentss/Bar/AppBar/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'componentss/Bar/AppBar/demo.dart', + contentList: [ allDemoBoxs(context, this) ], docUrl: 'https://docs.flutter.io/flutter/material/AppBar-class.html', ); } @@ -60,7 +59,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDemoBoxs(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 b9ebd18c..7f42a9e5 100644 --- a/lib/widgets/components/Bar/BottomAppBar/demo.dart +++ b/lib/widgets/components/Bar/BottomAppBar/demo.dart @@ -6,8 +6,6 @@ * email: zhu.yan@alibaba-inc.com * tartget: BottomAppBar 的示例 */ - -import 'dart:math'; import 'package:flutter/material.dart'; /* diff --git a/lib/widgets/components/Bar/BottomAppBar/index.dart b/lib/widgets/components/Bar/BottomAppBar/index.dart index 74c17c2f..1ae2d1b8 100644 --- a/lib/widgets/components/Bar/BottomAppBar/index.dart +++ b/lib/widgets/components/Bar/BottomAppBar/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: BottomAppBar 的示例 */ -import '../../../../common/widget-demo.dart'; -import '../../../../routers/application.dart'; +import '../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -44,8 +43,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'BottomAppBar', - codeUrl: '${Application.github['widgetsURL']}componentss/Bar/BottomAppBar/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'componentss/Bar/BottomAppBar/demo.dart', + contentList: [allDomeBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/BottomAppBar-class.html', ); } @@ -56,7 +55,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDomeBoxs(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 74cf15b7..00c2debc 100644 --- a/lib/widgets/components/Bar/ButtonBar/demo.dart +++ b/lib/widgets/components/Bar/ButtonBar/demo.dart @@ -11,8 +11,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 -* index 当前checkbox 的索引值 +* ButtonBar 默认的实例 * */ class ButtonBarFullDefault extends StatefulWidget { const ButtonBarFullDefault() : super(); diff --git a/lib/widgets/components/Bar/ButtonBar/index.dart b/lib/widgets/components/Bar/ButtonBar/index.dart index 753cd3be..cc745120 100644 --- a/lib/widgets/components/Bar/ButtonBar/index.dart +++ b/lib/widgets/components/Bar/ButtonBar/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: ButtonBar 的示例 */ -import '../../../../common/widget-demo.dart'; -import '../../../../routers/application.dart'; +import '../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -45,9 +44,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'ButtonBar', - codeUrl: '${Application - .github['widgetsURL']}componentss//Bar/ButtonBar/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'componentss//Bar/ButtonBar/demo.dart', + contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/ButtonBar-class.html', ); } @@ -58,7 +56,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDemoBoxs(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 cd4218a9..b9fac16b 100644 --- a/lib/widgets/components/Bar/FlexibleSpaceBar/demo.dart +++ b/lib/widgets/components/Bar/FlexibleSpaceBar/demo.dart @@ -11,8 +11,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 -* index 当前checkbox 的索引值 +* Checkbox 默认FlexibleSpaceBar的实例 * */ class FlexibleSpaceBarFullDefault extends StatefulWidget { const FlexibleSpaceBarFullDefault() : super(); diff --git a/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart b/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart index 87e43280..5c85aa3a 100644 --- a/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart +++ b/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: FlexibleSpaceBar 的示例 */ -import '../../../../common/widget-demo.dart'; -import '../../../../routers/application.dart'; +import '../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -46,9 +45,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'FlexibleSpaceBar', - codeUrl: '${Application - .github['widgetsURL']}componentss/Bar/FlexibleSpaceBar/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'Bar/FlexibleSpaceBar/demo.dart', + contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/FlexibleSpaceBar-class.html', ); } @@ -59,7 +57,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDemoBoxs(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 e201af73..f99a104d 100644 --- a/lib/widgets/components/Bar/SliverAppBar/demo.dart +++ b/lib/widgets/components/Bar/SliverAppBar/demo.dart @@ -11,8 +11,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 -* index 当前checkbox 的索引值 +* Checkbox 默认SliverAppBar的实例 * */ class SliverAppBarFullDefault extends StatefulWidget { const SliverAppBarFullDefault() : super(); diff --git a/lib/widgets/components/Bar/SliverAppBar/index.dart b/lib/widgets/components/Bar/SliverAppBar/index.dart index ef6de401..7063439c 100644 --- a/lib/widgets/components/Bar/SliverAppBar/index.dart +++ b/lib/widgets/components/Bar/SliverAppBar/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: SliverAppBar 的示例 */ -import '../../../../common/widget-demo.dart'; -import '../../../../routers/application.dart'; +import '../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -41,8 +40,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'SliverAppBar', - codeUrl: '${Application.github['widgetsURL']}componentss/Bar/SliverAppBar/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'componentss/Bar/SliverAppBar/demo.dart', + contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/SliverAppBar-class.html', ); } @@ -53,7 +52,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDemoBoxs(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 6b0e9c5b..24b677d8 100644 --- a/lib/widgets/components/Bar/SnackBar/demo.dart +++ b/lib/widgets/components/Bar/SnackBar/demo.dart @@ -11,8 +11,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 -* index 当前checkbox 的索引值 +* Checkbox 默认的实例 * */ class SnackBarFullDefault extends StatefulWidget { const SnackBarFullDefault() : super(); diff --git a/lib/widgets/components/Bar/SnackBar/index.dart b/lib/widgets/components/Bar/SnackBar/index.dart index 3595af12..ddfa971a 100644 --- a/lib/widgets/components/Bar/SnackBar/index.dart +++ b/lib/widgets/components/Bar/SnackBar/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: SnackBar 的示例 */ -import '../../../../common/widget-demo.dart'; -import '../../../../routers/application.dart'; +import '../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -46,8 +45,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'SnackBar', - codeUrl: '${Application.github['widgetsURL']}componentss/Bar/SnackBar/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'componentss/Bar/SnackBar/demo.dart', + contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/SnackBar-class.html', ); } @@ -58,7 +57,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDemoBoxs(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/index.dart b/lib/widgets/components/Bar/SnackBarAction/index.dart index 30d2fbe6..47257ead 100644 --- a/lib/widgets/components/Bar/SnackBarAction/index.dart +++ b/lib/widgets/components/Bar/SnackBarAction/index.dart @@ -7,7 +7,6 @@ * tartget: SnackBarAction 的示例 */ import '../../../../common/widget_demo.dart'; -import '../../../../routers/application.dart'; import 'dart:math'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Card/Card/demo.dart b/lib/widgets/components/Card/Card/demo.dart index 7d4b4b3c..bc3c1d1f 100644 --- a/lib/widgets/components/Card/Card/demo.dart +++ b/lib/widgets/components/Card/Card/demo.dart @@ -11,8 +11,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 -* index 当前checkbox 的索引值 +* Checkbox 默认Card的实例 * */ class CardFullDefault extends StatefulWidget { const CardFullDefault() : super(); diff --git a/lib/widgets/components/Card/Card/index.dart b/lib/widgets/components/Card/Card/index.dart index 3867447d..66e2bc49 100644 --- a/lib/widgets/components/Card/Card/index.dart +++ b/lib/widgets/components/Card/Card/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: Card 的示例 */ -import '../../../../common/widget-demo.dart'; -import '../../../../routers/application.dart'; +import '../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -44,9 +43,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'Card', - codeUrl: '${Application - .github['widgetsURL']}componentss/Card/Card/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'componentss/Card/Card/demo.dart', + contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/Card-class.html', ); } @@ -57,7 +55,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDemoBoxs(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/AnimatedList/index.dart b/lib/widgets/components/LIst/AnimatedList/index.dart index eba2c0d0..48ffdff4 100644 --- a/lib/widgets/components/LIst/AnimatedList/index.dart +++ b/lib/widgets/components/LIst/AnimatedList/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: AnimatedList 的示例 */ -import '../../../../common/widget-demo.dart'; -import '../../../../routers/application.dart'; +import '../../../../common/widget_demo.dart'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -45,8 +44,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'AnimatedList', - codeUrl: '${Application.github['widgetsURL']}componentss/List/AnimatedList/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'componentss/List/AnimatedList/demo.dart', + contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/AnimatedList-class.html', ); } @@ -57,7 +56,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDemoBoxs(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/ListBody/demo.dart b/lib/widgets/components/LIst/ListBody/demo.dart index 8eae97bc..73dbbe13 100644 --- a/lib/widgets/components/LIst/ListBody/demo.dart +++ b/lib/widgets/components/LIst/ListBody/demo.dart @@ -11,8 +11,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 -* index 当前checkbox 的索引值 +* Checkbox 默认ListBody的实例 * */ class ListBodyFullDefault extends StatefulWidget { const ListBodyFullDefault() : super(); diff --git a/lib/widgets/components/LIst/ListBody/index.dart b/lib/widgets/components/LIst/ListBody/index.dart index 1ef2c981..e208093f 100644 --- a/lib/widgets/components/LIst/ListBody/index.dart +++ b/lib/widgets/components/LIst/ListBody/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: ListBody 的示例 */ -import '../../../../common/widget-demo.dart'; -import '../../../../routers/application.dart'; +import '../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -42,9 +41,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'ListBody', - codeUrl: '${Application - .github['widgetsURL']}/componentss/List/ListBody/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'componentss/List/ListBody/demo.dart', + contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/ListBody-class.html', ); } @@ -55,7 +53,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDemoBoxs(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 bdce900b..cafab8da 100644 --- a/lib/widgets/components/LIst/ListView/demo.dart +++ b/lib/widgets/components/LIst/ListView/demo.dart @@ -11,8 +11,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 -* index 当前checkbox 的索引值 +* ListView 默认ListView的实例 * */ class ListViewFullDefault extends StatefulWidget { const ListViewFullDefault() : super(); diff --git a/lib/widgets/components/LIst/ListView/index.dart b/lib/widgets/components/LIst/ListView/index.dart index 1416e662..50e16a67 100644 --- a/lib/widgets/components/LIst/ListView/index.dart +++ b/lib/widgets/components/LIst/ListView/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: ListView 的示例 */ -import '../../../../common/widget-demo.dart'; -import '../../../../routers/application.dart'; +import '../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -69,8 +68,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'ListView', - codeUrl: '${Application.github['widgetsURL']}/componentss/List/ListView/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'componentss/List/ListView/demo.dart', + contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/ListView-class.html', ); } @@ -81,7 +80,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDemoBoxs(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/Navigation/BottomNavigationBar/demo.dart b/lib/widgets/components/Navigation/BottomNavigationBar/demo.dart index a4916e74..eb79430c 100644 --- a/lib/widgets/components/Navigation/BottomNavigationBar/demo.dart +++ b/lib/widgets/components/Navigation/BottomNavigationBar/demo.dart @@ -11,8 +11,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 -* index 当前checkbox 的索引值 +* BottomNavigationBar 默认的实例 * */ class BottomNavigationBarFullDefault extends StatefulWidget { const BottomNavigationBarFullDefault() : super(); diff --git a/lib/widgets/components/Navigation/BottomNavigationBar/index.dart b/lib/widgets/components/Navigation/BottomNavigationBar/index.dart index 072f03a5..cb40f249 100644 --- a/lib/widgets/components/Navigation/BottomNavigationBar/index.dart +++ b/lib/widgets/components/Navigation/BottomNavigationBar/index.dart @@ -6,10 +6,9 @@ * email: zhu.yan@alibaba-inc.com * tartget: BottomNavigationBar 的示例 */ -import '../customDemo.dart'; import '../../../../routers/application.dart'; -import 'dart:math'; import 'package:flutter/material.dart'; +import '../../../../common/widget_demo.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import './demo.dart' as BottomNavigationBarDemo; @@ -41,10 +40,10 @@ class Demo extends StatefulWidget { class _DemoState extends State { @override Widget build(BuildContext context) { - return CustomDemo( + return WidgetDemo( title: 'BottomNavigationBar', codeUrl: '${Application.github['widgetsURL']}components/Navigation/BottomNavigationBar/demo.dart', - child: allCheckboxs(context, this), + contentList: [allDemoBoxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/BottomNavigationBar-class.html', bottomNaviBar:BottomNavigationBarDemo.BottomNavigationBarFullDefault() ); @@ -56,7 +55,7 @@ class _DemoState extends State { * context: 运行上下文 * that: 指向有状态的 StatefulWidget */ -Widget allCheckboxs(BuildContext context, _DemoState that) { +Widget allDemoBoxs(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/Navigation/BottomNavigationBarItem/demo.dart b/lib/widgets/components/Navigation/BottomNavigationBarItem/demo.dart index 7f77989c..4554f235 100644 --- a/lib/widgets/components/Navigation/BottomNavigationBarItem/demo.dart +++ b/lib/widgets/components/Navigation/BottomNavigationBarItem/demo.dart @@ -11,8 +11,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 -* index 当前checkbox 的索引值 +* BottomNavigationBar 默认的实例 * */ class BottomNavigationBarItemFullDefault extends StatefulWidget { const BottomNavigationBarItemFullDefault() : super(); diff --git a/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart b/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart index 6d8f29ee..9071e9fd 100644 --- a/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart +++ b/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: BottomNavigationBarItem 的示例 */ -import '../../../../common/widget-demo.dart'; +import '../../../../common/widget_demo.dart'; import '../../../../routers/application.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -44,8 +44,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'BottomNavigationBarItem', - codeUrl: '${Application.github['widgetsURL']}componentss/Bar/BottomNavigationBarItem/demo.dart', - child: allCheckboxs(context, this), + codeUrl: '${Application.github['widgetsURL']}components/Bar/BottomNavigationBarItem/demo.dart', + contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/BottomNavigationBarItem-class.html', ); } diff --git a/lib/widgets/components/Navigation/customDemo.dart b/lib/widgets/components/Navigation/customDemo.dart deleted file mode 100644 index e584df3b..00000000 --- a/lib/widgets/components/Navigation/customDemo.dart +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Created with Android Studio. - * User: 一晟 - * Date: 2018/12/27 - * Time: 下午10:12 - * email: zhu.yan@alibaba-inc.com - * tartget: FlatButton 的示例 - */ -import '../../../common/widget-demo.dart'; -import 'package:flutter/material.dart'; - -class CustomDemo extends WidgetDemo { - - final Widget child; - final String docUrl; - final String title; - final String codeUrl; - final Widget bottomNaviBar; - CustomDemo( - {Key key, - @required this.title, - @required this.child, - @required this.codeUrl, - @required this.docUrl, - this.bottomNaviBar - }) - : super(key: key); - - @override - Widget build(BuildContext context,[bottomNavigationBar]) { - print('bottomNavigationBar:${bottomNaviBar}'); - final factory = super.build(context,bottomNaviBar); - return factory; - } -} \ No newline at end of file diff --git a/lib/widgets/elements/Form/Button/DropdownButton/index.dart b/lib/widgets/elements/Form/Button/DropdownButton/index.dart index 24fc4ce9..8bc852b0 100644 --- a/lib/widgets/elements/Form/Button/DropdownButton/index.dart +++ b/lib/widgets/elements/Form/Button/DropdownButton/index.dart @@ -7,9 +7,7 @@ * target: DropdownButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/DropdownButton-class.html */ -import '../../../../../common/widget-demo.dart'; -import '../../../../../routers/application.dart'; -import 'dart:math'; +import '../../../../../common/widget_demo.dart'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -51,8 +49,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'DropdownButton', - codeUrl: '${Application.github['widgetsURL']}elements/Form/Button/DropdownButton/demo.dart', - child: allDropdownButtons(context,this), + codeUrl: 'elements/Form/Button/DropdownButton/demo.dart', + contentList: [allDropdownButtons(context,this)], docUrl: 'https://docs.flutter.io/flutter/material/DropdownButton-class.html', ); } diff --git a/lib/widgets/elements/Form/Button/FlatButton/index.dart b/lib/widgets/elements/Form/Button/FlatButton/index.dart index adbb3b5b..e5f4f1c7 100644 --- a/lib/widgets/elements/Form/Button/FlatButton/index.dart +++ b/lib/widgets/elements/Form/Button/FlatButton/index.dart @@ -7,9 +7,7 @@ * target: FlatButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/FlatButton-class.html */ -import '../../../../../common/widget-demo.dart'; -import '../../../../../routers/application.dart'; -import 'dart:math'; +import '../../../../../common/widget_demo.dart'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -83,8 +81,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'FlatButton', - codeUrl: '${Application.github['widgetsURL']}elements/Form/Button/FlatButton/demo.dart', - child: allFlatButtons(context), + codeUrl: 'elements/Form/Button/FlatButton/demo.dart', + contentList: [allFlatButtons(context)], docUrl: 'https://docs.flutter.io/flutter/material/FlatButton-class.html', ); } diff --git a/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart b/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart index 6afa2f11..0c921769 100644 --- a/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart +++ b/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart @@ -7,8 +7,7 @@ * target: FloatingActionButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/FloatingActionButton-class.html */ -import '../../../../../common/widget-demo.dart'; -import '../../../../../routers/application.dart'; +import '../../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -62,9 +61,8 @@ class _DemoState extends State { return WidgetDemo( title: 'FloatingActionButton', // desc: _floatingActionTitle, - codeUrl: '${Application.github['widgetsURL']}elements/Form/Button/FloatingActionButton/demo.dart', - child: allFloatingActionButtons(context,this), - //child: Text('123'), + codeUrl: 'elements/Form/Button/FloatingActionButton/demo.dart', + contentList: [allFloatingActionButtons(context,this)], docUrl: 'https://docs.flutter.io/flutter/material/FloatingActionButton-class.html', ); } diff --git a/lib/widgets/elements/Form/Button/IconButton/index.dart b/lib/widgets/elements/Form/Button/IconButton/index.dart index 19ffdd5d..ad00008b 100644 --- a/lib/widgets/elements/Form/Button/IconButton/index.dart +++ b/lib/widgets/elements/Form/Button/IconButton/index.dart @@ -7,8 +7,7 @@ * target: IconButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/IconButton-class.html */ -import '../../../../../common/widget-demo.dart'; -import '../../../../../routers/application.dart'; +import '../../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -54,8 +53,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'IconButton', - codeUrl: '${Application.github['widgetsURL']}elements/Form/Button/IconButton/demo.dart', - child: allIconButtons(context,this), + codeUrl: 'elements/Form/Button/IconButton/demo.dart', + contentList: [ allIconButtons(context,this)], docUrl: 'https://docs.flutter.io/flutter/material/IconButton-class.html', ); } diff --git a/lib/widgets/elements/Form/Button/OutlineButton/index.dart b/lib/widgets/elements/Form/Button/OutlineButton/index.dart index e44cd71b..5d23c6b1 100644 --- a/lib/widgets/elements/Form/Button/OutlineButton/index.dart +++ b/lib/widgets/elements/Form/Button/OutlineButton/index.dart @@ -7,8 +7,7 @@ * target: OutlineButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/OutlineButton-class.html */ -import '../../../../../common/widget-demo.dart'; -import '../../../../../routers/application.dart'; +import '../../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -63,8 +62,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'OutlineButton', - codeUrl: '${Application.github['widgetsURL']}elements/Form/Button/OutlineButton/demo.dart', - child: allOutlineButtons(context,this), + codeUrl: 'elements/Form/Button/OutlineButton/demo.dart', + contentList: [allOutlineButtons(context,this)], docUrl: 'https://docs.flutter.io/flutter/material/OutlineButton-class.html', ); } diff --git a/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart b/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart index 719acf4e..d65e2633 100644 --- a/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart +++ b/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart @@ -8,8 +8,7 @@ * 对应文档地址:https://docs.flutter.io/flutter/material/PopupMenuButton-class.html */ -import '../../../../../common/widget-demo.dart'; -import '../../../../../routers/application.dart'; +import '../../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; @@ -55,8 +54,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'PopupMenuButton', - codeUrl: '${Application.github['widgetsURL']}elements/Form/Button/RaisedButton/demo.dart', - child: allPopupMenuButton(widget,this), + codeUrl: 'elements/Form/Button/RaisedButton/demo.dart', + contentList: [allPopupMenuButton(widget,this)], docUrl: 'https://docs.flutter.io/flutter/material/PopupMenuButton-class.html', ); } diff --git a/lib/widgets/elements/Form/Button/RaisedButton/index.dart b/lib/widgets/elements/Form/Button/RaisedButton/index.dart index 465ad90b..d29797ef 100644 --- a/lib/widgets/elements/Form/Button/RaisedButton/index.dart +++ b/lib/widgets/elements/Form/Button/RaisedButton/index.dart @@ -7,8 +7,7 @@ * target: RaisedButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/RaisedButton-class.html */ -import '../../../../../common/widget-demo.dart'; -import '../../../../../routers/application.dart'; +import '../../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -63,8 +62,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'RaisedButton', - codeUrl: '${Application.github['widgetsURL']}elements/Form/Button/RaisedButton/demo.dart', - child: allRaisedButtons(context,this), + codeUrl: 'elements/Form/Button/RaisedButton/demo.dart', + contentList: [allRaisedButtons(context,this)], docUrl: 'https://docs.flutter.io/flutter/material/RaisedButton-class.html', ); } diff --git a/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart b/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart index 818aeccc..982675e9 100644 --- a/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart +++ b/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart @@ -7,8 +7,7 @@ * target: RawMaterialButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/RawMaterialButton-class.html */ -import '../../../../../common/widget-demo.dart'; -import '../../../../../routers/application.dart'; +import '../../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -52,8 +51,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'RawMaterialButton', - codeUrl: '${Application.github['widgetsURL']}elements/Form/Button/RawMaterialButton/demo.dart', - child: allRawMaterialButtons(context,this), + codeUrl: 'elements/Form/Button/RawMaterialButton/demo.dart', + contentList: [allRawMaterialButtons(context,this)], docUrl: 'https://docs.flutter.io/flutter/material/RawMaterialButton-class.html', ); } diff --git a/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart b/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart index 489225d2..2e94bb8d 100644 --- a/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart +++ b/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart @@ -10,7 +10,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 +* Checkbox 默认的实例 * index 当前checkbox 的索引值 * */ class CheckboxDefault extends StatefulWidget{ @@ -39,7 +39,7 @@ class _CheckboxDefault extends State { } /* -* Checkbox 默认按钮的实例 +* Checkbox 默认的实例 * index 当前checkbox 的索引值 * */ class CheckboxSelect extends StatelessWidget { diff --git a/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart b/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart index 7410ce50..00f4d369 100644 --- a/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart +++ b/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart @@ -7,8 +7,7 @@ * target: Checkbox 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/Checkbox-class.html */ -import '../../../../../common/widget-demo.dart'; -import '../../../../../routers/application.dart'; +import '../../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -48,8 +47,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'Checkbox', - codeUrl: '${Application.github['widgetsURL']}elements/Form/Checkbox/Checkbox/demo.dart', - child: allCheckboxs(context,this), + codeUrl: 'elements/Form/Checkbox/Checkbox/demo.dart', + contentList: [allCheckboxs(context,this)], docUrl: 'https://docs.flutter.io/flutter/material/Checkbox-class.html', ); } diff --git a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/demo.dart b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/demo.dart index 5af9a5d3..eba60a7e 100644 --- a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/demo.dart +++ b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/demo.dart @@ -11,7 +11,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; /* -* Checkbox 默认按钮的实例 +* Checkbox 默认的实例 * index 当前checkbox 的索引值 * */ class CheckboxListTileStateDefault extends StatefulWidget { diff --git a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart index 87a801b4..3f6261bd 100644 --- a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart +++ b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart @@ -6,8 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: CheckboxListTile 的示例 */ -import '../../../../../common/widget-demo.dart'; -import '../../../../../routers/application.dart'; +import '../../../../../common/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; @@ -49,8 +48,8 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'CheckboxListTile', - codeUrl: '${Application.github['widgetsURL']}elements/Form/Checkbox/CheckboxListTile/demo.dart', - child: allCheckboxs(context, this), + codeUrl: 'elements/Form/Checkbox/CheckboxListTile/demo.dart', + contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/CheckboxListTile-class.html', ); } diff --git a/lib/widgets/elements/Form/Text/RichText/index.dart b/lib/widgets/elements/Form/Text/RichText/index.dart index 43811bc9..6b3c9f98 100644 --- a/lib/widgets/elements/Form/Text/RichText/index.dart +++ b/lib/widgets/elements/Form/Text/RichText/index.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; -import '../../../../../common/widget-demo.dart'; +import '../../../../../common/widget_demo.dart'; const String intro = """ # 富文本显示 @@ -67,7 +67,7 @@ class _Demo extends State { title: 'Rich Text', docUrl: 'https://docs.flutter.io/flutter/widgets/RichText-class.html', codeUrl: '', - child: new Column( + contentList: [new Column( children: [ MarkdownBody(data: markDesc['intro']), Container( @@ -87,6 +87,6 @@ class _Demo extends State { MarkdownBody(data: markDesc['diff']), ], ), - ); + ]); } } diff --git a/lib/widgets/elements/Form/Text/Text/index.dart b/lib/widgets/elements/Form/Text/Text/index.dart index 95c15584..9cfc92f5 100644 --- a/lib/widgets/elements/Form/Text/Text/index.dart +++ b/lib/widgets/elements/Form/Text/Text/index.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; //import 'package:flutter_markdown/flutter_markdown.dart'; -import '../../../../../common/widget-demo.dart'; +import '../../../../../common/widget_demo.dart'; import '../../../../../components/markdown.dart'; const String intro = """ @@ -79,7 +79,7 @@ class _Demo extends State { title: "Text", docUrl: 'flutter/widgets/Text-class.html', codeUrl: 'elements/Form/Text/Text/index.dart', - child: new Column( + contentList: [new Column( children: [ MarkdownBody(markDesc['intro']), Text( @@ -110,7 +110,7 @@ class _Demo extends State { ), ) ], - ) + )] ); } } diff --git a/lib/widgets/elements/Frame/Axis/crossAxis/index.dart b/lib/widgets/elements/Frame/Axis/crossAxis/index.dart index 55dd8402..6ed7d70c 100644 --- a/lib/widgets/elements/Frame/Axis/crossAxis/index.dart +++ b/lib/widgets/elements/Frame/Axis/crossAxis/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget-demo.dart'; +import '../../../../../common/widget_demo.dart'; class Demo extends StatefulWidget { static const String routeName = '/element/Frame/Axis/crossAxis'; diff --git a/lib/widgets/elements/Frame/Axis/flipAxis/index.dart b/lib/widgets/elements/Frame/Axis/flipAxis/index.dart index 78d2fa8d..c5d00594 100644 --- a/lib/widgets/elements/Frame/Axis/flipAxis/index.dart +++ b/lib/widgets/elements/Frame/Axis/flipAxis/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget-demo.dart'; +import '../../../../../common/widget_demo.dart'; class Demo extends StatefulWidget { static const String routeName = '/element/Frame/Axis/flipAxis'; diff --git a/lib/widgets/elements/Frame/Axis/mainAxis/index.dart b/lib/widgets/elements/Frame/Axis/mainAxis/index.dart index a957f28c..9540c54e 100644 --- a/lib/widgets/elements/Frame/Axis/mainAxis/index.dart +++ b/lib/widgets/elements/Frame/Axis/mainAxis/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget-demo.dart'; +import '../../../../../common/widget_demo.dart'; class Demo extends StatefulWidget { static const String routeName = '/element/Frame/Axis/Table'; diff --git a/lib/widgets/elements/Media/Image/precacheImage/index.dart b/lib/widgets/elements/Media/Image/precacheImage/index.dart index 814decb7..d315f08c 100644 --- a/lib/widgets/elements/Media/Image/precacheImage/index.dart +++ b/lib/widgets/elements/Media/Image/precacheImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-11-16 15:09:12 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget-demo.dart'; +import '../../../../../common/widget_demo.dart'; class Demo extends StatefulWidget { static const String routeName = '/element/Media/Image/precacheImage';