From 12544b0d445d9315d7679656d551e099be82cf21 Mon Sep 17 00:00:00 2001 From: "sanfan.hx" Date: Sat, 26 Jan 2019 11:51:18 +0800 Subject: [PATCH 01/20] refactor(update Text & RichText demos and fixed the analysis warnings): --- .../elements/Form/Text/RichText/index.dart | 54 +++------- lib/widgets/elements/Form/Text/Text/demo.dart | 24 +++++ .../elements/Form/Text/Text/index.dart | 102 +++--------------- .../Cupertino/CupertinoColors/demo.dart | 4 +- .../CupertinoNavigationBar/demo.dart | 1 - .../Cupertino/CupertinoSlider/index.dart | 1 - .../CupertinoSliverNavigationBar/index.dart | 1 - .../Cupertino/CupertinoSwitch/index.dart | 1 - .../Cupertino/CupertinoTabBar/index.dart | 1 - .../Cupertino/CupertinoTabScaffold/index.dart | 1 - .../Cupertino/CupertinoTabView/index.dart | 1 - .../Cupertino/CupertinoTimerPicker/index.dart | 1 - 12 files changed, 59 insertions(+), 133 deletions(-) create mode 100644 lib/widgets/elements/Form/Text/Text/demo.dart diff --git a/lib/widgets/elements/Form/Text/RichText/index.dart b/lib/widgets/elements/Form/Text/RichText/index.dart index 1e8895fd..23fe2b8d 100644 --- a/lib/widgets/elements/Form/Text/RichText/index.dart +++ b/lib/widgets/elements/Form/Text/RichText/index.dart @@ -1,36 +1,16 @@ import 'package:flutter/material.dart'; -import 'package:flutter_markdown/flutter_markdown.dart'; import '../../../../../common/widget_demo.dart'; import 'demo.dart'; const String intro = """ -# 富文本显示 +### **简介** + +> 具有复杂样式的文本显示组件 在富文本使用多个不同风格的widget显示文本。要显示的文本使用TextSpan对象树来描述，每个对象都有一个用于该子树的关联样式。文本可能会跨越多行，也可能全部显示在同一行上，具体取决于布局约束。 -# 示例代码 - -``` -RichText( - text: TextSpan( - text: 'Hello ', - style: DefaultTextStyle.of(context).style, - children: [ - TextSpan(text: 'bold', style: TextStyle(fontWeight: FontWeight.bold)), - TextSpan(text: ' world!'), - ], - ), -) -``` - -# 示例示例 - -"""; -const String diff = """ -# RichText 与 Text.rich 对比 - 无论是Text或者Text.rich, 查看源代码发现. 都是由RichText构建出来 -## 源码展示 +RichText的源码展示 ``` // Text 源码 @@ -49,12 +29,14 @@ const String diff = """ return result; } ``` -待补充... +### **基本实例** + """; -const Map markDesc = { - 'intro': intro, - 'diff': diff -}; +const String diff = """ + + +"""; + class Demo extends StatefulWidget { static const String routeName = '/element/Form/Text/RichText'; _Demo createState() => _Demo(); @@ -66,14 +48,10 @@ class _Demo extends State { return WidgetDemo( title: 'Rich Text', docUrl: 'https://docs.flutter.io/flutter/widgets/RichText-class.html', - codeUrl: '', - contentList: [new Column( - children: [ - MarkdownBody(data: markDesc['intro']), - RichTextDemo(), - MarkdownBody(data: markDesc['diff']), - ], - ), - ]); + codeUrl: 'elements/Form/Text/RichText/index.dart', + contentList: [ + intro, + RichTextDemo(), + ]); } } diff --git a/lib/widgets/elements/Form/Text/Text/demo.dart b/lib/widgets/elements/Form/Text/Text/demo.dart new file mode 100644 index 00000000..8d19f74d --- /dev/null +++ b/lib/widgets/elements/Form/Text/Text/demo.dart @@ -0,0 +1,24 @@ +/** + * Created with Android Studio. + * User: 三帆 + * Date: 20/01/2019 + * Time: 22:28 + * email: sanfan.hx@alibaba-inc.com + * tartget: CupertinoTabBar + */ + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class TextDemo extends StatefulWidget { + _Demo createState() => _Demo(); +} + +class _Demo extends State { + int index = 0; + Duration timer = new Duration(minutes: 50); + + Widget build(BuildContext context) { + return Text("i'm a text"); + } +} \ No newline at end of file diff --git a/lib/widgets/elements/Form/Text/Text/index.dart b/lib/widgets/elements/Form/Text/Text/index.dart index 9cfc92f5..3f9edb77 100644 --- a/lib/widgets/elements/Form/Text/Text/index.dart +++ b/lib/widgets/elements/Form/Text/Text/index.dart @@ -1,70 +1,30 @@ import 'package:flutter/material.dart'; -//import 'package:flutter_markdown/flutter_markdown.dart'; import '../../../../../common/widget_demo.dart'; -import '../../../../../components/markdown.dart'; +import 'demo.dart'; const String intro = """ -# 说明 +### **简介** > 具有某个单一样式的文本显示的widget组件, 显示支持一行或者多行. 默认样式会继承层级最为接近的 *DefaultStyle* 当然, 你也可以重新他的样式 将 *DefaultStyle.inherit 设置为 false* -# 示例代码 +是最基本的文本显示组件 -``` dart -Text( - 'Hello, World ! How are you?', - textAlign: TextAlign.center, - overflow: TextOverflow.ellipsis, - style: TextStyle(fontWeight: FontWeight.bold), -) -``` +### **基本用法** +在这里介绍一下他的基本属性说明. -# 示例显示 +- data Text显示的文本，必填参数 String +- textAlign 文本的对齐方式,可以选择左对齐、右对齐还是居中对齐 TextAlign +- maxLines 文本显示的最大行数 int +- overflow 文本显示的截断方式 TextOverflow +- textScaleFactor 文本的缩放比例 double +- style 用于指定文本显示的样式如颜色、字体、粗细、背景等 +### **基本示例** + """; -const String leftDesc = """ -# 示例代码 - - -``` dart -// 左侧布局示例 -Text( - "Hello, World! I'm start from left?", - textAlign: TextAlign.left, - overflow: TextOverflow.ellipsis, - style: TextStyle(fontWeight: FontWeight.bold, inherit: true), -), -``` -# 示例显示 -"""; - -const String RichDesc = """ - -# 复杂文本显示 - -使用 Text.rich 构造函数，Text 组件可以显示具有不同样式的 TextSpan 段落。下面的示例显示每个单词具有不同样式的“Hello beautiful world”。 - -``` -Text.rich( - TextSpan( - text: 'Hello', // default text style - children: [ - TextSpan(text: ' beautiful ', style: TextStyle(fontStyle: FontStyle.italic)), - TextSpan(text: 'world', style: TextStyle(fontWeight: FontWeight.bold)), - ], - ), -) -``` -"""; - -const Map markDesc = { - "intro": intro, - "left": leftDesc, - "rich": RichDesc -}; class Demo extends StatefulWidget { static const String routeName = '/element/Form/Text/Text'; _Demo createState() => _Demo(); @@ -79,38 +39,10 @@ class _Demo extends State { title: "Text", docUrl: 'flutter/widgets/Text-class.html', codeUrl: 'elements/Form/Text/Text/index.dart', - contentList: [new Column( - children: [ - MarkdownBody(markDesc['intro']), - Text( - 'Hello, World! How are you?', - textAlign: TextAlign.center, - overflow: TextOverflow.ellipsis, - style: TextStyle(fontWeight: FontWeight.bold), - ), - MarkdownBody(markDesc['left']), - Container( - width: 750.0, - color: Color(0xFF0096ef), - child: Text( - "Hello, World! I'm start from left?", - textAlign: TextAlign.left, - overflow: TextOverflow.ellipsis, - style: TextStyle(color: Color(0xffffffff)), - ), - ), - MarkdownBody( markDesc['rich']), - Text.rich( - TextSpan( - text: 'Hello', // default text style - children: [ - TextSpan(text: ' beautiful ', style: TextStyle(fontStyle: FontStyle.italic)), - TextSpan(text: 'world', style: TextStyle(fontWeight: FontWeight.bold)), - ], - ), - ) - ], - )] + contentList: [ + intro, + TextDemo(), + ] ); } } diff --git a/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart b/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart index b6bbacb4..04e73dec 100644 --- a/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart +++ b/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart @@ -26,12 +26,12 @@ class CupertinoColorsFullDefault extends StatefulWidget { * */ class _CupertinoColorsFullDefault extends State { - Widget setColorsView(Cupertino_colors){ + Widget setColorsView(cupertinoColors){ return Container( width: MediaQuery.of(context).size.width-100, padding: const EdgeInsets.all(10.0), child:Text('activeBlue',style:TextStyle(color:Colors.white)), - decoration:BoxDecoration(color: Cupertino_colors) + decoration:BoxDecoration(color: cupertinoColors) ); } @override diff --git a/lib/widgets/themes/Cupertino/CupertinoNavigationBar/demo.dart b/lib/widgets/themes/Cupertino/CupertinoNavigationBar/demo.dart index beca7a45..b3cd27c9 100644 --- a/lib/widgets/themes/Cupertino/CupertinoNavigationBar/demo.dart +++ b/lib/widgets/themes/Cupertino/CupertinoNavigationBar/demo.dart @@ -25,7 +25,6 @@ class CupertinoNavigationBarFullDefault extends StatefulWidget { * */ class _CupertinoNavigationBarFullDefault extends State { - @override Widget build2(BuildContext context) { return SizedBox( height: MediaQuery.of(context).size.height, diff --git a/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart b/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart index 5895d1d1..55489213 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_go/common/widget_demo.dart'; -import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart index 235db1c3..610eb1fd 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_go/common/widget_demo.dart'; -import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart b/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart index 4b524b3a..2ac6ea35 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_go/common/widget_demo.dart'; -import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart index 0d61ab78..2bdba82f 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_go/common/widget_demo.dart'; -import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart index bd44d4ce..433f8e6c 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_go/common/widget_demo.dart'; -import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart index 542c5502..a3d447ce 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_go/common/widget_demo.dart'; -import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart b/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart index 228bac9a..f641f43d 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_go/common/widget_demo.dart'; -import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** From 2cf2dba8ec734a910b221a9024a7d078b7c5f376 Mon Sep 17 00:00:00 2001 From: "sanfan.hx" Date: Tue, 29 Jan 2019 15:21:03 +0800 Subject: [PATCH 02/20] fix(solve conflict): --- lib/widgets/elements/Form/Text/RichText/index.dart | 5 +---- lib/widgets/elements/Form/Text/Text/index.dart | 7 +------ lib/widgets/themes/Cupertino/CupertinoColors/demo.dart | 8 -------- lib/widgets/themes/Cupertino/CupertinoSlider/index.dart | 5 +---- .../Cupertino/CupertinoSliverNavigationBar/index.dart | 4 ---- lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart | 5 +---- lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart | 5 +---- .../themes/Cupertino/CupertinoTabScaffold/index.dart | 5 +---- lib/widgets/themes/Cupertino/CupertinoTabView/index.dart | 4 ---- .../themes/Cupertino/CupertinoTimerPicker/index.dart | 6 ++---- 10 files changed, 8 insertions(+), 46 deletions(-) diff --git a/lib/widgets/elements/Form/Text/RichText/index.dart b/lib/widgets/elements/Form/Text/RichText/index.dart index d74bef29..2ec4aefd 100644 --- a/lib/widgets/elements/Form/Text/RichText/index.dart +++ b/lib/widgets/elements/Form/Text/RichText/index.dart @@ -1,10 +1,7 @@ import 'package:flutter/material.dart'; -<<<<<<< HEAD -import '../../../../../common/widget_demo.dart'; -======= + import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_go/components/widget_demo.dart'; ->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const String intro = """ ### **简介** diff --git a/lib/widgets/elements/Form/Text/Text/index.dart b/lib/widgets/elements/Form/Text/Text/index.dart index 774df12d..68bbdec3 100644 --- a/lib/widgets/elements/Form/Text/Text/index.dart +++ b/lib/widgets/elements/Form/Text/Text/index.dart @@ -1,12 +1,7 @@ import 'package:flutter/material.dart'; -<<<<<<< HEAD -import '../../../../../common/widget_demo.dart'; -import 'demo.dart'; -======= -//import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_go/components/widget_demo.dart'; import '../../../../../components/markdown.dart'; ->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa +import 'demo.dart'; const String intro = """ ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart b/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart index 8ed9822e..1c5e8d26 100644 --- a/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart +++ b/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart @@ -26,19 +26,11 @@ class CupertinoColorsFullDefault extends StatefulWidget { * */ class _CupertinoColorsFullDefault extends State { -<<<<<<< HEAD - Widget setColorsView(cupertinoColors){ - return Container( - width: MediaQuery.of(context).size.width-100, - padding: const EdgeInsets.all(10.0), - child:Text('activeBlue',style:TextStyle(color:Colors.white)), -======= Widget setColorsView(cupertinoColors,String colorName){ return Container( width: MediaQuery.of(context).size.width-100, padding: const EdgeInsets.all(10.0), child:Text(colorName,style:TextStyle(color:Colors.white)), ->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa decoration:BoxDecoration(color: cupertinoColors) ); } diff --git a/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart b/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart index 84794ac4..a3b73bd0 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart @@ -1,9 +1,6 @@ import 'package:flutter/material.dart'; -<<<<<<< HEAD -import 'package:flutter_go/common/widget_demo.dart'; -======= + import 'package:flutter_go/components/widget_demo.dart'; ->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart index d3b4d9dc..6b48e1c5 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart @@ -1,9 +1,5 @@ import 'package:flutter/material.dart'; -<<<<<<< HEAD -import 'package:flutter_go/common/widget_demo.dart'; -======= import 'package:flutter_go/components/widget_demo.dart'; ->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart b/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart index 911457a0..b86d294a 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart @@ -1,9 +1,6 @@ import 'package:flutter/material.dart'; -<<<<<<< HEAD -import 'package:flutter_go/common/widget_demo.dart'; -======= import 'package:flutter_go/components/widget_demo.dart'; ->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa + import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart index 511a5a09..ee63deea 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart @@ -1,9 +1,6 @@ import 'package:flutter/material.dart'; -<<<<<<< HEAD -import 'package:flutter_go/common/widget_demo.dart'; -======= import 'package:flutter_go/components/widget_demo.dart'; ->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa + import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart index b58ecf66..5dcd85e9 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart @@ -1,9 +1,6 @@ import 'package:flutter/material.dart'; -<<<<<<< HEAD -import 'package:flutter_go/common/widget_demo.dart'; -======= import 'package:flutter_go/components/widget_demo.dart'; ->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa + import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart index 3793299b..5cdb8516 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart @@ -1,9 +1,5 @@ import 'package:flutter/material.dart'; -<<<<<<< HEAD -import 'package:flutter_go/common/widget_demo.dart'; -======= import 'package:flutter_go/components/widget_demo.dart'; ->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart b/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart index 0c19f2f6..6c882cfa 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; -<<<<<<< HEAD -import 'package:flutter_go/common/widget_demo.dart'; -======= + import 'package:flutter_go/components/widget_demo.dart'; ->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa + import 'demo.dart'; const Text0 = ''' ### **简介** From 85f491c9ca588334022611e943b4573defc0ac71 Mon Sep 17 00:00:00 2001 From: "sanfan.hx" Date: Tue, 29 Jan 2019 15:31:21 +0800 Subject: [PATCH 03/20] refactor(update: version & fiexed warns): --- lib/widgets/elements/Form/Text/RichText/index.dart | 1 - lib/widgets/elements/Form/Text/Text/index.dart | 1 - pubspec.yaml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/widgets/elements/Form/Text/RichText/index.dart b/lib/widgets/elements/Form/Text/RichText/index.dart index 2ec4aefd..2e90f269 100644 --- a/lib/widgets/elements/Form/Text/RichText/index.dart +++ b/lib/widgets/elements/Form/Text/RichText/index.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String intro = """ diff --git a/lib/widgets/elements/Form/Text/Text/index.dart b/lib/widgets/elements/Form/Text/Text/index.dart index 68bbdec3..d51aa94c 100644 --- a/lib/widgets/elements/Form/Text/Text/index.dart +++ b/lib/widgets/elements/Form/Text/Text/index.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_go/components/widget_demo.dart'; -import '../../../../../components/markdown.dart'; import 'demo.dart'; const String intro = """ diff --git a/pubspec.yaml b/pubspec.yaml index 55e3b622..8c5619c0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ description: flutter_go # Both the version and the builder number may be overridden in flutter # build by specifying --build-name and --build-number, respectively. # Read more about versioning at semver.org. -version: 0.0.4 +version: 0.0.5 environment: sdk: ">=2.0.0-dev.68.0 <3.0.0" From f88d10526ee165f72ff959817ecd81a3eccfcca7 Mon Sep 17 00:00:00 2001 From: hanxu317317 Date: Tue, 29 Jan 2019 15:43:57 +0800 Subject: [PATCH 04/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd82b0eb..c2e08a9e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en. android下载地址: - + iphone下载地址: 暂无 From eb1842a08257d2503d60d9e5f83cec96fd4f0c62 Mon Sep 17 00:00:00 2001 From: hanxu317317 Date: Tue, 29 Jan 2019 15:50:22 +0800 Subject: [PATCH 05/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd82b0eb..fe09e8c9 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ flutter优点主要包括： ### app 预览 - + ### Core Team From d7114b149d9944f8d30752a51da865e9ee38a22a Mon Sep 17 00:00:00 2001 From: "yifeng.yl" Date: Tue, 29 Jan 2019 16:39:24 +0800 Subject: [PATCH 06/20] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Flutter_Go 代码开发规范.md | 679 +++++++++++++++++++++++++++++++ lib/views/first_page/home.dart | 2 +- 2 files changed, 680 insertions(+), 1 deletion(-) create mode 100644 Flutter_Go 代码开发规范.md diff --git a/Flutter_Go 代码开发规范.md b/Flutter_Go 代码开发规范.md new file mode 100644 index 00000000..6a152ae3 --- /dev/null +++ b/Flutter_Go 代码开发规范.md @@ -0,0 +1,679 @@ +# Flutter_Go 代码开发规范 + +## 代码风格 + +### 标识符三种类型 + +#### 大驼峰 +类、枚举、typedef和类型参数 + +``` + class SliderMenu { ... } + + class HttpRequest { ... } + + typedef Predicate = bool Function(T value); +``` + +包括用于元数据注释的类 + +``` + class Foo { + const Foo([arg]); + } + + @Foo(anArg) + class A { ... } + + @Foo() + class B { ... } +``` + +#### 使用小写加下划线来命名库和源文件 + +``` + library peg_parser.source_scanner; + + import 'file_system.dart'; + import 'slider_menu.dart'; +``` + +不推荐如下写法： + +``` + library pegparser.SourceScanner; + + import 'file-system.dart'; + import 'SliderMenu.dart'; +``` + + +#### 使用小写加下划线来命名导入前缀 + +``` + import 'dart:math' as math; + import 'package:angular_components/angular_components' + as angular_components; + import 'package:js/js.dart' as js; +``` + +不推荐如下写法： + +``` + import 'dart:math' as Math; + import 'package:angular_components/angular_components' + as angularComponents; + import 'package:js/js.dart' as JS; +``` + +#### 使用小驼峰法命名其他标识符 + +``` + var item; + + HttpRequest httpRequest; + + void align(bool clearItems) { + // ... + } +``` + +#### 优先使用小驼峰法作为常量命名 + +``` + const pi = 3.14; + const defaultTimeout = 1000; + final urlScheme = RegExp('^([a-z]+):'); + + class Dice { + static final numberGenerator = Random(); + } +``` + +不推荐如下写法： + +``` + const PI = 3.14; + const DefaultTimeout = 1000; + final URL_SCHEME = RegExp('^([a-z]+):'); + + class Dice { + static final NUMBER_GENERATOR = Random(); + } +``` + +#### 不使用前缀字母 +因为Dart可以告诉您声明的类型、范围、可变性和其他属性，所以没有理由将这些属性编码为标识符名称。 + +``` + defaultTimeout +``` + +不推荐如下写法： + +``` + kDefaultTimeout +``` + +### 排序 + +为了使你的文件前言保持整洁，我们有规定的命令，指示应该出现在其中。每个“部分”应该用空行分隔。 + +#### 在其他引入之前引入所需的dart库 + +``` + import 'dart:async'; + import 'dart:html'; + + import 'package:bar/bar.dart'; + import 'package:foo/foo.dart'; +``` + +#### 在相对引入之前先引入在包中的库 + +``` + import 'package:bar/bar.dart'; + import 'package:foo/foo.dart'; + + import 'util.dart'; +``` + +#### 第三方包的导入先于其他包 + +``` + import 'package:bar/bar.dart'; + import 'package:foo/foo.dart'; + + import 'package:my_package/util.dart'; +``` + +#### 在所有导入之后，在单独的部分中指定导出 + +``` + import 'src/error.dart'; + import 'src/foo_bar.dart'; + + export 'src/error.dart'; +``` + +不推荐如下写法： + +``` + import 'src/error.dart'; + export 'src/error.dart'; + import 'src/foo_bar.dart'; +``` + + +### 所有流控制结构，请使用大括号 + +这样做可以避免悬浮的else问题 + +``` + if (isWeekDay) { + print('Bike to work!'); + } else { + print('Go dancing or read a book!'); + } +``` + +#### 例外 +一个if语句没有else子句，其中整个if语句和then主体都适合一行。在这种情况下，如果你喜欢的话，你可以去掉大括号 + +``` + if (arg == null) return defaultValue; +``` + +如果流程体超出了一行需要分划请使用大括号： + +``` + if (overflowChars != other.overflowChars) { + return overflowChars < other.overflowChars; + } +``` + +不推荐如下写法： + +``` + if (overflowChars != other.overflowChars) + return overflowChars < other.overflowChars; +``` + +## 注释 + +### 要像句子一样格式化 +除非是区分大小写的标识符，否则第一个单词要大写。以句号结尾(或“!”或“?”)。对于所有的注释都是如此：doc注释、内联内容，甚至TODOs。即使是一个句子片段。 + +``` + greet(name) { + // Assume we have a valid name. + print('Hi, $name!'); + } +``` + +不推荐如下写法： + +``` + greet(name) { + /* Assume we have a valid name. */ + print('Hi, $name!'); + } +``` + +可以使用块注释(/…/)临时注释掉一段代码，但是所有其他注释都应该使用// + +### Doc注释 +使用///文档注释来记录成员和类型。 + +使用doc注释而不是常规注释，可以让dartdoc找到并生成文档。 + +``` + /// The number of characters in this chunk when unsplit. + int get length => ... +``` + +> 由于历史原因，达特茅斯学院支持道格评论的两种语法:///(“C#风格”)和/**…* /(“JavaDoc风格”)。我们更喜欢/// 因为它更紧凑。/**和*/在多行文档注释中添加两个无内容的行。在某些情况下，///语法也更容易阅读，例如文档注释包含使用*标记列表项的项目符号列表。 + +### 考虑为私有api编写文档注释 + +Doc注释并不仅仅针对库的公共API的外部使用者。它们还有助于理解从库的其他部分调用的私有成员 + +#### 用一句话总结开始doc注释 + +以简短的、以用户为中心的描述开始你的文档注释，以句号结尾。 + +``` +/// Deletes the file at [path] from the file system. +void delete(String path) { + ... +} +``` + +不推荐如下写法： + +``` + /// Depending on the state of the file system and the user's permissions, + /// certain operations may or may not be possible. If there is no file at + /// [path] or it can't be accessed, this function throws either [IOError] + /// or [PermissionError], respectively. Otherwise, this deletes the file. + void delete(String path) { + ... + } +``` + +#### “doc注释”的第一句话分隔成自己的段落 + +在第一个句子之后添加一个空行，把它分成自己的段落 + +``` + /// Deletes the file at [path]. + /// + /// Throws an [IOError] if the file could not be found. Throws a + /// [PermissionError] if the file is present but could not be deleted. + void delete(String path) { + ... + } +``` + +## Flutter_Go 使用参考 + +### 库的引用 + +flutter go 中，导入lib下文件库，统一指定报名，避免过多的```../../``` +``` +package:flutter_go/ +``` + +### 字符串的使用 + +#### 使用相邻字符串连接字符串文字 +如果有两个字符串字面值(不是值，而是实际引用的字面值)，则不需要使用+连接它们。就像在C和c++中，简单地把它们放在一起就能做到。这是创建一个长字符串很好的方法但是不适用于单独一行。 + +``` +raiseAlarm( + 'ERROR: Parts of the spaceship are on fire. Other ' + 'parts are overrun by martians. Unclear which are which.'); +``` + +不推荐如下写法: + +``` +raiseAlarm('ERROR: Parts of the spaceship are on fire. Other ' + + 'parts are overrun by martians. Unclear which are which.'); +``` + +#### 优先使用模板字符串 +``` +'Hello, $name! You are ${year - birth} years old.'; +``` + +#### 在不需要的时候，避免使用花括号 + +``` + 'Hi, $name!' + "Wear your wildest $decade's outfit." +``` + +不推荐如下写法： + +``` + 'Hello, ' + name + '! You are ' + (year - birth).toString() + ' y...'; +``` + +不推荐如下写法： + +``` + 'Hi, ${name}!' + "Wear your wildest ${decade}'s outfit." +``` + +### 集合 + +#### 尽可能使用集合字面量 + +如果要创建一个不可增长的列表，或者其他一些自定义集合类型，那么无论如何，都要使用构造函数。 + +``` + var points = []; + var addresses = {}; + var lines = []; +``` + +不推荐如下写法： + +``` + var points = List(); + var addresses = Map(); +``` + +#### 不要使用.length查看集合是否为空 + +``` +if (lunchBox.isEmpty) return 'so hungry...'; +if (words.isNotEmpty) return words.join(' '); +``` + +不推荐如下写法： + +``` + if (lunchBox.length == 0) return 'so hungry...'; + if (!words.isEmpty) return words.join(' '); +``` + +#### 考虑使用高阶方法转换序列 + +如果有一个集合，并且希望从中生成一个新的修改后的集合，那么使用.map()、.where()和Iterable上的其他方便的方法通常更短，也更具有声明性 + +``` + var aquaticNames = animals + .where((animal) => animal.isAquatic) + .map((animal) => animal.name); +``` +#### 避免使用带有函数字面量的Iterable.forEach() + +在Dart中，如果你想遍历一个序列，惯用的方法是使用循环。 + +``` +for (var person in people) { + ... +} +``` + +不推荐如下写法： + +``` + people.forEach((person) { + ... + }); +``` + +#### 不要使用List.from()，除非打算更改结果的类型 + +给定一个迭代，有两种明显的方法可以生成包含相同元素的新列表 + +``` +var copy1 = iterable.toList(); +var copy2 = List.from(iterable); +``` + +明显的区别是第一个比较短。重要的区别是第一个保留了原始对象的类型参数 + +``` +// Creates a List: +var iterable = [1, 2, 3]; + +// Prints "List": +print(iterable.toList().runtimeType); +``` + +``` +// Creates a List: +var iterable = [1, 2, 3]; + +// Prints "List": +print(List.from(iterable).runtimeType); +``` + +### 参数的使用 + +#### 使用=将命名参数与其默认值分割开 + +由于遗留原因，Dart均允许“:”和“=”作为指定参数的默认值分隔符。为了与可选的位置参数保持一致，使用“=”。 + +``` + void insert(Object item, {int at = 0}) { ... } +``` + +不推荐如下写法： + +``` + void insert(Object item, {int at: 0}) { ... } +``` + +#### 不要使用显式默认值null + +如果参数是可选的，但没有给它一个默认值，则语言隐式地使用null作为默认值，因此不需要编写它 + +``` +void error([String message]) { + stderr.write(message ?? '\n'); +} +``` + +不推荐如下写法: + +``` +void error([String message = null]) { + stderr.write(message ?? '\n'); +} +``` + +### 变量 + +#### 不要显式地将变量初始化为空 +在Dart中，未显式初始化的变量或字段自动被初始化为null。不要多余赋值null + +``` + int _nextId; + + class LazyId { + int _id; + + int get id { + if (_nextId == null) _nextId = 0; + if (_id == null) _id = _nextId++; + + return _id; + } + } +``` + +不推荐如下写法： + +``` + int _nextId = null; + + class LazyId { + int _id = null; + + int get id { + if (_nextId == null) _nextId = 0; + if (_id == null) _id = _nextId++; + + return _id; + } + } +``` + +#### 避免储存你能计算的东西 + +在设计类时，您通常希望将多个视图公开到相同的底层状态。通常你会看到在构造函数中计算所有视图的代码，然后存储它们: + +应该避免的写法： + +``` + class Circle { + num radius; + num area; + num circumference; + + Circle(num radius) + : radius = radius, + area = pi * radius * radius, + circumference = pi * 2.0 * radius; + } +``` + +如上代码问题： + +- 浪费内存 +- 缓存的问题是无效——如何知道何时缓存过期需要重新计算？ + +推荐的写法如下： + +``` + class Circle { + num radius; + + Circle(this.radius); + + num get area => pi * radius * radius; + num get circumference => pi * 2.0 * radius; + } +``` + +### 类成员 + +#### 不要把不必要地将字段包装在getter和setter中 + +不推荐如下写法： + +``` + class Box { + var _contents; + get contents => _contents; + set contents(value) { + _contents = value; + } + } +``` + +#### 优先使用final字段来创建只读属性 + +尤其对于 ```StatelessWidget``` + +#### 在不需要的时候不要用this + +不推荐如下写法： + +``` + class Box { + var value; + + void clear() { + this.update(null); + } + + void update(value) { + this.value = value; + } + } +``` + +推荐如下写法： + +``` + class Box { + var value; + + void clear() { + update(null); + } + + void update(value) { + this.value = value; + } + } +``` + +### 构造函数 + +#### 尽可能使用初始化的形式 + +不推荐如下写法： + +``` + class Point { + num x, y; + Point(num x, num y) { + this.x = x; + this.y = y; + } + } +``` + +推荐如下写法： + +``` +class Point { + num x, y; + Point(this.x, this.y); +} +``` + +#### 不要使用new + +Dart2使new 关键字可选 + +推荐写法： + +``` + Widget build(BuildContext context) { + return Row( + children: [ + RaisedButton( + child: Text('Increment'), + ), + Text('Click!'), + ], + ); + } +``` + +不推荐如下写法： + +``` + Widget build(BuildContext context) { + return new Row( + children: [ + new RaisedButton( + child: new Text('Increment'), + ), + new Text('Click!'), + ], + ); + } +``` + +### 异步 + +#### 优先使用async/await代替原始的futures + +async/await语法提高了可读性，允许你在异步代码中使用所有Dart控制流结构。 + +``` + Future countActivePlayers(String teamName) async { + try { + var team = await downloadTeam(teamName); + if (team == null) return 0; + + var players = await team.roster; + return players.where((player) => player.isActive).length; + } catch (e) { + log.error(e); + return 0; + } + } +``` + +#### 当异步没有任何用处时，不要使用它 + +如果可以在不改变函数行为的情况下省略异步，那么就这样做。、 + +``` + Future afterTwoThings(Future first, Future second) { + return Future.wait([first, second]); + } +``` + +不推荐写法： + +``` + Future afterTwoThings(Future first, Future second) async { + return Future.wait([first, second]); + } +``` + + + + diff --git a/lib/views/first_page/home.dart b/lib/views/first_page/home.dart index f82b5e77..03a974af 100644 --- a/lib/views/first_page/home.dart +++ b/lib/views/first_page/home.dart @@ -17,7 +17,7 @@ import 'package:flutter_go/views/widget_page/widget_page.dart'; import 'package:flutter_go/views/welcome_page/fourth_page.dart'; import 'package:flutter_go/views/collection_page/collection_page.dart'; import 'package:flutter_go/routers/application.dart'; -import 'package:flutter_go/utils//provider.dart'; +import 'package:flutter_go/utils/provider.dart'; import 'package:flutter_go/model/widget.dart'; import 'package:flutter_go/widgets/index.dart'; import 'package:flutter_go/components/search_input.dart'; From 9ac45f2fbf50171c32e74f5c9761a2953b8a9ec8 Mon Sep 17 00:00:00 2001 From: ryan730 Date: Tue, 29 Jan 2019 16:44:40 +0800 Subject: [PATCH 07/20] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add:添加版本号 --- Flutter_Go 代码开发规范.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flutter_Go 代码开发规范.md b/Flutter_Go 代码开发规范.md index 6a152ae3..f68a3562 100644 --- a/Flutter_Go 代码开发规范.md +++ b/Flutter_Go 代码开发规范.md @@ -1,4 +1,4 @@ -# Flutter_Go 代码开发规范 +# Flutter_Go 代码开发规范 0.1.0 版 ## 代码风格 From f9f077d0d941eae5272a17bc9843c9b7f01ca544 Mon Sep 17 00:00:00 2001 From: ryan730 Date: Tue, 29 Jan 2019 19:50:25 +0800 Subject: [PATCH 08/20] =?UTF-8?q?add:=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add:版本更新历史链接 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 31bedbc7..5df22c1e 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en. > 帮助开发者快速上手 Flutter **内部测试中，1.0 正式版将于 2月 20日 发布。** +## 版本更新历史:[地址](https://github.com/alibaba/flutter-go/blob/develop/CHANGE-LOG.md) ## Release安装包下载地址 From 6471d621c2eebbdc3a662c67d216617376f416e2 Mon Sep 17 00:00:00 2001 From: ryan730 Date: Tue, 29 Jan 2019 19:51:10 +0800 Subject: [PATCH 09/20] up up --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5df22c1e..162328e9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en. > 帮助开发者快速上手 Flutter **内部测试中，1.0 正式版将于 2月 20日 发布。** -## 版本更新历史:[地址](https://github.com/alibaba/flutter-go/blob/develop/CHANGE-LOG.md) +## 版本更新历史: +[地址](https://github.com/alibaba/flutter-go/blob/develop/CHANGE-LOG.md) ## Release安装包下载地址 From 66d634ec819cf8b3a38cab5ae0efbb60a770434c Mon Sep 17 00:00:00 2001 From: ryan730 Date: Tue, 29 Jan 2019 19:51:32 +0800 Subject: [PATCH 10/20] up up --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 162328e9..901e5926 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en. > 帮助开发者快速上手 Flutter **内部测试中，1.0 正式版将于 2月 20日 发布。** -## 版本更新历史: +## 版本更新历史 [地址](https://github.com/alibaba/flutter-go/blob/develop/CHANGE-LOG.md) ## Release安装包下载地址 From dccc986697dfe307c2ba4103deae334605283299 Mon Sep 17 00:00:00 2001 From: ryan730 Date: Tue, 29 Jan 2019 20:03:18 +0800 Subject: [PATCH 11/20] =?UTF-8?q?add:=E5=BC=80=E5=8F=91=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add:开发规范 --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 901e5926..eaecd413 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,15 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en. > 帮助开发者快速上手 Flutter **内部测试中，1.0 正式版将于 2月 20日 发布。** ## 版本更新历史 +> 展示重要的提交更新内容 + [地址](https://github.com/alibaba/flutter-go/blob/develop/CHANGE-LOG.md) +## 开发规范 +> 由于类似 javascript, java, object-c,等开发者的语言习惯不同而产生歧义，我们依据官方提供的 [dart 语言规范](https://www.dartlang.org) 定制。 + +[<< FlutterGo 开发规范第一版 >>](https://github.com/alibaba/flutter-go/blob/develop/Flutter_Go%20%E4%BB%A3%E7%A0%81%E5%BC%80%E5%8F%91%E8%A7%84%E8%8C%83.md) + ## Release安装包下载地址 android下载地址: From 2afc7675117a6d768c7228165afb65b7fa6a550f Mon Sep 17 00:00:00 2001 From: ryan730 Date: Tue, 29 Jan 2019 20:06:19 +0800 Subject: [PATCH 12/20] up up --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eaecd413..20fe03db 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en. > 帮助开发者快速上手 Flutter **内部测试中，1.0 正式版将于 2月 20日 发布。** ## 版本更新历史 -> 展示重要的提交更新内容 +> 按时间顺序,展示重要的提交更新内容。 [地址](https://github.com/alibaba/flutter-go/blob/develop/CHANGE-LOG.md) @@ -50,7 +50,7 @@ flutter优点主要包括： ### app 预览 - + ### Core Team From df1ce529f6f3e6e01054c15fb935cc5891c0a572 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 29 Jan 2019 20:40:59 +0800 Subject: [PATCH 13/20] =?UTF-8?q?fix:=20=E4=B8=80=E4=BA=9B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84code=E6=BC=94=E7=A4=BA=E6=89=93=E4=B8=8D?= =?UTF-8?q?=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 一些页面的code演示打不开的问题 --- ios/Runner.xcodeproj/project.pbxproj | 4 ++++ .../components/Bar/BottomAppBar/index.dart | 2 +- .../components/Bar/SliverAppBar/index.dart | 2 +- .../components/Bar/SnackBar/index.dart | 2 +- .../components/LIst/AnimatedList/index.dart | 2 +- .../components/LIst/ListView/index.dart | 2 +- .../elements/Form/CheckBox/Checkbox/demo.dart | 4 ++-- .../Cupertino/CupertinoColors/index.dart | 2 +- .../Cupertino/CupertinoIcons/index.dart | 2 +- pubspec.yaml | 20 +++++++++++++++---- 10 files changed, 29 insertions(+), 13 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4f77e0fd..bb4e86ed 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 333E5DAE7FC10AC69FEC26C0 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA792F029EDD7A11295D192 /* libPods-Runner.a */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; }; 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; @@ -40,6 +41,7 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; }; 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -90,6 +92,7 @@ children = ( 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 2D5378251FAA1A9400D5DBA9 /* flutter_assets */, 9740EEBA1CF902C7004384FC /* Flutter.framework */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, @@ -206,6 +209,7 @@ files = ( 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); diff --git a/lib/widgets/components/Bar/BottomAppBar/index.dart b/lib/widgets/components/Bar/BottomAppBar/index.dart index 18c2d159..080c278e 100644 --- a/lib/widgets/components/Bar/BottomAppBar/index.dart +++ b/lib/widgets/components/Bar/BottomAppBar/index.dart @@ -38,7 +38,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'BottomAppBar', - codeUrl: 'componentss/Bar/BottomAppBar/demo.dart', + codeUrl: 'components/Bar/BottomAppBar/demo.dart', contentList: [allDomes(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/BottomAppBar-class.html', ); diff --git a/lib/widgets/components/Bar/SliverAppBar/index.dart b/lib/widgets/components/Bar/SliverAppBar/index.dart index 367b5216..742f6894 100644 --- a/lib/widgets/components/Bar/SliverAppBar/index.dart +++ b/lib/widgets/components/Bar/SliverAppBar/index.dart @@ -40,7 +40,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'SliverAppBar', - codeUrl: 'componentss/Bar/SliverAppBar/demo.dart', + codeUrl: 'components/Bar/SliverAppBar/demo.dart', contentList:[allDomes(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/SliverAppBar-class.html', ); diff --git a/lib/widgets/components/Bar/SnackBar/index.dart b/lib/widgets/components/Bar/SnackBar/index.dart index 2047f783..ff1d31ad 100644 --- a/lib/widgets/components/Bar/SnackBar/index.dart +++ b/lib/widgets/components/Bar/SnackBar/index.dart @@ -40,7 +40,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'SnackBar', - codeUrl: 'componentss/Bar/SnackBar/demo.dart', + codeUrl: 'components/Bar/SnackBar/demo.dart', contentList: [allDomes(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/SnackBar-class.html', ); diff --git a/lib/widgets/components/LIst/AnimatedList/index.dart b/lib/widgets/components/LIst/AnimatedList/index.dart index 2392ab46..05cae395 100644 --- a/lib/widgets/components/LIst/AnimatedList/index.dart +++ b/lib/widgets/components/LIst/AnimatedList/index.dart @@ -32,7 +32,7 @@ const String _Text1 = class Demo extends StatefulWidget { - static const String routeName = '/components//List/AnimatedList'; + static const String routeName = '/components/List/AnimatedList'; @override _DemoState createState() => _DemoState(); diff --git a/lib/widgets/components/LIst/ListView/index.dart b/lib/widgets/components/LIst/ListView/index.dart index 1bbebf52..c43ff044 100644 --- a/lib/widgets/components/LIst/ListView/index.dart +++ b/lib/widgets/components/LIst/ListView/index.dart @@ -67,7 +67,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'ListView', - codeUrl: '/componentss/List/ListView/demo.dart', + codeUrl: 'components/List/ListView/demo.dart', contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/ListView-class.html', ); diff --git a/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart b/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart index 60ebf8c8..c34d10af 100644 --- a/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart +++ b/lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart @@ -12,7 +12,7 @@ import 'package:flutter/material.dart'; /* * Checkbox 默认的实例 * index 当前checkbox 的索引值 -* */ +*/ class CheckboxDefault extends StatefulWidget{ final int index; final parent; @@ -41,7 +41,7 @@ class _CheckboxDefault extends State { /* * Checkbox 默认的实例 * index 当前checkbox 的索引值 -* */ +*/ class CheckboxSelect extends StatelessWidget { final int index; final widget; diff --git a/lib/widgets/themes/Cupertino/CupertinoColors/index.dart b/lib/widgets/themes/Cupertino/CupertinoColors/index.dart index d8f5e6ca..412619d7 100644 --- a/lib/widgets/themes/Cupertino/CupertinoColors/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoColors/index.dart @@ -36,7 +36,7 @@ class _DemoState extends State { ], title: 'CupertinoColors', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoColors-class.html', - codeUrl: '/themes/Cupertino/CupertinoColor/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoColors/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart b/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart index 93b60c1d..ef3fbf23 100644 --- a/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart @@ -38,7 +38,7 @@ class _DemoState extends State { ], title: 'CupertinoIcons', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoIcons-class.html', - codeUrl: '/themes/Cupertino/CupertinoColor/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoIcons/demo.dart' ); } } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 8c5619c0..b929ba36 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -72,9 +72,9 @@ flutter: - lib/widgets/components/Grid/GridTile/demo.dart - lib/widgets/components/Grid/GridTileBar/demo.dart - lib/widgets/components/Grid/GridView/demo.dart - - lib/widgets/components/LIst/AnimatedList/demo.dart - - lib/widgets/components/LIst/ListBody/demo.dart - - lib/widgets/components/LIst/ListView/demo.dart + - lib/widgets/components/List/AnimatedList/demo.dart + - lib/widgets/components/List/ListBody/demo.dart + - lib/widgets/components/List/ListView/demo.dart - lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart - lib/widgets/components/Menu/DropdownMenuItem/demo.dart - lib/widgets/components/Menu/PopupMenuButton/demo.dart @@ -164,12 +164,24 @@ flutter: - lib/widgets/themes/Material/MaterialColor/demo.dart - lib/widgets/themes/Material/MaterialPageRoute/demo.dart - lib/widgets/themes/Material/MergeableMaterialItem/demo.dart + - lib/widgets/themes/Cupertino/CupertinoApp/demo.dart + - lib/widgets/themes/Cupertino/CupertinoButton/demo.dart + - lib/widgets/themes/Cupertino/CupertinoColors/demo.dart + - lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart + - lib/widgets/themes/Cupertino/CupertinoNavigationBar/demo.dart + - lib/widgets/themes/Cupertino/CupertinoPageRoute/demo.dart + - lib/widgets/themes/Cupertino/CupertinoPageScaffold/demo.dart + - lib/widgets/themes/Cupertino/CupertinoPicker/demo.dart + - lib/widgets/themes/Cupertino/CupertinoPopupSurface/demo.dart - lib/widgets/themes/Cupertino/CupertinoScrollbar/demo.dart - - lib/widgets/themes/Cupertino/CupertinoSlider/demo.dart - lib/widgets/themes/Cupertino/CupertinoSegmentedControl/demo.dart + - lib/widgets/themes/Cupertino/CupertinoSlider/demo.dart + - lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/demo.dart - lib/widgets/themes/Cupertino/CupertinoSwitch/demo.dart - lib/widgets/themes/Cupertino/CupertinoTabBar/demo.dart + - lib/widgets/themes/Cupertino/CupertinoTabScaffold/demo.dart - lib/widgets/themes/Cupertino/CupertinoTabView/demo.dart + - lib/widgets/themes/Cupertino/CupertinoTimerPicker/demo.dart - assets/app.db - assets/images/ - assets/fonts/ From b4c387569fdde75a64df811817e6a1177c7c6282 Mon Sep 17 00:00:00 2001 From: ryan730 Date: Tue, 29 Jan 2019 20:44:11 +0800 Subject: [PATCH 14/20] up up --- Flutter_Go 代码开发规范.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flutter_Go 代码开发规范.md b/Flutter_Go 代码开发规范.md index f68a3562..747ea201 100644 --- a/Flutter_Go 代码开发规范.md +++ b/Flutter_Go 代码开发规范.md @@ -1,4 +1,4 @@ -# Flutter_Go 代码开发规范 0.1.0 版 +# FlutterGo 代码开发规范 0.1.0 版 ## 代码风格 From 70ede1756b5d4bf827198bf132d82f4f1cc68301 Mon Sep 17 00:00:00 2001 From: ryan730 Date: Tue, 29 Jan 2019 20:45:00 +0800 Subject: [PATCH 15/20] doc:up doc:up --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 20fe03db..6ce6df65 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en. ## 开发规范 > 由于类似 javascript, java, object-c,等开发者的语言习惯不同而产生歧义，我们依据官方提供的 [dart 语言规范](https://www.dartlang.org) 定制。 -[<< FlutterGo 开发规范第一版 >>](https://github.com/alibaba/flutter-go/blob/develop/Flutter_Go%20%E4%BB%A3%E7%A0%81%E5%BC%80%E5%8F%91%E8%A7%84%E8%8C%83.md) +[<< Flutter Go 开发规范第一版 >>](https://github.com/alibaba/flutter-go/blob/develop/Flutter_Go%20%E4%BB%A3%E7%A0%81%E5%BC%80%E5%8F%91%E8%A7%84%E8%8C%83.md) ## Release安装包下载地址 From ccae9ff82944ab018f70dcb6774ed4e71321e736 Mon Sep 17 00:00:00 2001 From: ryan730 Date: Tue, 29 Jan 2019 20:45:22 +0800 Subject: [PATCH 16/20] doc:up doc:up --- Flutter_Go 代码开发规范.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flutter_Go 代码开发规范.md b/Flutter_Go 代码开发规范.md index 747ea201..d62e8d1c 100644 --- a/Flutter_Go 代码开发规范.md +++ b/Flutter_Go 代码开发规范.md @@ -1,4 +1,4 @@ -# FlutterGo 代码开发规范 0.1.0 版 +# Flutter Go 代码开发规范 0.1.0 版 ## 代码风格 From 30c6a551a18bd693ad0e12d7c3719ed3c76d33d2 Mon Sep 17 00:00:00 2001 From: "sanfan.hx" Date: Wed, 30 Jan 2019 10:29:55 +0800 Subject: [PATCH 17/20] docs(add development Environment): --- README-en.md | 6 ++++++ README.md | 7 +++++++ .../elements/Form/Slider/SliderComponentShape/index.dart | 0 3 files changed, 13 insertions(+) delete mode 100644 lib/widgets/elements/Form/Slider/SliderComponentShape/index.dart diff --git a/README-en.md b/README-en.md index 31d43d36..8e866ea3 100644 --- a/README-en.md +++ b/README-en.md @@ -12,6 +12,12 @@ Android download URL: Iphone download URL: No +## Development Environment +This Project need latest package, please update regularly. + +- dart(version: 2.0.0) +- flutter(version: v1.1.10) + ### Background #### What is Flutter? diff --git a/README.md b/README.md index fd82b0eb..455679f0 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,13 @@ android下载地址: iphone下载地址: 暂无 +## 基础环境 +本项目环境持续更新. 请定期更新各依赖包. + +- dart(version: 2.0.0) +- flutter(version: v1.1.10) + + ### 背景 #### Flutter 是什么? diff --git a/lib/widgets/elements/Form/Slider/SliderComponentShape/index.dart b/lib/widgets/elements/Form/Slider/SliderComponentShape/index.dart deleted file mode 100644 index e69de29b..00000000 From 588c17ca1090170ca8277da977e9d0596e45439f Mon Sep 17 00:00:00 2001 From: "yifeng.yl" Date: Wed, 30 Jan 2019 12:35:50 +0800 Subject: [PATCH 18/20] fix:code url --- assets/app.db | Bin 53248 -> 53248 bytes lib/routers/application.dart | 2 +- .../components/Bar/BottomAppBar/index.dart | 2 +- .../components/Bar/SnackBar/index.dart | 2 +- .../components/Dialog/AlertDialog/demo.dart | 12 +++++++----- .../components/Grid/SliverGrid/index.dart | 2 +- .../components/LIst/ListView/index.dart | 2 +- .../components/Menu/PopupMenuEntry/index.dart | 2 +- .../components/Menu/PopupMenuItem/index.dart | 2 +- .../CircularProgressIndicator/index.dart | 2 +- .../LinearProgressIndicator/index.dart | 2 +- .../RefreshProgressIndicator/index.dart | 2 +- .../elements/Form/Switch/Switch/index.dart | 2 +- .../elements/Form/Text/Text/index.dart | 2 +- .../Media/Image/DecorationImage/index.dart | 2 +- .../Media/Image/MemoryImage/index.dart | 2 +- .../Media/Image/NetworkImage/index.dart | 2 +- .../themes/Cupertino/CupertinoApp/index.dart | 2 +- .../Cupertino/CupertinoButton/index.dart | 2 +- .../Cupertino/CupertinoColors/index.dart | 2 +- .../Cupertino/CupertinoIcons/index.dart | 2 +- .../CupertinoNavigationBar/index.dart | 2 +- .../Cupertino/CupertinoPageRoute/index.dart | 2 +- .../CupertinoPageScaffold/index.dart | 2 +- .../Cupertino/CupertinoPicker/index.dart | 2 +- .../CupertinoPopupSurface/index.dart | 2 +- .../Cupertino/CupertinoScrollbar/index.dart | 2 +- .../CupertinoSegmentedControl/index.dart | 2 +- .../Cupertino/CupertinoSlider/index.dart | 2 +- .../CupertinoSliverNavigationBar/index.dart | 2 +- .../Cupertino/CupertinoSwitch/index.dart | 2 +- .../Cupertino/CupertinoTabBar/index.dart | 2 +- .../Cupertino/CupertinoTabScaffold/index.dart | 2 +- .../Cupertino/CupertinoTabView/index.dart | 2 +- .../Cupertino/CupertinoTimerPicker/index.dart | 2 +- .../Material/MaterialAccentColor/index.dart | 2 +- .../themes/Material/MaterialApp/index.dart | 2 +- .../themes/Material/MaterialButton/index.dart | 2 +- .../themes/Material/MaterialColor/index.dart | 2 +- .../Material/MaterialPageRoute/index.dart | 2 +- .../Material/MergeableMaterialItem/index.dart | 2 +- pubspec.yaml | 10 +++++++--- 42 files changed, 53 insertions(+), 47 deletions(-) diff --git a/assets/app.db b/assets/app.db index 0955a802a146bf786621e0b33b67bdfa3f433ff7..ad03d945c6d45cff7323fe3ec69d5be6143be510 100644 GIT binary patch delta 66 zcmV-I0KNZ!paX!Q1CSd5(UBZO0nxEwx?chUjk6qJIsySYlUHIk0y1Wk1Q9Ef{cH!b Y!D0^y0t~{F(rfSp4f+5=v&L*XV-9~9CIA2c delta 108 zcmZozz}&Ead4e?Kg^4oGj2AX0?22dNIkZ_O!HS77Z*q8&nMtECCxf!GxUeXrq;FzL zYEfolj(cJO5;HS5F+DXUKRG2eH(%$;j)tf0D>ffY;^$=I{WbYg_6HV+G){)i$8xNa E0r@E>{r~^~ diff --git a/lib/routers/application.dart b/lib/routers/application.dart index 0005b856..35587d4d 100644 --- a/lib/routers/application.dart +++ b/lib/routers/application.dart @@ -4,7 +4,7 @@ class Application { static Router router; static TabController controller; static Map github = { - 'widgetsURL':'https://github.com/alibaba-paimai-frontend/flutter-common-widgets-app/tree/develop/lib/widgets/', + 'widgetsURL':'https://github.com/alibaba/flutter-go/blob/develop/lib/widgets/', //'develop':'https://github.com/alibaba-paimai-frontend/flutter-common-widgets-app/tree/develop/lib/widgets/', //'master':'https://github.com/alibaba-paimai-frontend/flutter-common-widgets-app/tree/master/lib/widgets/' }; diff --git a/lib/widgets/components/Bar/BottomAppBar/index.dart b/lib/widgets/components/Bar/BottomAppBar/index.dart index 18c2d159..080c278e 100644 --- a/lib/widgets/components/Bar/BottomAppBar/index.dart +++ b/lib/widgets/components/Bar/BottomAppBar/index.dart @@ -38,7 +38,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'BottomAppBar', - codeUrl: 'componentss/Bar/BottomAppBar/demo.dart', + codeUrl: 'components/Bar/BottomAppBar/demo.dart', contentList: [allDomes(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/BottomAppBar-class.html', ); diff --git a/lib/widgets/components/Bar/SnackBar/index.dart b/lib/widgets/components/Bar/SnackBar/index.dart index 2047f783..ff1d31ad 100644 --- a/lib/widgets/components/Bar/SnackBar/index.dart +++ b/lib/widgets/components/Bar/SnackBar/index.dart @@ -40,7 +40,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'SnackBar', - codeUrl: 'componentss/Bar/SnackBar/demo.dart', + codeUrl: 'components/Bar/SnackBar/demo.dart', contentList: [allDomes(context, this)], docUrl: 'https://docs.flutter.io/flutter/material/SnackBar-class.html', ); diff --git a/lib/widgets/components/Dialog/AlertDialog/demo.dart b/lib/widgets/components/Dialog/AlertDialog/demo.dart index 8d68c838..44e707c4 100644 --- a/lib/widgets/components/Dialog/AlertDialog/demo.dart +++ b/lib/widgets/components/Dialog/AlertDialog/demo.dart @@ -10,12 +10,9 @@ import 'package:flutter/material.dart'; -class AlertDialogDemo extends StatefulWidget { - _Demo createState() => _Demo(); -} +class AlertDialogDemo extends StatelessWidget{ + // _Demo createState() => _Demo(); -class _Demo extends State { - void showAlertDialog(BuildContext context) { showDialog( context: context, @@ -141,3 +138,8 @@ class _Demo extends State { }); } } + +// class _Demo extends State { + + +// } diff --git a/lib/widgets/components/Grid/SliverGrid/index.dart b/lib/widgets/components/Grid/SliverGrid/index.dart index 926387af..cfdc138a 100644 --- a/lib/widgets/components/Grid/SliverGrid/index.dart +++ b/lib/widgets/components/Grid/SliverGrid/index.dart @@ -40,7 +40,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'SliverGrid', - codeUrl: 'components/Grid/GridPaper/demo.dart', + codeUrl: 'components/Grid/SliverGrid/demo.dart', contentList: [ _Text0, SliverGridDemo(), diff --git a/lib/widgets/components/LIst/ListView/index.dart b/lib/widgets/components/LIst/ListView/index.dart index 1bbebf52..c43ff044 100644 --- a/lib/widgets/components/LIst/ListView/index.dart +++ b/lib/widgets/components/LIst/ListView/index.dart @@ -67,7 +67,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'ListView', - codeUrl: '/componentss/List/ListView/demo.dart', + codeUrl: 'components/List/ListView/demo.dart', contentList: [allCheckboxs(context, this)], docUrl: 'https://docs.flutter.io/flutter/widgets/ListView-class.html', ); diff --git a/lib/widgets/components/Menu/PopupMenuEntry/index.dart b/lib/widgets/components/Menu/PopupMenuEntry/index.dart index e5c46fe9..6443f446 100644 --- a/lib/widgets/components/Menu/PopupMenuEntry/index.dart +++ b/lib/widgets/components/Menu/PopupMenuEntry/index.dart @@ -34,7 +34,7 @@ class _DemoState extends State { PopupMenuDividerDemo() ], docUrl: 'https://docs.flutter.io/flutter/material/PopupMenuEntry-class.html', - codeUrl: 'components/Menu/PopupMenuEntry/demo.dart', + codeUrl: 'components/Menu/PopupMenuDivider/demo.dart', title: 'PopupMenuEntry', ); } diff --git a/lib/widgets/components/Menu/PopupMenuItem/index.dart b/lib/widgets/components/Menu/PopupMenuItem/index.dart index f8b8e315..1e1705b9 100644 --- a/lib/widgets/components/Menu/PopupMenuItem/index.dart +++ b/lib/widgets/components/Menu/PopupMenuItem/index.dart @@ -34,7 +34,7 @@ class _DemoState extends State { PopupMenuDividerDemo() ], docUrl: "https://docs.flutter.io/flutter/material/PopupMenuItem-class.html", - codeUrl: 'components/Menu/PopupMenuEntry/demo.dart', + codeUrl: 'components/Menu/PopupMenuDivider/demo.dart', title: 'PopupMenuItem', ); } diff --git a/lib/widgets/components/Progress/CircularProgressIndicator/index.dart b/lib/widgets/components/Progress/CircularProgressIndicator/index.dart index 5a44e5e7..a90ddc2d 100644 --- a/lib/widgets/components/Progress/CircularProgressIndicator/index.dart +++ b/lib/widgets/components/Progress/CircularProgressIndicator/index.dart @@ -38,7 +38,7 @@ class _DemoState extends State { content1, CircularDemo(), ], - codeUrl: '/components/Progress/CircularProgressIndicator/demo.dart', + codeUrl: 'components/Progress/CircularProgressIndicator/demo.dart', docUrl: 'https://docs.flutter.io/flutter/material/LinearProgressIndicator-class.html', title: 'CircularProgressIndicator'); diff --git a/lib/widgets/components/Progress/LinearProgressIndicator/index.dart b/lib/widgets/components/Progress/LinearProgressIndicator/index.dart index 9d2c1a32..4d8d635f 100644 --- a/lib/widgets/components/Progress/LinearProgressIndicator/index.dart +++ b/lib/widgets/components/Progress/LinearProgressIndicator/index.dart @@ -38,7 +38,7 @@ class _DemoState extends State { content1, LinearProgressIndicatorDemo(), ], - codeUrl: '/components/Progress/LinearProgressIndicator/demo.dart', + codeUrl: 'components/Progress/LinearProgressIndicator/demo.dart', docUrl: 'https://docs.flutter.io/flutter/material/LinearProgressIndicator-class.html', title: 'LinearProgressIndicator'); diff --git a/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart b/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart index bd447cc9..b9c436fb 100644 --- a/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart +++ b/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart @@ -35,7 +35,7 @@ class _DemoState extends State { content1, // LinearProgressIndicatorDemo(), ], - codeUrl: '/components/Progress/RefreshProgressIndicator/demo.dart', + codeUrl: 'components/Progress/RefreshProgressIndicator/demo.dart', docUrl:'https://docs.flutter.io/flutter/material/RefreshProgressIndicator-class.html', title: 'RefreshProgressIndicator'); } diff --git a/lib/widgets/elements/Form/Switch/Switch/index.dart b/lib/widgets/elements/Form/Switch/Switch/index.dart index ce55a73a..afd390e7 100644 --- a/lib/widgets/elements/Form/Switch/Switch/index.dart +++ b/lib/widgets/elements/Form/Switch/Switch/index.dart @@ -83,7 +83,7 @@ class _Demo extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'Switch', - codeUrl: '', + codeUrl: 'elements/Form/Switch/Switch/demo.dart', contentList: [ contentA, SwitchDemo(), diff --git a/lib/widgets/elements/Form/Text/Text/index.dart b/lib/widgets/elements/Form/Text/Text/index.dart index d51aa94c..962aeec2 100644 --- a/lib/widgets/elements/Form/Text/Text/index.dart +++ b/lib/widgets/elements/Form/Text/Text/index.dart @@ -38,7 +38,7 @@ class _Demo extends State { return WidgetDemo( title: "Text", docUrl: 'flutter/widgets/Text-class.html', - codeUrl: 'elements/Form/Text/Text/index.dart', + codeUrl: 'elements/Form/Text/Text/demo.dart', contentList: [ intro, TextDemo(), diff --git a/lib/widgets/elements/Media/Image/DecorationImage/index.dart b/lib/widgets/elements/Media/Image/DecorationImage/index.dart index 25d40d4c..8fadb96b 100644 --- a/lib/widgets/elements/Media/Image/DecorationImage/index.dart +++ b/lib/widgets/elements/Media/Image/DecorationImage/index.dart @@ -38,7 +38,7 @@ class _DemoState extends State { contentText1, DecorationImageDemo(), ], - codeUrl: 'elements/Media/Image/DecorationImage/index.dart?1542705856254', + codeUrl: 'elements/Media/Image/DecorationImage/decorationImage_demo.dart', docUrl: 'https://docs.flutter.io/flutter/painting/DecorationImage-class.html', title: 'DecorationImage', diff --git a/lib/widgets/elements/Media/Image/MemoryImage/index.dart b/lib/widgets/elements/Media/Image/MemoryImage/index.dart index a7d42d87..b81c9587 100644 --- a/lib/widgets/elements/Media/Image/MemoryImage/index.dart +++ b/lib/widgets/elements/Media/Image/MemoryImage/index.dart @@ -40,7 +40,7 @@ class _DemoState extends State { // desc: 'MemoryImage 使用介绍', docUrl: 'https://docs.flutter.io/flutter/painting/MemoryImage-class.html', codeUrl: - 'elements/Media/Image/MemoryImage/index.dart?1542777213280', + 'elements/Media/Image/MemoryImage/index.dart', ); } } diff --git a/lib/widgets/elements/Media/Image/NetworkImage/index.dart b/lib/widgets/elements/Media/Image/NetworkImage/index.dart index b417e84c..4f488956 100644 --- a/lib/widgets/elements/Media/Image/NetworkImage/index.dart +++ b/lib/widgets/elements/Media/Image/NetworkImage/index.dart @@ -34,7 +34,7 @@ class _DemoState extends State { contentText1, NetworkImageDemo(), ], - codeUrl: '', + codeUrl: 'elements/Media/Image/NetworkImage/network_image_demo.dart', docUrl: 'https://docs.flutter.io/flutter/painting/NetworkImage-class.html', title: 'NetworkImage', ); diff --git a/lib/widgets/themes/Cupertino/CupertinoApp/index.dart b/lib/widgets/themes/Cupertino/CupertinoApp/index.dart index 124c1658..4fd0f923 100644 --- a/lib/widgets/themes/Cupertino/CupertinoApp/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoApp/index.dart @@ -47,7 +47,7 @@ class _DemoState extends State { ], title: 'CupertinoApp', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoApp-class.html', - codeUrl: '/themes/Cupertino/CupertinoApp/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoApp/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Cupertino/CupertinoButton/index.dart b/lib/widgets/themes/Cupertino/CupertinoButton/index.dart index 4f69f315..71a6ce57 100644 --- a/lib/widgets/themes/Cupertino/CupertinoButton/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoButton/index.dart @@ -39,7 +39,7 @@ class _DemoState extends State { ], title: 'CupertinoButton', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoButton-class.html', - codeUrl: '/themes/Cupertino/CupertinoButton/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoButton/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Cupertino/CupertinoColors/index.dart b/lib/widgets/themes/Cupertino/CupertinoColors/index.dart index d8f5e6ca..6215b60c 100644 --- a/lib/widgets/themes/Cupertino/CupertinoColors/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoColors/index.dart @@ -36,7 +36,7 @@ class _DemoState extends State { ], title: 'CupertinoColors', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoColors-class.html', - codeUrl: '/themes/Cupertino/CupertinoColor/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoColor/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart b/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart index 93b60c1d..ef378cc7 100644 --- a/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart @@ -38,7 +38,7 @@ class _DemoState extends State { ], title: 'CupertinoIcons', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoIcons-class.html', - codeUrl: '/themes/Cupertino/CupertinoColor/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoColor/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart index 939e791c..85ded637 100644 --- a/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart @@ -48,7 +48,7 @@ class _DemoState extends State { ], title: 'CupertinoNavigationBar', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoNavigationBar-class.html', - codeUrl: '/themes/Cupertino/CupertinoNavigationBar/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoNavigationBar/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart b/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart index e61ebc04..b492204b 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart @@ -41,7 +41,7 @@ class _DemoState extends State { ], title: 'CupertinoPageRoute', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoPageRoute-class.html', - codeUrl: '/themes/Cupertino/CupertinoPageRoute/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoPageRoute/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart b/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart index 4e1808de..4c22b429 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart @@ -39,7 +39,7 @@ class _DemoState extends State { ], title: 'CupertinoPageScaffold', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoPageScaffold-class.html', - codeUrl: '/themes/Cupertino/CupertinoPageScaffold/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoPageScaffold/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart b/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart index 24e93819..58e8328c 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart @@ -39,7 +39,7 @@ class _DemoState extends State { ], title: 'CupertinoPicker', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoPicker-class.html', - codeUrl: '/themes/Cupertino/CupertinoPicker/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoPicker/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart b/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart index 24d5a09a..a4030a16 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart @@ -38,7 +38,7 @@ class _DemoState extends State { ], title: 'CupertinoPopupSurface', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoPopupSurface-class.html', - codeUrl: '/themes/Cupertino/CupertinoPopupSurface/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoPopupSurface/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart b/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart index 8e598703..229566e6 100644 --- a/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart @@ -27,7 +27,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'CupertinoScrollbar', - codeUrl: '/themes/Cupertino/CupertinoScrollbar/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoScrollbar/demo.dart', docUrl: 'https://docs.flutter.io/flutter/material/MaterialAccentColor-class.html', contentList: [ Text0, diff --git a/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart b/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart index 2eb2d7c8..1fef5c8f 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart @@ -32,7 +32,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'CupertinoSegmentedControl', - codeUrl: '/themes/Cupertino/CupertinoSegmentedControl/demo.dart', + codeUrl: '/hemes/Cupertino/CupertinoSegmentedControl/demo.dart', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoSegmentedControl-class.html', contentList: [ Text0, diff --git a/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart b/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart index a3b73bd0..a0c82e86 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart @@ -27,7 +27,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'CupertinoSlider', - codeUrl: '/themes/Cupertino/CupertinoSlider/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoSlider/demo.dart', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoSlider-class.html', contentList: [ Text0, diff --git a/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart index 6b48e1c5..11c13344 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart @@ -24,7 +24,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'CupertinoSlider', - codeUrl: '/themes/Cupertino/CupertinoSliverNavigationBar/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoSliverNavigationBar/demo.dart', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoSliverNavigationBar-class.html', contentList: [ Text0, diff --git a/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart b/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart index b86d294a..d5f315b1 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart @@ -25,7 +25,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'CupertinoSlider', - codeUrl: '/themes/Cupertino/CupertinoSwitch/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoSwitch/demo.dart', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoSwitch-class.html', contentList: [ Text0, diff --git a/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart index ee63deea..641f8d96 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart @@ -33,7 +33,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'CupertinoTabBar', - codeUrl: '/themes/Cupertino/CupertinoTabBar/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoTabBar/demo.dart', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoTabBar-class.html', contentList: [ Text0, diff --git a/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart index 5dcd85e9..ee25a4e7 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart @@ -39,7 +39,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'CupertinoTabScaffold', - codeUrl: '/themes/Cupertino/CupertinoTabScaffold/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoTabScaffold/demo.dart', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoTabScaffold-class.html', contentList: [ Text0, diff --git a/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart index 5cdb8516..214b7897 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart @@ -42,7 +42,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'CupertinoTabView', - codeUrl: '/themes/Cupertino/CupertinoTabView/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoTabView/demo.dart', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoTabView-class.html', contentList: [ Text0, diff --git a/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart b/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart index 6c882cfa..799db8a0 100644 --- a/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart @@ -40,7 +40,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'CupertinoTimerPicker', - codeUrl: '/themes/Cupertino/CupertinoTimerPicker/demo.dart', + codeUrl: 'themes/Cupertino/CupertinoTimerPicker/demo.dart', docUrl: 'https://docs.flutter.io/flutter/cupertino/CupertinoTimerPicker-class.html', contentList: [ Text0, diff --git a/lib/widgets/themes/Material/MaterialAccentColor/index.dart b/lib/widgets/themes/Material/MaterialAccentColor/index.dart index 3e29db7d..8f25f82d 100644 --- a/lib/widgets/themes/Material/MaterialAccentColor/index.dart +++ b/lib/widgets/themes/Material/MaterialAccentColor/index.dart @@ -28,7 +28,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'MaterialAccentColor', - codeUrl: 'elements/themes/Material/MaterialAccentColor', + codeUrl: 'themes/Material/MaterialColor/demo.dart', docUrl: 'https://docs.flutter.io/flutter/material/MaterialAccentColor-class.html', contentList: [ diff --git a/lib/widgets/themes/Material/MaterialApp/index.dart b/lib/widgets/themes/Material/MaterialApp/index.dart index d6a9918b..907f21c9 100644 --- a/lib/widgets/themes/Material/MaterialApp/index.dart +++ b/lib/widgets/themes/Material/MaterialApp/index.dart @@ -47,7 +47,7 @@ class _DemoState extends State { ], title: 'MaterialApp', docUrl: 'https://docs.flutter.io/flutter/material/MaterialApp-class.html', - codeUrl: '../main.dart', + codeUrl: 'themes/Material/MaterialApp/demo.dart', ); } } \ No newline at end of file diff --git a/lib/widgets/themes/Material/MaterialButton/index.dart b/lib/widgets/themes/Material/MaterialButton/index.dart index 7716f8a5..4efa8c79 100644 --- a/lib/widgets/themes/Material/MaterialButton/index.dart +++ b/lib/widgets/themes/Material/MaterialButton/index.dart @@ -39,7 +39,7 @@ class _DemoState extends State { MaterialButtonDemo(), ], title: 'MaterialButton', - codeUrl: 'Material/MaterialButton/demo.dart', + codeUrl: 'themes/Material/MaterialButton/demo.dart', docUrl: 'https://docs.flutter.io/flutter/material/MaterialButton-class.html', ); diff --git a/lib/widgets/themes/Material/MaterialColor/index.dart b/lib/widgets/themes/Material/MaterialColor/index.dart index 2d115912..5789c94d 100644 --- a/lib/widgets/themes/Material/MaterialColor/index.dart +++ b/lib/widgets/themes/Material/MaterialColor/index.dart @@ -36,7 +36,7 @@ class _DemoState extends State { ColorDemo(), ], title: "MaterialColor", - codeUrl: 'Material/MaterialColor/demo.dart', + codeUrl: 'themes/Material/MaterialColor/demo.dart', docUrl: 'https://docs.flutter.io/flutter/material/MaterialColor-class.html', ); diff --git a/lib/widgets/themes/Material/MaterialPageRoute/index.dart b/lib/widgets/themes/Material/MaterialPageRoute/index.dart index f4060185..a93a03eb 100644 --- a/lib/widgets/themes/Material/MaterialPageRoute/index.dart +++ b/lib/widgets/themes/Material/MaterialPageRoute/index.dart @@ -27,7 +27,7 @@ class _DemoState extends State { Widget build(BuildContext context) { return WidgetDemo( title: 'MaterialPageRoute', - codeUrl: 'elements/themes/Material/MaterialPageRoute', + codeUrl: 'themes/Material/MaterialPageRoute/demo.dart', docUrl: 'https://docs.flutter.io/flutter/material/MaterialPageRoute-class.html', contentList: [ diff --git a/lib/widgets/themes/Material/MergeableMaterialItem/index.dart b/lib/widgets/themes/Material/MergeableMaterialItem/index.dart index 291de1f0..63d3682f 100644 --- a/lib/widgets/themes/Material/MergeableMaterialItem/index.dart +++ b/lib/widgets/themes/Material/MergeableMaterialItem/index.dart @@ -37,7 +37,7 @@ class _DemoState extends State { MergeableMaterialItemDemo(), ], title: "MergeableMaterialItem", - codeUrl: 'Material/MergeableMaterialItem/demo.dart', + codeUrl: 'themes/Material/MergeableMaterialItem/demo.dart', docUrl: 'https://docs.flutter.io/flutter/material/MergeableMaterialItem-class.html', ); diff --git a/pubspec.yaml b/pubspec.yaml index 8c5619c0..70beef7c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -72,9 +72,11 @@ flutter: - lib/widgets/components/Grid/GridTile/demo.dart - lib/widgets/components/Grid/GridTileBar/demo.dart - lib/widgets/components/Grid/GridView/demo.dart - - lib/widgets/components/LIst/AnimatedList/demo.dart - - lib/widgets/components/LIst/ListBody/demo.dart - - lib/widgets/components/LIst/ListView/demo.dart + - lib/widgets/components/Grid/GridPaper/demo.dart + - lib/widgets/components/Grid/SliverGrid/demo.dart + - lib/widgets/components/List/AnimatedList/demo.dart + - lib/widgets/components/List/ListBody/demo.dart + - lib/widgets/components/List/ListView/demo.dart - lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart - lib/widgets/components/Menu/DropdownMenuItem/demo.dart - lib/widgets/components/Menu/PopupMenuButton/demo.dart @@ -130,6 +132,8 @@ flutter: - lib/widgets/elements/Frame/Box/SizeBox/demo.dart - lib/widgets/elements/Frame/Box/SizedOverflowBox/demo.dart - lib/widgets/elements/Frame/Box/TextBox/demo.dart + - lib/widgets/elements/Form/Text/Text/demo.dart + - lib/widgets/elements/Form/Text/RichText/index.dart - lib/widgets/elements/Frame/Box/UnconstrainedBox/demo.dart - lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart - lib/widgets/elements/Frame/Layout/Center/demo.dart From b341ca0edae854d3d50bf06328d84dcf5f13b335 Mon Sep 17 00:00:00 2001 From: "yifeng.yl" Date: Thu, 31 Jan 2019 11:15:19 +0800 Subject: [PATCH 19/20] fix:remote file in pubspec --- pubspec.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 8a8587ab..0a4b52ba 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -189,8 +189,6 @@ flutter: - assets/app.db - assets/images/ - assets/fonts/ - - lib/utils/example_code_parser.dart - - lib/utils/syntax_highlighter.dart fonts: - family: FlamanteRoma From 95a54fed17873c1a4d15d5847aeff5cd7b36f9e0 Mon Sep 17 00:00:00 2001 From: "yifeng.yl" Date: Thu, 31 Jan 2019 11:20:20 +0800 Subject: [PATCH 20/20] feat:modified db,add widget --- assets/app.db | Bin 53248 -> 53248 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/app.db b/assets/app.db index ad03d945c6d45cff7323fe3ec69d5be6143be510..b5b6f0ab6d1e1bed94bba6c46097613517a62157 100644 GIT binary patch delta 329 zcmZozz}&Ead4e?Km5DOWj8`@$ER<*AHDKu8%&H*5$SS~N!E<7>oZ=@g4t8cHCWdVc z+a^osC_p&d8MaS$(CL71b};PNd_hM_m~qGE*Y=VEjFOXC1N6B#wYb`OgE=m9T;A9? zm1FYd2roAQ26J<9VNpg&=hA{yvqm#c26c5XKOiwPuOzi7I6Ji@IRk~0nVXoNnv$QK zlA4<@`(#JMvzhZZCr2_fGOA2Yk5Vu-YBc9$P*z4ZBp|T_W(0_d&44{oT}%!F48Fc_ v$M`f_a5C81Lim|Q$vLS3MfvGPsl~-kiA7KcIireC4#*Z|l-)chHl+vvf>CJk delta 242 zcmZozz}&Ead4e?K#fdV`j2Aa1ER<*A5n$-p%&H*5$jZS3gq!6QKXGyJSTJxfY+=|k zSwcsFgXaX0vz}r7WCxuN4qgKwXEDR#%@=f}gc-MPer+!)z$iAEH9((><1!3xY@Et5 z`ErDpu_uGMxwx<>qoi|bL26M+W?p_sMrm$RKw@TINoo;R!O4Nq!kd#LnHd=)C#Od# zu;!H%<>yS!kCK?|6D_fMPgEBZOFV