From d48942b55df88a7cea90c9b02a6df2590181ef01 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 28 Jan 2019 17:45:18 +0800 Subject: [PATCH] =?UTF-8?q?refactor(many=20files):=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9A=84=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.views 文件夹里面分类，页面相关文件;2.公共组件全部放在components里;3.创建resources文件夹放置资源dart文件4.修改二级菜单文字大小 BREAKING CHANGE: 重构，建议删除本地db,再编译 --- ios/Runner.xcodeproj/project.pbxproj | 4 ++ lib/common/Style.dart | 29 -------- lib/common/event_bus.dart | 8 --- lib/components/cate_card.dart | 2 +- lib/{views => components}/category.dart | 0 .../full_screen_code_dialog.dart | 4 +- .../list_view_item.dart | 0 lib/components/markdown.dart | 2 +- lib/{common => components}/widget_demo.dart | 2 +- lib/components/widget_item.dart | 17 +++-- lib/components/widget_item_container.dart | 2 + lib/main.dart | 2 +- lib/model/cat.dart | 2 +- lib/model/collection.dart | 2 +- lib/model/collection_general.dart | 68 ------------------- lib/model/widget.dart | 2 +- lib/{common => resources}/icon_names.dart | 0 .../widget_name_to_icon.dart | 8 +-- lib/routers/router_handler.dart | 8 +-- .../example_code_parser.dart | 0 lib/{common => utils}/high_light_code.dart | 0 lib/{common => utils}/net_utils.dart | 0 lib/{common => utils}/provider.dart | 1 - lib/{common => utils}/sql.dart | 0 lib/{common => utils}/style.dart | 0 lib/{common => utils}/syntax_highlighter.dart | 0 lib/{common => utils}/util.dart | 0 lib/views/Detail.dart | 22 ------ .../collection_page.dart | 10 +-- lib/views/detail.dart | 22 ------ lib/views/{ => first_page}/first_page.dart | 6 +- .../first_page}/first_page_item.dart | 2 +- lib/views/{ => first_page}/home.dart | 16 ++--- .../fourth_page}/page_dragger.dart | 2 +- .../fourth_page}/page_reveal.dart | 0 .../fourth_page}/pager_indicator.dart | 2 +- .../fourth_page}/pages.dart | 0 lib/views/{ => web_page}/web_view_page.dart | 8 +-- lib/views/welcome_page/fourth_page.dart | 8 +-- lib/views/{ => widget_page}/widget_page.dart | 2 +- lib/widgets/components/Bar/AppBar/index.dart | 2 +- .../components/Bar/BottomAppBar/index.dart | 2 +- .../components/Bar/ButtonBar/index.dart | 2 +- .../Bar/FlexibleSpaceBar/index.dart | 2 +- .../components/Bar/SliverAppBar/index.dart | 2 +- .../components/Bar/SnackBar/index.dart | 2 +- .../components/Bar/SnackBarAction/index.dart | 2 +- lib/widgets/components/Bar/TabBar/index.dart | 2 +- lib/widgets/components/Card/Card/index.dart | 2 +- lib/widgets/components/Chip/Chip/index.dart | 2 +- .../components/Chip/ChipTheme/index.dart | 2 +- .../components/Chip/ChipThemeData/index.dart | 2 +- .../components/Chip/ChoiceChip/index.dart | 2 +- .../components/Chip/FilterChip/index.dart | 2 +- .../components/Chip/RawChip/index.dart | 2 +- .../components/Chip/inputChip/index.dart | 2 +- .../components/Dialog/AboutDialog/index.dart | 2 +- .../components/Dialog/AlertDialog/index.dart | 2 +- .../components/Dialog/Dialog/index.dart | 2 +- .../components/Dialog/SimpleDialog/index.dart | 2 +- .../components/Grid/GridPaper/index.dart | 2 +- .../components/Grid/GridTile/index.dart | 2 +- .../components/Grid/GridTileBar/index.dart | 2 +- .../components/Grid/GridView/index.dart | 2 +- .../components/Grid/SliverGrid/index.dart | 2 +- .../components/LIst/AnimatedList/index.dart | 2 +- .../components/LIst/ListBody/index.dart | 2 +- .../components/LIst/ListView/index.dart | 2 +- .../Menu/CheckedPopupMenuItem/demo.dart | 2 +- .../Menu/CheckedPopupMenuItem/index.dart | 2 +- .../Menu/DropdownMenuItem/index.dart | 2 +- .../Menu/PopupMenuButton/index.dart | 2 +- .../Menu/PopupMenuDivider/index.dart | 2 +- .../components/Menu/PopupMenuEntry/index.dart | 2 +- .../components/Menu/PopupMenuItem/index.dart | 2 +- .../Menu/PopupMenuItemState/index.dart | 2 +- .../Navigation/BottomNavigationBar/index.dart | 2 +- .../BottomNavigationBarItem/index.dart | 2 +- .../Panel/ExpansionPanel/index.dart | 2 +- .../Panel/ExpansionPanelList/index.dart | 2 +- .../Panel/ExpansionPanelRadio/index.dart | 2 +- .../components/Pick/DayPicker/index.dart | 2 +- .../components/Pick/MonthPicker/index.dart | 2 +- .../components/Pick/ShowdatePicker/index.dart | 2 +- .../components/Pick/YearPicker/index.dart | 2 +- .../CircularProgressIndicator/index.dart | 2 +- .../LinearProgressIndicator/index.dart | 2 +- .../RefreshProgressIndicator/index.dart | 2 +- .../components/Scaffold/Scaffold/index.dart | 2 +- .../Scaffold/ScaffoldState/index.dart | 2 +- .../Scroll/BoxScrollView/index.dart | 2 +- .../Scroll/CustomScrollView/index.dart | 2 +- .../Scroll/NestedScrollView/index.dart | 2 +- .../Scroll/ScrollMetrics/index.dart | 2 +- .../Scroll/ScrollPhysics/index.dart | 2 +- .../components/Scroll/ScrollView/index.dart | 2 +- .../components/Scroll/Scrollable/index.dart | 2 +- .../Scroll/ScrollbarPainter/index.dart | 2 +- lib/widgets/components/Tab/Tab/index.dart | 2 +- .../Form/Button/DropdownButton/index.dart | 2 +- .../Form/Button/FlatButton/index.dart | 2 +- .../Button/FloatingActionButton/index.dart | 2 +- .../elements/Form/Button/IconButton/demo.dart | 2 +- .../Form/Button/IconButton/index.dart | 2 +- .../Form/Button/OutlineButton/index.dart | 2 +- .../Form/Button/PopupMenuButton/index.dart | 2 +- .../Form/Button/RaisedButton/index.dart | 2 +- .../Form/Button/RawMaterialButton/index.dart | 2 +- .../Form/CheckBox/Checkbox/index.dart | 2 +- .../Form/CheckBox/CheckboxListTile/index.dart | 2 +- .../elements/Form/Input/TextField/index.dart | 2 +- .../elements/Form/Radio/Radio/index.dart | 2 +- .../Form/Radio/RadioListTile/index.dart | 2 +- .../elements/Form/Slider/Slider/index.dart | 2 +- .../Form/Slider/SliderTheme/index.dart | 2 +- .../Form/Slider/SliderThemeData/index.dart | 2 +- .../Form/Switch/AnimatedSwitcher/index.dart | 2 +- .../elements/Form/Switch/Switch/index.dart | 2 +- .../Form/Switch/SwitchListTile/index.dart | 2 +- .../elements/Form/Text/RichText/index.dart | 2 +- .../elements/Form/Text/Text/index.dart | 2 +- .../elements/Frame/Align/Align/index.dart | 2 +- .../Frame/Box/ConstrainedBox/index.dart | 2 +- .../Frame/Box/DecoratedBox/index.dart | 2 +- .../elements/Frame/Box/Fittedbox/index.dart | 2 +- .../elements/Frame/Box/LimitedBox/index.dart | 2 +- .../elements/Frame/Box/OverflowBox/index.dart | 2 +- .../elements/Frame/Box/RenderBox/index.dart | 2 +- .../elements/Frame/Box/RotatedBox/index.dart | 2 +- .../elements/Frame/Box/SizeBox/index.dart | 2 +- .../Frame/Box/SizedOverflowBox/index.dart | 2 +- .../elements/Frame/Box/TextBox/index.dart | 2 +- .../Frame/Box/UnconstrainedBox/index.dart | 2 +- .../Frame/Expanded/Expanded/index.dart | 2 +- .../elements/Frame/Layout/Center/index.dart | 2 +- .../elements/Frame/Layout/Column/index.dart | 2 +- .../Frame/Layout/Container/index.dart | 2 +- .../elements/Frame/Layout/Row/index.dart | 2 +- .../Frame/Spacing/AnimatedPadding/index.dart | 2 +- .../elements/Frame/Spacing/Padding/index.dart | 2 +- .../Frame/Spacing/SliverPadding/index.dart | 2 +- .../Frame/Stack/IndexedStack/index.dart | 2 +- .../elements/Frame/Stack/Stack/index.dart | 2 +- .../elements/Frame/Table/Table/index.dart | 2 +- .../elements/Media/Icon/Icon/index.dart | 2 +- .../elements/Media/Icon/IconData/index.dart | 2 +- .../elements/Media/Icon/IconTheme/index.dart | 2 +- .../Media/Icon/IconThemeData/index.dart | 2 +- .../elements/Media/Icon/ImageIcon/index.dart | 2 +- .../Media/Image/AssetImage/index.dart | 2 +- .../Media/Image/DecorationImage/index.dart | 2 +- .../Image/DecorationImagePainter/index.dart | 2 +- .../Media/Image/ExactAssetImage/index.dart | 2 +- .../Media/Image/FadeInImage/index.dart | 2 +- .../elements/Media/Image/FileImage/index.dart | 2 +- .../elements/Media/Image/Image/index.dart | 2 +- .../Media/Image/MemoryImage/index.dart | 2 +- .../Media/Image/NetworkImage/index.dart | 2 +- .../elements/Media/Image/RawImage/index.dart | 2 +- .../Media/Image/paintImage/index.dart | 2 +- .../themes/Cupertino/CupertinoApp/index.dart | 2 +- .../Cupertino/CupertinoButton/index.dart | 2 +- .../Cupertino/CupertinoColors/index.dart | 2 +- .../themes/Cupertino/CupertinoIcons/demo.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 | 3 +- .../CupertinoSliverNavigationBar/index.dart | 3 +- .../Cupertino/CupertinoSwitch/index.dart | 3 +- .../Cupertino/CupertinoTabBar/index.dart | 3 +- .../Cupertino/CupertinoTabScaffold/index.dart | 3 +- .../Cupertino/CupertinoTabView/index.dart | 3 +- .../Cupertino/CupertinoTimerPicker/index.dart | 3 +- .../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 | 9 +-- 186 files changed, 214 insertions(+), 355 deletions(-) delete mode 100644 lib/common/Style.dart delete mode 100644 lib/common/event_bus.dart rename lib/{views => components}/category.dart (100%) rename lib/{common => components}/full_screen_code_dialog.dart (94%) rename lib/{common => components}/list_view_item.dart (100%) rename lib/{common => components}/widget_demo.dart (99%) delete mode 100644 lib/model/collection_general.dart rename lib/{common => resources}/icon_names.dart (100%) rename lib/{common => resources}/widget_name_to_icon.dart (96%) rename lib/{common => utils}/example_code_parser.dart (100%) rename lib/{common => utils}/high_light_code.dart (100%) rename lib/{common => utils}/net_utils.dart (100%) rename lib/{common => utils}/provider.dart (99%) rename lib/{common => utils}/sql.dart (100%) rename lib/{common => utils}/style.dart (100%) rename lib/{common => utils}/syntax_highlighter.dart (100%) rename lib/{common => utils}/util.dart (100%) delete mode 100644 lib/views/Detail.dart rename lib/views/{ => collection_page}/collection_page.dart (93%) delete mode 100644 lib/views/detail.dart rename lib/views/{ => first_page}/first_page.dart (95%) rename lib/{components => views/first_page}/first_page_item.dart (96%) rename lib/views/{ => first_page}/home.dart (90%) rename lib/{components/fourth_page_feature => views/fourth_page}/page_dragger.dart (98%) rename lib/{components/fourth_page_feature => views/fourth_page}/page_reveal.dart (100%) rename lib/{components/fourth_page_feature => views/fourth_page}/pager_indicator.dart (98%) rename lib/{components/fourth_page_feature => views/fourth_page}/pages.dart (100%) rename lib/views/{ => web_page}/web_view_page.dart (94%) rename lib/views/{ => widget_page}/widget_page.dart (97%) 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/common/Style.dart b/lib/common/Style.dart deleted file mode 100644 index 31d9bb8d..00000000 --- a/lib/common/Style.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:flutter/material.dart'; - -//颜色配置 -class AppColor{ - static const int white = 0xFFFFFFFF; - static const int mainTextColor = 0xFF121917; - static const int subTextColor = 0xff959595; -} - -//文本设置 -class AppText{ - static const middleSize = 16.0; - - static const middleText = TextStyle( - color: Color(AppColor.mainTextColor), - fontSize: middleSize, - ); - - static const middleSubText = TextStyle( - color: Color(AppColor.subTextColor), - fontSize: middleSize, - ); -} -class WidgetDemoColor { - static const int fontColor = 0xFF607173; - static const int iconColor = 0xFF607173; - static const int borderColor = 0xFFEFEFEF; - -} diff --git a/lib/common/event_bus.dart b/lib/common/event_bus.dart deleted file mode 100644 index faf20edc..00000000 --- a/lib/common/event_bus.dart +++ /dev/null @@ -1,8 +0,0 @@ -import 'package:event_bus/event_bus.dart'; - -EventBus eventBus = new EventBus(); - -class MyEvent { - String text; - MyEvent(this.text); -} diff --git a/lib/components/cate_card.dart b/lib/components/cate_card.dart index 24c05948..829959fb 100644 --- a/lib/components/cate_card.dart +++ b/lib/components/cate_card.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import '../model/cat.dart'; -import '../common/widget_name_to_icon.dart'; +import '../resources/widget_name_to_icon.dart'; import '../components/widget_item_container.dart'; class CateCard extends StatefulWidget { diff --git a/lib/views/category.dart b/lib/components/category.dart similarity index 100% rename from lib/views/category.dart rename to lib/components/category.dart diff --git a/lib/common/full_screen_code_dialog.dart b/lib/components/full_screen_code_dialog.dart similarity index 94% rename from lib/common/full_screen_code_dialog.dart rename to lib/components/full_screen_code_dialog.dart index ee098740..44af351e 100644 --- a/lib/common/full_screen_code_dialog.dart +++ b/lib/components/full_screen_code_dialog.dart @@ -5,8 +5,8 @@ * @Last Modified time: 2019-01-14 14:42:00 */ import 'package:flutter/material.dart'; -import 'example_code_parser.dart'; -import 'syntax_highlighter.dart'; +import 'package:flutter_go/utils/example_code_parser.dart'; +import 'package:flutter_go/utils/syntax_highlighter.dart'; class FullScreenCodeDialog extends StatefulWidget { const FullScreenCodeDialog({this.filePath}); diff --git a/lib/common/list_view_item.dart b/lib/components/list_view_item.dart similarity index 100% rename from lib/common/list_view_item.dart rename to lib/components/list_view_item.dart diff --git a/lib/components/markdown.dart b/lib/components/markdown.dart index ba7ea5d3..5e165299 100644 --- a/lib/components/markdown.dart +++ b/lib/components/markdown.dart @@ -1,5 +1,5 @@ import 'package:flutter_markdown/flutter_markdown.dart' as md; -import '../common/high_light_code.dart'; +import 'package:flutter_go/utils/high_light_code.dart'; import 'package:flutter/material.dart'; /// 使用方法 diff --git a/lib/common/widget_demo.dart b/lib/components/widget_demo.dart similarity index 99% rename from lib/common/widget_demo.dart rename to lib/components/widget_demo.dart index afbda781..05c57cdc 100644 --- a/lib/common/widget_demo.dart +++ b/lib/components/widget_demo.dart @@ -42,7 +42,7 @@ class _WidgetDemoState extends State { String _router = ''; void showInSnackBar(String value) { - Fluttertoast.instance.showToast( + Fluttertoast.showToast( msg: value, toastLength: Toast.LENGTH_SHORT, gravity: ToastGravity.CENTER, diff --git a/lib/components/widget_item.dart b/lib/components/widget_item.dart index b13966cf..1555b45b 100644 --- a/lib/components/widget_item.dart +++ b/lib/components/widget_item.dart @@ -2,8 +2,8 @@ * @author 一凨 */ import 'package:flutter/material.dart'; -import '../common/style.dart'; -import '../common/widget_name_to_icon.dart'; +import 'package:flutter_go/utils/style.dart'; +import 'package:flutter_go/resources/widget_name_to_icon.dart'; String _widgetName; @@ -13,9 +13,15 @@ class WidgetItem extends StatelessWidget { final int index; //用于计算border final int totalCount; final int rowLength; + final String textSize; WidgetItem( - {this.title, this.onTap, this.index, this.totalCount, this.rowLength}); + {this.title, + this.onTap, + this.index, + this.totalCount, + this.rowLength, + this.textSize}); Border _buildBorder(context) { Border _border; @@ -64,6 +70,9 @@ class WidgetItem extends StatelessWidget { Icons.crop, ); } + final textStyle = (textSize == 'middle') + ? TextStyle(fontSize: 13.8, fontFamily: 'MediumItalic') + : TextStyle(fontSize: 16.0); return InkWell( onTap: onTap, child: Container( @@ -80,7 +89,7 @@ class WidgetItem extends StatelessWidget { SizedBox( height: 8.0, ), - Text(_widgetName), + Text(_widgetName, style: textStyle), ], ), ), diff --git a/lib/components/widget_item_container.dart b/lib/components/widget_item_container.dart index 2ddf3029..4537fb8d 100644 --- a/lib/components/widget_item_container.dart +++ b/lib/components/widget_item_container.dart @@ -7,6 +7,7 @@ class WidgetItemContainer extends StatelessWidget { final int columnCount; //一行几个 final List categories; final bool isWidgetPoint; + // 所有的可用demos; final List widgetDemosList = new WidgetDemoList().getDemos(); @@ -50,6 +51,7 @@ class WidgetItemContainer extends StatelessWidget { index: addI, totalCount: length, rowLength: columnCount, + textSize: isWidgetPoint ? 'middle' : 'small', ), ), ); diff --git a/lib/main.dart b/lib/main.dart index 2979687b..3eee4c35 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,7 +3,7 @@ import 'package:fluro/fluro.dart'; import 'package:flutter/rendering.dart'; import 'routers/routers.dart'; import 'routers/application.dart'; -import 'common/provider.dart'; +import 'package:flutter_go/utils/provider.dart'; import 'views/welcome_page/index.dart'; diff --git a/lib/model/cat.dart b/lib/model/cat.dart index bf86764d..21be3e4e 100644 --- a/lib/model/cat.dart +++ b/lib/model/cat.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import '../common/sql.dart'; +import 'package:flutter_go/utils/sql.dart'; abstract class CatInterface{ int get id; diff --git a/lib/model/collection.dart b/lib/model/collection.dart index a8d4ca5e..c764c46b 100644 --- a/lib/model/collection.dart +++ b/lib/model/collection.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 17:37:42 */ import 'dart:async'; -import '../common/sql.dart'; +import 'package:flutter_go/utils/sql.dart'; abstract class CollectionInterface { String get name; diff --git a/lib/model/collection_general.dart b/lib/model/collection_general.dart deleted file mode 100644 index 18367092..00000000 --- a/lib/model/collection_general.dart +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Created with Android Studio. - * User: 一晟 - * Date: 2019/1/12 - * Time: 下午9:19 - * email: zhu.yan@alibaba-inc.com - */ -import 'dart:async'; -import '../common/sql.dart'; - -abstract class CollectionInterface { - String get key; - String get values; -} - -class CollectionGeneral implements CollectionInterface { - String key; - String values; - - CollectionGeneral({this.key, this.values}); - - factory CollectionGeneral.fromJSON(Map json){ - return CollectionGeneral(key: json['name'],values: json['values']); - } - - Object toMap() { - return {'key': key, 'values': values}; - } -} - -class CollectionControlModel { - final String table = 'collectionGeneral'; - Sql sql; - - CollectionControlModel() { - sql = Sql.setTable(table); - } - - // 获取所有的收藏 - - // 插入新收藏 - Future insert(CollectionGeneral collection) { - var result = - sql.insert({'key': collection.key, 'values': collection.values}); - return result; - } - - // 获取全部的收藏 - Future> getAllCollection() async { - List list = await sql.getByCondition(); - List resultList = []; - list.forEach((item){ - resultList.add(CollectionGeneral.fromJSON(item)); - }); - return resultList; - } - - // 通过收藏名获取router - Future getRouterByName(String key) async { - List list = await sql.getByCondition(conditions: {'key': key}); - return list; - } - - // 删除 - Future deleteByName(String key) async{ - return await sql.delete(key,'key'); - } -} diff --git a/lib/model/widget.dart b/lib/model/widget.dart index db9afcc4..a3bfda79 100644 --- a/lib/model/widget.dart +++ b/lib/model/widget.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import '../common/sql.dart'; +import 'package:flutter_go/utils/sql.dart'; import "package:flutter/material.dart"; abstract class WidgetInterface { diff --git a/lib/common/icon_names.dart b/lib/resources/icon_names.dart similarity index 100% rename from lib/common/icon_names.dart rename to lib/resources/icon_names.dart diff --git a/lib/common/widget_name_to_icon.dart b/lib/resources/widget_name_to_icon.dart similarity index 96% rename from lib/common/widget_name_to_icon.dart rename to lib/resources/widget_name_to_icon.dart index 8565d35f..95dff598 100644 --- a/lib/common/widget_name_to_icon.dart +++ b/lib/resources/widget_name_to_icon.dart @@ -157,12 +157,12 @@ class WidgetName2Icon { "CupertinoPopupSurface":Icons.center_focus_weak, "CupertinoScrollbar": Icons.fullscreen, "CupertinoSlider": Icons.switch_camera, - "CupertinoSegmentedControl": Icons.radio_button_checked, + "CupertinoSegmentedControl": Icons.business_center, "CupertinoSliverNavigationBar": Icons.subtitles, - "CupertinoSwitch": Icons.check_box, + "CupertinoSwitch": Icons.radio_button_checked, "CupertinoTabBar": Icons.tab, - "CupertinoTabScaffold": Icons.tab, - "CupertinoTabView": Icons.table_chart, + "CupertinoTabScaffold": Icons.crop_original, + "CupertinoTabView": Icons.tablet, "CupertinoTimerPicker": Icons.timer }; } diff --git a/lib/routers/router_handler.dart b/lib/routers/router_handler.dart index 1b12b954..ce4aab38 100644 --- a/lib/routers/router_handler.dart +++ b/lib/routers/router_handler.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:fluro/fluro.dart'; -import '../views/category.dart'; +import 'package:flutter_go/components/category.dart'; import '../widgets/404.dart'; -import '../common/full_screen_code_dialog.dart'; -import '../views/web_view_page.dart'; -import '../views/home.dart'; +import 'package:flutter_go/components/full_screen_code_dialog.dart'; +import 'package:flutter_go/views/web_page/web_view_page.dart'; +import 'package:flutter_go/views/first_page/home.dart'; // app的首页 var homeHandler = new Handler( diff --git a/lib/common/example_code_parser.dart b/lib/utils/example_code_parser.dart similarity index 100% rename from lib/common/example_code_parser.dart rename to lib/utils/example_code_parser.dart diff --git a/lib/common/high_light_code.dart b/lib/utils/high_light_code.dart similarity index 100% rename from lib/common/high_light_code.dart rename to lib/utils/high_light_code.dart diff --git a/lib/common/net_utils.dart b/lib/utils/net_utils.dart similarity index 100% rename from lib/common/net_utils.dart rename to lib/utils/net_utils.dart diff --git a/lib/common/provider.dart b/lib/utils/provider.dart similarity index 99% rename from lib/common/provider.dart rename to lib/utils/provider.dart index 6704fc9d..35a354c7 100644 --- a/lib/common/provider.dart +++ b/lib/utils/provider.dart @@ -59,7 +59,6 @@ class Provider { //Get a location using getDatabasesPath String databasesPath = await getDatabasesPath(); String path = join(databasesPath, 'flutter.db'); - try { db = await openDatabase(path); } catch (e) { diff --git a/lib/common/sql.dart b/lib/utils/sql.dart similarity index 100% rename from lib/common/sql.dart rename to lib/utils/sql.dart diff --git a/lib/common/style.dart b/lib/utils/style.dart similarity index 100% rename from lib/common/style.dart rename to lib/utils/style.dart diff --git a/lib/common/syntax_highlighter.dart b/lib/utils/syntax_highlighter.dart similarity index 100% rename from lib/common/syntax_highlighter.dart rename to lib/utils/syntax_highlighter.dart diff --git a/lib/common/util.dart b/lib/utils/util.dart similarity index 100% rename from lib/common/util.dart rename to lib/utils/util.dart diff --git a/lib/views/Detail.dart b/lib/views/Detail.dart deleted file mode 100644 index 0677a2bc..00000000 --- a/lib/views/Detail.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:flutter/material.dart'; - -class Detail extends StatelessWidget { - - final String id ; - Detail(this.id) ; - - - @override - Widget build(BuildContext context) { - return new Scaffold( - appBar: new AppBar( - title: new Text('List Detail'), - ), - body: new Center( - child: new Text('msg:'+ 'id='+id), - ), - ) ; - } - - -} \ No newline at end of file diff --git a/lib/views/collection_page.dart b/lib/views/collection_page/collection_page.dart similarity index 93% rename from lib/views/collection_page.dart rename to lib/views/collection_page/collection_page.dart index e943a813..0e153a59 100644 --- a/lib/views/collection_page.dart +++ b/lib/views/collection_page/collection_page.dart @@ -5,11 +5,11 @@ * @Last Modified time: 2019-01-14 20:13:28 */ import 'package:flutter/material.dart'; -import '../model/collection.dart'; -import '../routers/application.dart'; -import '../routers/routers.dart'; -import '../event/event_bus.dart'; -import '../event/event_model.dart'; +import 'package:flutter_go/model/collection.dart'; +import 'package:flutter_go/routers/application.dart'; +import 'package:flutter_go/routers/routers.dart'; +import 'package:flutter_go/event/event_bus.dart'; +import 'package:flutter_go/event/event_model.dart'; import 'package:event_bus/event_bus.dart'; class CollectionPage extends StatefulWidget { diff --git a/lib/views/detail.dart b/lib/views/detail.dart deleted file mode 100644 index 0677a2bc..00000000 --- a/lib/views/detail.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:flutter/material.dart'; - -class Detail extends StatelessWidget { - - final String id ; - Detail(this.id) ; - - - @override - Widget build(BuildContext context) { - return new Scaffold( - appBar: new AppBar( - title: new Text('List Detail'), - ), - body: new Center( - child: new Text('msg:'+ 'id='+id), - ), - ) ; - } - - -} \ No newline at end of file diff --git a/lib/views/first_page.dart b/lib/views/first_page/first_page.dart similarity index 95% rename from lib/views/first_page.dart rename to lib/views/first_page/first_page.dart index 38b65e22..a7f8feb8 100644 --- a/lib/views/first_page.dart +++ b/lib/views/first_page/first_page.dart @@ -1,13 +1,13 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:flutter_go/common/list_view_item.dart'; +import 'package:flutter_go/components/list_view_item.dart'; import 'package:flutter_go/components/list_refresh.dart' as listComp; import 'package:flutter_go/components/pagination.dart'; -import 'package:flutter_go/components/first_page_item.dart'; +import 'package:flutter_go/views/first_page/first_page_item.dart'; import 'package:flutter_go/components/disclaimer_msg.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import '../common/net_utils.dart'; +import 'package:flutter_go/utils/net_utils.dart'; GlobalKey key; diff --git a/lib/components/first_page_item.dart b/lib/views/first_page/first_page_item.dart similarity index 96% rename from lib/components/first_page_item.dart rename to lib/views/first_page/first_page_item.dart index 3e4e8604..0c6a9ff9 100644 --- a/lib/components/first_page_item.dart +++ b/lib/views/first_page/first_page_item.dart @@ -7,7 +7,7 @@ * tartget: FirstPageItem */ -import '../common/Util.dart'; +import 'package:flutter_go/utils/util.dart'; class FirstPageItem { bool hot; diff --git a/lib/views/home.dart b/lib/views/first_page/home.dart similarity index 90% rename from lib/views/home.dart rename to lib/views/first_page/home.dart index 4eb9b49d..f82b5e77 100644 --- a/lib/views/home.dart +++ b/lib/views/first_page/home.dart @@ -12,16 +12,16 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'first_page.dart'; -import 'widget_page.dart'; +import 'package:flutter_go/views/first_page/first_page.dart'; +import 'package:flutter_go/views/widget_page/widget_page.dart'; import 'package:flutter_go/views/welcome_page/fourth_page.dart'; -import 'collection_page.dart'; -import '../routers/application.dart'; -import '../common/provider.dart'; -import '../model/widget.dart'; -import '../widgets/index.dart'; +import 'package:flutter_go/views/collection_page/collection_page.dart'; +import 'package:flutter_go/routers/application.dart'; +import 'package:flutter_go/utils//provider.dart'; +import 'package:flutter_go/model/widget.dart'; +import 'package:flutter_go/widgets/index.dart'; import 'package:flutter_go/components/search_input.dart'; -import '../common/widget_name_to_icon.dart'; +import 'package:flutter_go/resources/widget_name_to_icon.dart'; const int ThemeColor = 0xFFC91B3A; diff --git a/lib/components/fourth_page_feature/page_dragger.dart b/lib/views/fourth_page/page_dragger.dart similarity index 98% rename from lib/components/fourth_page_feature/page_dragger.dart rename to lib/views/fourth_page/page_dragger.dart index 5b00e29f..6ba965b1 100644 --- a/lib/components/fourth_page_feature/page_dragger.dart +++ b/lib/views/fourth_page/page_dragger.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'dart:ui'; import 'package:flutter/material.dart'; -import './pager_indicator.dart'; +import 'package:flutter_go/views/fourth_page/pager_indicator.dart'; class PageDragger extends StatefulWidget { diff --git a/lib/components/fourth_page_feature/page_reveal.dart b/lib/views/fourth_page/page_reveal.dart similarity index 100% rename from lib/components/fourth_page_feature/page_reveal.dart rename to lib/views/fourth_page/page_reveal.dart diff --git a/lib/components/fourth_page_feature/pager_indicator.dart b/lib/views/fourth_page/pager_indicator.dart similarity index 98% rename from lib/components/fourth_page_feature/pager_indicator.dart rename to lib/views/fourth_page/pager_indicator.dart index 4bb7db55..e9e93ee9 100644 --- a/lib/components/fourth_page_feature/pager_indicator.dart +++ b/lib/views/fourth_page/pager_indicator.dart @@ -1,7 +1,7 @@ import 'dart:ui'; import 'package:flutter/material.dart'; -import './pages.dart'; +import 'package:flutter_go/views/fourth_page/pages.dart'; class PagerIndicator extends StatelessWidget { diff --git a/lib/components/fourth_page_feature/pages.dart b/lib/views/fourth_page/pages.dart similarity index 100% rename from lib/components/fourth_page_feature/pages.dart rename to lib/views/fourth_page/pages.dart diff --git a/lib/views/web_view_page.dart b/lib/views/web_page/web_view_page.dart similarity index 94% rename from lib/views/web_view_page.dart rename to lib/views/web_page/web_view_page.dart index da53c71c..bb4eb0ce 100644 --- a/lib/views/web_view_page.dart +++ b/lib/views/web_page/web_view_page.dart @@ -6,9 +6,9 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_webview_plugin/flutter_webview_plugin.dart'; -import '../model/collection.dart'; -import '../event/event_bus.dart'; -import '../event/event_model.dart'; +import 'package:flutter_go/model/collection.dart'; +import 'package:flutter_go/event/event_bus.dart'; +import 'package:flutter_go/event/event_model.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'dart:core'; @@ -27,7 +27,7 @@ class _WebViewPageState extends State { CollectionControlModel _collectionControl = new CollectionControlModel(); void showInSnackBar(String value) { - Fluttertoast.instance.showToast( + Fluttertoast.showToast( msg: value, toastLength: Toast.LENGTH_SHORT, gravity: ToastGravity.CENTER, diff --git a/lib/views/welcome_page/fourth_page.dart b/lib/views/welcome_page/fourth_page.dart index 6c80423e..26ec7df1 100644 --- a/lib/views/welcome_page/fourth_page.dart +++ b/lib/views/welcome_page/fourth_page.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:flutter_go/components/fourth_page_feature/page_dragger.dart'; -import 'package:flutter_go/components/fourth_page_feature/page_reveal.dart'; -import 'package:flutter_go/components/fourth_page_feature/pager_indicator.dart'; -import 'package:flutter_go/components/fourth_page_feature/pages.dart'; +import 'package:flutter_go/views/fourth_page/page_dragger.dart'; +import 'package:flutter_go/views/fourth_page/page_reveal.dart'; +import 'package:flutter_go/views/fourth_page/pager_indicator.dart'; +import 'package:flutter_go/views/fourth_page/pages.dart'; class FourthPage extends StatefulWidget { @override diff --git a/lib/views/widget_page.dart b/lib/views/widget_page/widget_page.dart similarity index 97% rename from lib/views/widget_page.dart rename to lib/views/widget_page/widget_page.dart index baa6666b..9abde027 100644 --- a/lib/views/widget_page.dart +++ b/lib/views/widget_page/widget_page.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_go/components/cate_card.dart'; -import '../model/cat.dart'; +import 'package:flutter_go/model/cat.dart'; class WidgetPage extends StatefulWidget { final db; diff --git a/lib/widgets/components/Bar/AppBar/index.dart b/lib/widgets/components/Bar/AppBar/index.dart index 5282d352..82bdf8c1 100644 --- a/lib/widgets/components/Bar/AppBar/index.dart +++ b/lib/widgets/components/Bar/AppBar/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: AppBar 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Bar/BottomAppBar/index.dart b/lib/widgets/components/Bar/BottomAppBar/index.dart index 4e70c2f6..18c2d159 100644 --- a/lib/widgets/components/Bar/BottomAppBar/index.dart +++ b/lib/widgets/components/Bar/BottomAppBar/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: BottomAppBar 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Bar/ButtonBar/index.dart b/lib/widgets/components/Bar/ButtonBar/index.dart index bce2b1ce..8c9de1ff 100644 --- a/lib/widgets/components/Bar/ButtonBar/index.dart +++ b/lib/widgets/components/Bar/ButtonBar/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: ButtonBar 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart b/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart index d6dbc972..80f27150 100644 --- a/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart +++ b/lib/widgets/components/Bar/FlexibleSpaceBar/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: FlexibleSpaceBar 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Bar/SliverAppBar/index.dart b/lib/widgets/components/Bar/SliverAppBar/index.dart index 4205f09d..367b5216 100644 --- a/lib/widgets/components/Bar/SliverAppBar/index.dart +++ b/lib/widgets/components/Bar/SliverAppBar/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: SliverAppBar 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Bar/SnackBar/index.dart b/lib/widgets/components/Bar/SnackBar/index.dart index 4e7adbb2..2047f783 100644 --- a/lib/widgets/components/Bar/SnackBar/index.dart +++ b/lib/widgets/components/Bar/SnackBar/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: SnackBar 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Bar/SnackBarAction/index.dart b/lib/widgets/components/Bar/SnackBarAction/index.dart index 4d213c0c..964eefd8 100644 --- a/lib/widgets/components/Bar/SnackBarAction/index.dart +++ b/lib/widgets/components/Bar/SnackBarAction/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: SnackBarAction 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import './demo.dart' as SnackBarDemo; diff --git a/lib/widgets/components/Bar/TabBar/index.dart b/lib/widgets/components/Bar/TabBar/index.dart index bb2b364d..e8474d19 100644 --- a/lib/widgets/components/Bar/TabBar/index.dart +++ b/lib/widgets/components/Bar/TabBar/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: SnackBarAction 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import './demo.dart'; diff --git a/lib/widgets/components/Card/Card/index.dart b/lib/widgets/components/Card/Card/index.dart index 0ee2d452..5ee1fbb5 100644 --- a/lib/widgets/components/Card/Card/index.dart +++ b/lib/widgets/components/Card/Card/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: Card 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Chip/Chip/index.dart b/lib/widgets/components/Chip/Chip/index.dart index ac24f469..89496515 100644 --- a/lib/widgets/components/Chip/Chip/index.dart +++ b/lib/widgets/components/Chip/Chip/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-18 15:13:23 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Chip/ChipTheme/index.dart b/lib/widgets/components/Chip/ChipTheme/index.dart index e4ff62fe..ecf2865a 100644 --- a/lib/widgets/components/Chip/ChipTheme/index.dart +++ b/lib/widgets/components/Chip/ChipTheme/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-18 15:14:03 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Chip/ChipThemeData/index.dart b/lib/widgets/components/Chip/ChipThemeData/index.dart index 908b4c6f..bc2d7599 100644 --- a/lib/widgets/components/Chip/ChipThemeData/index.dart +++ b/lib/widgets/components/Chip/ChipThemeData/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-18 17:38:56 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Chip/ChoiceChip/index.dart b/lib/widgets/components/Chip/ChoiceChip/index.dart index 62f43080..31e75a8c 100644 --- a/lib/widgets/components/Chip/ChoiceChip/index.dart +++ b/lib/widgets/components/Chip/ChoiceChip/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Chip/FilterChip/index.dart b/lib/widgets/components/Chip/FilterChip/index.dart index a7a7db79..d57aea7b 100644 --- a/lib/widgets/components/Chip/FilterChip/index.dart +++ b/lib/widgets/components/Chip/FilterChip/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-21 10:25:22 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Chip/RawChip/index.dart b/lib/widgets/components/Chip/RawChip/index.dart index abebb064..10fff9e8 100644 --- a/lib/widgets/components/Chip/RawChip/index.dart +++ b/lib/widgets/components/Chip/RawChip/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Chip/inputChip/index.dart b/lib/widgets/components/Chip/inputChip/index.dart index af0f09ab..99f62d4f 100644 --- a/lib/widgets/components/Chip/inputChip/index.dart +++ b/lib/widgets/components/Chip/inputChip/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Dialog/AboutDialog/index.dart b/lib/widgets/components/Dialog/AboutDialog/index.dart index ea0c01ac..6aae793c 100644 --- a/lib/widgets/components/Dialog/AboutDialog/index.dart +++ b/lib/widgets/components/Dialog/AboutDialog/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/Dialog/AlertDialog/index.dart b/lib/widgets/components/Dialog/AlertDialog/index.dart index e9364564..829496e3 100644 --- a/lib/widgets/components/Dialog/AlertDialog/index.dart +++ b/lib/widgets/components/Dialog/AlertDialog/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/Dialog/Dialog/index.dart b/lib/widgets/components/Dialog/Dialog/index.dart index 626cdc92..371c1ad8 100644 --- a/lib/widgets/components/Dialog/Dialog/index.dart +++ b/lib/widgets/components/Dialog/Dialog/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/Dialog/SimpleDialog/index.dart b/lib/widgets/components/Dialog/SimpleDialog/index.dart index 4f607d73..3475f063 100644 --- a/lib/widgets/components/Dialog/SimpleDialog/index.dart +++ b/lib/widgets/components/Dialog/SimpleDialog/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/Grid/GridPaper/index.dart b/lib/widgets/components/Grid/GridPaper/index.dart index 1044d44a..118aef20 100644 --- a/lib/widgets/components/Grid/GridPaper/index.dart +++ b/lib/widgets/components/Grid/GridPaper/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/Grid/GridTile/index.dart b/lib/widgets/components/Grid/GridTile/index.dart index f1b119b1..2bf3c7e7 100644 --- a/lib/widgets/components/Grid/GridTile/index.dart +++ b/lib/widgets/components/Grid/GridTile/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/Grid/GridTileBar/index.dart b/lib/widgets/components/Grid/GridTileBar/index.dart index b19b8abd..66b67469 100644 --- a/lib/widgets/components/Grid/GridTileBar/index.dart +++ b/lib/widgets/components/Grid/GridTileBar/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/Grid/GridView/index.dart b/lib/widgets/components/Grid/GridView/index.dart index dac9fcd2..fe20e46a 100644 --- a/lib/widgets/components/Grid/GridView/index.dart +++ b/lib/widgets/components/Grid/GridView/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/Grid/SliverGrid/index.dart b/lib/widgets/components/Grid/SliverGrid/index.dart index 6b8c2a6a..926387af 100644 --- a/lib/widgets/components/Grid/SliverGrid/index.dart +++ b/lib/widgets/components/Grid/SliverGrid/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/LIst/AnimatedList/index.dart b/lib/widgets/components/LIst/AnimatedList/index.dart index 39a82dcf..2392ab46 100644 --- a/lib/widgets/components/LIst/AnimatedList/index.dart +++ b/lib/widgets/components/LIst/AnimatedList/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: AnimatedList 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; diff --git a/lib/widgets/components/LIst/ListBody/index.dart b/lib/widgets/components/LIst/ListBody/index.dart index 8dc071da..1699540b 100644 --- a/lib/widgets/components/LIst/ListBody/index.dart +++ b/lib/widgets/components/LIst/ListBody/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: ListBody 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/LIst/ListView/index.dart b/lib/widgets/components/LIst/ListView/index.dart index 375d50ad..1bbebf52 100644 --- a/lib/widgets/components/LIst/ListView/index.dart +++ b/lib/widgets/components/LIst/ListView/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: ListView 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; diff --git a/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart b/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart index d595e580..8bbe3dce 100644 --- a/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart +++ b/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-27 15:37:04 */ import 'package:flutter/material.dart'; -import 'package:fluttertoast/fluttertoast.dart'; +//import 'package:fluttertoast/fluttertoast.dart'; class CheckedPopupMenuItemDemo extends StatefulWidget { _CheckedPopupMenuItemDemoState createState() => diff --git a/lib/widgets/components/Menu/CheckedPopupMenuItem/index.dart b/lib/widgets/components/Menu/CheckedPopupMenuItem/index.dart index ddbed396..3264f1f8 100644 --- a/lib/widgets/components/Menu/CheckedPopupMenuItem/index.dart +++ b/lib/widgets/components/Menu/CheckedPopupMenuItem/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-22 21:26:54 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Menu/DropdownMenuItem/index.dart b/lib/widgets/components/Menu/DropdownMenuItem/index.dart index 4d50b003..9180cd4e 100644 --- a/lib/widgets/components/Menu/DropdownMenuItem/index.dart +++ b/lib/widgets/components/Menu/DropdownMenuItem/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-27 14:51:44 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; diff --git a/lib/widgets/components/Menu/PopupMenuButton/index.dart b/lib/widgets/components/Menu/PopupMenuButton/index.dart index ae6b45e9..cc98d67b 100644 --- a/lib/widgets/components/Menu/PopupMenuButton/index.dart +++ b/lib/widgets/components/Menu/PopupMenuButton/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-27 15:44:31 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Menu/PopupMenuDivider/index.dart b/lib/widgets/components/Menu/PopupMenuDivider/index.dart index f504ac82..92beca57 100644 --- a/lib/widgets/components/Menu/PopupMenuDivider/index.dart +++ b/lib/widgets/components/Menu/PopupMenuDivider/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-27 15:55:22 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Menu/PopupMenuEntry/index.dart b/lib/widgets/components/Menu/PopupMenuEntry/index.dart index e398bd8d..e5c46fe9 100644 --- a/lib/widgets/components/Menu/PopupMenuEntry/index.dart +++ b/lib/widgets/components/Menu/PopupMenuEntry/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-27 16:06:20 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import '../PopupMenuDivider/demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Menu/PopupMenuItem/index.dart b/lib/widgets/components/Menu/PopupMenuItem/index.dart index a5aa8090..f8b8e315 100644 --- a/lib/widgets/components/Menu/PopupMenuItem/index.dart +++ b/lib/widgets/components/Menu/PopupMenuItem/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-29 15:07:16 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import '../PopupMenuDivider/demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Menu/PopupMenuItemState/index.dart b/lib/widgets/components/Menu/PopupMenuItemState/index.dart index 036c5eeb..b86d20dc 100644 --- a/lib/widgets/components/Menu/PopupMenuItemState/index.dart +++ b/lib/widgets/components/Menu/PopupMenuItemState/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-29 16:22:06 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import '../PopupMenuDivider/demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Navigation/BottomNavigationBar/index.dart b/lib/widgets/components/Navigation/BottomNavigationBar/index.dart index 46860484..c73376fc 100644 --- a/lib/widgets/components/Navigation/BottomNavigationBar/index.dart +++ b/lib/widgets/components/Navigation/BottomNavigationBar/index.dart @@ -8,7 +8,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import './demo.dart' as BottomNavigationBarDemo; diff --git a/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart b/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart index 00b042df..c1589873 100644 --- a/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart +++ b/lib/widgets/components/Navigation/BottomNavigationBarItem/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: BottomNavigationBarItem 的示例 */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/components/Panel/ExpansionPanel/index.dart b/lib/widgets/components/Panel/ExpansionPanel/index.dart index fba23ad7..6e8c8072 100644 --- a/lib/widgets/components/Panel/ExpansionPanel/index.dart +++ b/lib/widgets/components/Panel/ExpansionPanel/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Panel/ExpansionPanelList/index.dart b/lib/widgets/components/Panel/ExpansionPanelList/index.dart index ede5dfcc..4117bd4e 100644 --- a/lib/widgets/components/Panel/ExpansionPanelList/index.dart +++ b/lib/widgets/components/Panel/ExpansionPanelList/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Panel/ExpansionPanelRadio/index.dart b/lib/widgets/components/Panel/ExpansionPanelRadio/index.dart index 8c9c3c6f..25f87de7 100644 --- a/lib/widgets/components/Panel/ExpansionPanelRadio/index.dart +++ b/lib/widgets/components/Panel/ExpansionPanelRadio/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; // import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Pick/DayPicker/index.dart b/lib/widgets/components/Pick/DayPicker/index.dart index d171fc18..3eb2c430 100644 --- a/lib/widgets/components/Pick/DayPicker/index.dart +++ b/lib/widgets/components/Pick/DayPicker/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-17 15:50:02 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Pick/MonthPicker/index.dart b/lib/widgets/components/Pick/MonthPicker/index.dart index cba6ca2a..8ff651a0 100644 --- a/lib/widgets/components/Pick/MonthPicker/index.dart +++ b/lib/widgets/components/Pick/MonthPicker/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-17 17:06:34 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Pick/ShowdatePicker/index.dart b/lib/widgets/components/Pick/ShowdatePicker/index.dart index b19a4c64..3ed5a1dc 100644 --- a/lib/widgets/components/Pick/ShowdatePicker/index.dart +++ b/lib/widgets/components/Pick/ShowdatePicker/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-17 16:00:07 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Pick/YearPicker/index.dart b/lib/widgets/components/Pick/YearPicker/index.dart index cdce256e..db6c88ed 100644 --- a/lib/widgets/components/Pick/YearPicker/index.dart +++ b/lib/widgets/components/Pick/YearPicker/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-17 16:00:07 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Progress/CircularProgressIndicator/index.dart b/lib/widgets/components/Progress/CircularProgressIndicator/index.dart index ac0367c9..5a44e5e7 100644 --- a/lib/widgets/components/Progress/CircularProgressIndicator/index.dart +++ b/lib/widgets/components/Progress/CircularProgressIndicator/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-17 16:00:07 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Progress/LinearProgressIndicator/index.dart b/lib/widgets/components/Progress/LinearProgressIndicator/index.dart index 0f1082a0..9d2c1a32 100644 --- a/lib/widgets/components/Progress/LinearProgressIndicator/index.dart +++ b/lib/widgets/components/Progress/LinearProgressIndicator/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-17 16:00:07 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart b/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart index a29d07ca..bd447cc9 100644 --- a/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart +++ b/lib/widgets/components/Progress/RefreshProgressIndicator/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-17 16:00:07 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const String content0 = ''' ### **简介** diff --git a/lib/widgets/components/Scaffold/Scaffold/index.dart b/lib/widgets/components/Scaffold/Scaffold/index.dart index 9415293e..95b0d9ce 100644 --- a/lib/widgets/components/Scaffold/Scaffold/index.dart +++ b/lib/widgets/components/Scaffold/Scaffold/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/Scaffold/ScaffoldState/index.dart b/lib/widgets/components/Scaffold/ScaffoldState/index.dart index 2abc155c..1993424b 100644 --- a/lib/widgets/components/Scaffold/ScaffoldState/index.dart +++ b/lib/widgets/components/Scaffold/ScaffoldState/index.dart @@ -6,7 +6,7 @@ * email: sanfan.hx@alibaba-inc.com * tartget: xxx */ -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'demo.dart'; diff --git a/lib/widgets/components/Scroll/BoxScrollView/index.dart b/lib/widgets/components/Scroll/BoxScrollView/index.dart index 31e892f9..0c155d66 100644 --- a/lib/widgets/components/Scroll/BoxScrollView/index.dart +++ b/lib/widgets/components/Scroll/BoxScrollView/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-17 13:34:46 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Scroll/CustomScrollView/index.dart b/lib/widgets/components/Scroll/CustomScrollView/index.dart index 88f2e9d4..13940ed1 100644 --- a/lib/widgets/components/Scroll/CustomScrollView/index.dart +++ b/lib/widgets/components/Scroll/CustomScrollView/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-20 14:08:29 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Scroll/NestedScrollView/index.dart b/lib/widgets/components/Scroll/NestedScrollView/index.dart index f9786607..1fdc125f 100644 --- a/lib/widgets/components/Scroll/NestedScrollView/index.dart +++ b/lib/widgets/components/Scroll/NestedScrollView/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Scroll/ScrollMetrics/index.dart b/lib/widgets/components/Scroll/ScrollMetrics/index.dart index 48b3fe02..86be701c 100644 --- a/lib/widgets/components/Scroll/ScrollMetrics/index.dart +++ b/lib/widgets/components/Scroll/ScrollMetrics/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-15 20:33:47 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Scroll/ScrollPhysics/index.dart b/lib/widgets/components/Scroll/ScrollPhysics/index.dart index 4af9aa12..bb8bfddc 100644 --- a/lib/widgets/components/Scroll/ScrollPhysics/index.dart +++ b/lib/widgets/components/Scroll/ScrollPhysics/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-15 21:26:11 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/components/Scroll/ScrollView/index.dart b/lib/widgets/components/Scroll/ScrollView/index.dart index 9dbe8887..8ec5aad3 100644 --- a/lib/widgets/components/Scroll/ScrollView/index.dart +++ b/lib/widgets/components/Scroll/ScrollView/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-14 20:36:57 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; diff --git a/lib/widgets/components/Scroll/Scrollable/index.dart b/lib/widgets/components/Scroll/Scrollable/index.dart index d8f94a7e..8ec4c9f3 100644 --- a/lib/widgets/components/Scroll/Scrollable/index.dart +++ b/lib/widgets/components/Scroll/Scrollable/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-15 17:05:20 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String contentText0 = ''' diff --git a/lib/widgets/components/Scroll/ScrollbarPainter/index.dart b/lib/widgets/components/Scroll/ScrollbarPainter/index.dart index 5cb56ce0..0914a6d8 100644 --- a/lib/widgets/components/Scroll/ScrollbarPainter/index.dart +++ b/lib/widgets/components/Scroll/ScrollbarPainter/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-15 19:38:18 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String contentText0 = ''' diff --git a/lib/widgets/components/Tab/Tab/index.dart b/lib/widgets/components/Tab/Tab/index.dart index f2815315..165fb9e0 100644 --- a/lib/widgets/components/Tab/Tab/index.dart +++ b/lib/widgets/components/Tab/Tab/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-22 20:49:56 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/elements/Form/Button/DropdownButton/index.dart b/lib/widgets/elements/Form/Button/DropdownButton/index.dart index 4274f5dc..b6f98d4e 100644 --- a/lib/widgets/elements/Form/Button/DropdownButton/index.dart +++ b/lib/widgets/elements/Form/Button/DropdownButton/index.dart @@ -7,7 +7,7 @@ * target: DropdownButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/DropdownButton-class.html */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/elements/Form/Button/FlatButton/index.dart b/lib/widgets/elements/Form/Button/FlatButton/index.dart index 58fa6ba3..faf80259 100644 --- a/lib/widgets/elements/Form/Button/FlatButton/index.dart +++ b/lib/widgets/elements/Form/Button/FlatButton/index.dart @@ -7,7 +7,7 @@ * target: FlatButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/FlatButton-class.html */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart b/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart index efabb752..e7cbb728 100644 --- a/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart +++ b/lib/widgets/elements/Form/Button/FloatingActionButton/index.dart @@ -7,7 +7,7 @@ * target: FloatingActionButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/FloatingActionButton-class.html */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/elements/Form/Button/IconButton/demo.dart b/lib/widgets/elements/Form/Button/IconButton/demo.dart index cb7a9baa..d59f5a13 100644 --- a/lib/widgets/elements/Form/Button/IconButton/demo.dart +++ b/lib/widgets/elements/Form/Button/IconButton/demo.dart @@ -9,7 +9,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:flutter_go/common/icon_names.dart'; +import 'package:flutter_go/resources/icon_names.dart'; final int len = IconNames.names.length; diff --git a/lib/widgets/elements/Form/Button/IconButton/index.dart b/lib/widgets/elements/Form/Button/IconButton/index.dart index 1d742771..278173b9 100644 --- a/lib/widgets/elements/Form/Button/IconButton/index.dart +++ b/lib/widgets/elements/Form/Button/IconButton/index.dart @@ -7,7 +7,7 @@ * target: IconButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/IconButton-class.html */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/elements/Form/Button/OutlineButton/index.dart b/lib/widgets/elements/Form/Button/OutlineButton/index.dart index 8c2aaa26..8ab15911 100644 --- a/lib/widgets/elements/Form/Button/OutlineButton/index.dart +++ b/lib/widgets/elements/Form/Button/OutlineButton/index.dart @@ -7,7 +7,7 @@ * target: OutlineButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/OutlineButton-class.html */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart b/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart index bb708a73..1ddcc856 100644 --- a/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart +++ b/lib/widgets/elements/Form/Button/PopupMenuButton/index.dart @@ -8,7 +8,7 @@ * 对应文档地址:https://docs.flutter.io/flutter/material/PopupMenuButton-class.html */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; diff --git a/lib/widgets/elements/Form/Button/RaisedButton/index.dart b/lib/widgets/elements/Form/Button/RaisedButton/index.dart index 26d7ad7e..9342f00e 100644 --- a/lib/widgets/elements/Form/Button/RaisedButton/index.dart +++ b/lib/widgets/elements/Form/Button/RaisedButton/index.dart @@ -7,7 +7,7 @@ * target: RaisedButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/RaisedButton-class.html */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart b/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart index 3bffb8cd..24a44bd8 100644 --- a/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart +++ b/lib/widgets/elements/Form/Button/RawMaterialButton/index.dart @@ -7,7 +7,7 @@ * target: RawMaterialButton 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/RawMaterialButton-class.html */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'dart:math'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart b/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart index aeb49130..b99b354c 100644 --- a/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart +++ b/lib/widgets/elements/Form/CheckBox/Checkbox/index.dart @@ -7,7 +7,7 @@ * target: Checkbox 的示例 * 对应文档地址:https://docs.flutter.io/flutter/material/Checkbox-class.html */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart index ba41a1cc..f065e227 100644 --- a/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart +++ b/lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart @@ -6,7 +6,7 @@ * email: zhu.yan@alibaba-inc.com * tartget: CheckboxListTile 的示例 */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/elements/Form/Input/TextField/index.dart b/lib/widgets/elements/Form/Input/TextField/index.dart index 1b353f52..3bb65ae5 100644 --- a/lib/widgets/elements/Form/Input/TextField/index.dart +++ b/lib/widgets/elements/Form/Input/TextField/index.dart @@ -8,7 +8,7 @@ * 对应文档地址:https://docs.flutter.io/flutter/material/TextField-class.html */ -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter/material.dart'; import './text_field_demo.dart'; diff --git a/lib/widgets/elements/Form/Radio/Radio/index.dart b/lib/widgets/elements/Form/Radio/Radio/index.dart index bfbaf098..0d8a280b 100644 --- a/lib/widgets/elements/Form/Radio/Radio/index.dart +++ b/lib/widgets/elements/Form/Radio/Radio/index.dart @@ -8,7 +8,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const content1 = """ # Radio diff --git a/lib/widgets/elements/Form/Radio/RadioListTile/index.dart b/lib/widgets/elements/Form/Radio/RadioListTile/index.dart index eaac6d60..b7a32288 100644 --- a/lib/widgets/elements/Form/Radio/RadioListTile/index.dart +++ b/lib/widgets/elements/Form/Radio/RadioListTile/index.dart @@ -8,7 +8,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const content1 = """ # RadioListTile diff --git a/lib/widgets/elements/Form/Slider/Slider/index.dart b/lib/widgets/elements/Form/Slider/Slider/index.dart index 2f6a6dfc..42392f36 100644 --- a/lib/widgets/elements/Form/Slider/Slider/index.dart +++ b/lib/widgets/elements/Form/Slider/Slider/index.dart @@ -8,7 +8,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const contentA = ''' diff --git a/lib/widgets/elements/Form/Slider/SliderTheme/index.dart b/lib/widgets/elements/Form/Slider/SliderTheme/index.dart index a21eaa90..b930fef2 100644 --- a/lib/widgets/elements/Form/Slider/SliderTheme/index.dart +++ b/lib/widgets/elements/Form/Slider/SliderTheme/index.dart @@ -8,7 +8,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const contentA = ''' diff --git a/lib/widgets/elements/Form/Slider/SliderThemeData/index.dart b/lib/widgets/elements/Form/Slider/SliderThemeData/index.dart index 647d1bba..43e7b736 100644 --- a/lib/widgets/elements/Form/Slider/SliderThemeData/index.dart +++ b/lib/widgets/elements/Form/Slider/SliderThemeData/index.dart @@ -8,7 +8,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const contentA = ''' diff --git a/lib/widgets/elements/Form/Switch/AnimatedSwitcher/index.dart b/lib/widgets/elements/Form/Switch/AnimatedSwitcher/index.dart index 357c5fe5..b2eeff2a 100644 --- a/lib/widgets/elements/Form/Switch/AnimatedSwitcher/index.dart +++ b/lib/widgets/elements/Form/Switch/AnimatedSwitcher/index.dart @@ -8,7 +8,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const contentA = ''' diff --git a/lib/widgets/elements/Form/Switch/Switch/index.dart b/lib/widgets/elements/Form/Switch/Switch/index.dart index 75b30205..ce55a73a 100644 --- a/lib/widgets/elements/Form/Switch/Switch/index.dart +++ b/lib/widgets/elements/Form/Switch/Switch/index.dart @@ -8,7 +8,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const contentA = ''' diff --git a/lib/widgets/elements/Form/Switch/SwitchListTile/index.dart b/lib/widgets/elements/Form/Switch/SwitchListTile/index.dart index a87c3240..ab935c09 100644 --- a/lib/widgets/elements/Form/Switch/SwitchListTile/index.dart +++ b/lib/widgets/elements/Form/Switch/SwitchListTile/index.dart @@ -8,7 +8,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const contentA = ''' diff --git a/lib/widgets/elements/Form/Text/RichText/index.dart b/lib/widgets/elements/Form/Text/RichText/index.dart index 1e8895fd..a010620b 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 '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 9cfc92f5..d3523fc0 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 'package:flutter_go/components/widget_demo.dart'; import '../../../../../components/markdown.dart'; const String intro = """ diff --git a/lib/widgets/elements/Frame/Align/Align/index.dart b/lib/widgets/elements/Frame/Align/Align/index.dart index c33438d3..46432a8f 100644 --- a/lib/widgets/elements/Frame/Align/Align/index.dart +++ b/lib/widgets/elements/Frame/Align/Align/index.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String _flatText0 = """ diff --git a/lib/widgets/elements/Frame/Box/ConstrainedBox/index.dart b/lib/widgets/elements/Frame/Box/ConstrainedBox/index.dart index b9fbc78c..17d29295 100644 --- a/lib/widgets/elements/Frame/Box/ConstrainedBox/index.dart +++ b/lib/widgets/elements/Frame/Box/ConstrainedBox/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 15:56:53 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String _Text = ''' diff --git a/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart b/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart index 8ad78bbd..79f4073d 100644 --- a/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart +++ b/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 15:56:49 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String _Text = """### **简介** diff --git a/lib/widgets/elements/Frame/Box/Fittedbox/index.dart b/lib/widgets/elements/Frame/Box/Fittedbox/index.dart index 18fac673..ef624730 100644 --- a/lib/widgets/elements/Frame/Box/Fittedbox/index.dart +++ b/lib/widgets/elements/Frame/Box/Fittedbox/index.dart @@ -8,7 +8,7 @@ * */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as fittedBox; const String Text0 = """ diff --git a/lib/widgets/elements/Frame/Box/LimitedBox/index.dart b/lib/widgets/elements/Frame/Box/LimitedBox/index.dart index 89dfdb58..fb7afc41 100644 --- a/lib/widgets/elements/Frame/Box/LimitedBox/index.dart +++ b/lib/widgets/elements/Frame/Box/LimitedBox/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 15:56:35 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String Text0 = """ diff --git a/lib/widgets/elements/Frame/Box/OverflowBox/index.dart b/lib/widgets/elements/Frame/Box/OverflowBox/index.dart index b0f49279..a67669a8 100644 --- a/lib/widgets/elements/Frame/Box/OverflowBox/index.dart +++ b/lib/widgets/elements/Frame/Box/OverflowBox/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 15:56:31 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as overflowBox; const String Text0 = """### **OverflowBox简介** diff --git a/lib/widgets/elements/Frame/Box/RenderBox/index.dart b/lib/widgets/elements/Frame/Box/RenderBox/index.dart index df740656..d0f3d6a2 100644 --- a/lib/widgets/elements/Frame/Box/RenderBox/index.dart +++ b/lib/widgets/elements/Frame/Box/RenderBox/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 15:56:26 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const String _Text = ''' ### **简介** diff --git a/lib/widgets/elements/Frame/Box/RotatedBox/index.dart b/lib/widgets/elements/Frame/Box/RotatedBox/index.dart index 2b4748f5..986f1922 100644 --- a/lib/widgets/elements/Frame/Box/RotatedBox/index.dart +++ b/lib/widgets/elements/Frame/Box/RotatedBox/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 15:56:13 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const String _Text = ''' diff --git a/lib/widgets/elements/Frame/Box/SizeBox/index.dart b/lib/widgets/elements/Frame/Box/SizeBox/index.dart index dab70e6d..e3f05461 100644 --- a/lib/widgets/elements/Frame/Box/SizeBox/index.dart +++ b/lib/widgets/elements/Frame/Box/SizeBox/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 15:55:46 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as sizeBox; class Demo extends StatefulWidget { diff --git a/lib/widgets/elements/Frame/Box/SizedOverflowBox/index.dart b/lib/widgets/elements/Frame/Box/SizedOverflowBox/index.dart index 6554d17d..961981d4 100644 --- a/lib/widgets/elements/Frame/Box/SizedOverflowBox/index.dart +++ b/lib/widgets/elements/Frame/Box/SizedOverflowBox/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 15:55:31 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as sizeBox; // const String _Text = """### **SizeBox简介** diff --git a/lib/widgets/elements/Frame/Box/TextBox/index.dart b/lib/widgets/elements/Frame/Box/TextBox/index.dart index cc48e960..f47298ee 100644 --- a/lib/widgets/elements/Frame/Box/TextBox/index.dart +++ b/lib/widgets/elements/Frame/Box/TextBox/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const String _Text = """### **TextBox简介** > 是一个包含一段文本的矩形 diff --git a/lib/widgets/elements/Frame/Box/UnconstrainedBox/index.dart b/lib/widgets/elements/Frame/Box/UnconstrainedBox/index.dart index 42f60123..a3db5461 100644 --- a/lib/widgets/elements/Frame/Box/UnconstrainedBox/index.dart +++ b/lib/widgets/elements/Frame/Box/UnconstrainedBox/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-08 16:00:14 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String Text0 = """### **简介** diff --git a/lib/widgets/elements/Frame/Expanded/Expanded/index.dart b/lib/widgets/elements/Frame/Expanded/Expanded/index.dart index c7d5a736..8500a80f 100644 --- a/lib/widgets/elements/Frame/Expanded/Expanded/index.dart +++ b/lib/widgets/elements/Frame/Expanded/Expanded/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './expanded_demo.dart'; const contentText0 = ''' diff --git a/lib/widgets/elements/Frame/Layout/Center/index.dart b/lib/widgets/elements/Frame/Layout/Center/index.dart index 96382d0e..1b32b881 100644 --- a/lib/widgets/elements/Frame/Layout/Center/index.dart +++ b/lib/widgets/elements/Frame/Layout/Center/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String Text0 = """### **简介** diff --git a/lib/widgets/elements/Frame/Layout/Column/index.dart b/lib/widgets/elements/Frame/Layout/Column/index.dart index bd190513..a03c8655 100644 --- a/lib/widgets/elements/Frame/Layout/Column/index.dart +++ b/lib/widgets/elements/Frame/Layout/Column/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String Text0 = """### **简介** diff --git a/lib/widgets/elements/Frame/Layout/Container/index.dart b/lib/widgets/elements/Frame/Layout/Container/index.dart index 6fbf8e97..67803119 100644 --- a/lib/widgets/elements/Frame/Layout/Container/index.dart +++ b/lib/widgets/elements/Frame/Layout/Container/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String Text0 = """### **简介** diff --git a/lib/widgets/elements/Frame/Layout/Row/index.dart b/lib/widgets/elements/Frame/Layout/Row/index.dart index a4e0d041..a93001df 100644 --- a/lib/widgets/elements/Frame/Layout/Row/index.dart +++ b/lib/widgets/elements/Frame/Layout/Row/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String Text0 = """### **简介** diff --git a/lib/widgets/elements/Frame/Spacing/AnimatedPadding/index.dart b/lib/widgets/elements/Frame/Spacing/AnimatedPadding/index.dart index bc1ea654..ee21afce 100644 --- a/lib/widgets/elements/Frame/Spacing/AnimatedPadding/index.dart +++ b/lib/widgets/elements/Frame/Spacing/AnimatedPadding/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-14 17:02:20 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './animatedPadding_demo.dart'; const contentDesc0 = ''' diff --git a/lib/widgets/elements/Frame/Spacing/Padding/index.dart b/lib/widgets/elements/Frame/Spacing/Padding/index.dart index 1a345608..f0876a47 100644 --- a/lib/widgets/elements/Frame/Spacing/Padding/index.dart +++ b/lib/widgets/elements/Frame/Spacing/Padding/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-14 17:01:55 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './padding_demo.dart'; const contentDesc0=''' diff --git a/lib/widgets/elements/Frame/Spacing/SliverPadding/index.dart b/lib/widgets/elements/Frame/Spacing/SliverPadding/index.dart index b919a156..788a4979 100644 --- a/lib/widgets/elements/Frame/Spacing/SliverPadding/index.dart +++ b/lib/widgets/elements/Frame/Spacing/SliverPadding/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-14 17:06:36 */ import 'package:flutter/material.dart'; -import 'package:flutter_go/common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './sliverpadding_demo.dart'; const contentDesc0 = ''' diff --git a/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart b/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart index bdafe5e3..a0103001 100644 --- a/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart +++ b/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String _stackText0 = """### **简介** diff --git a/lib/widgets/elements/Frame/Stack/Stack/index.dart b/lib/widgets/elements/Frame/Stack/Stack/index.dart index 6cdf56b9..f25d059b 100644 --- a/lib/widgets/elements/Frame/Stack/Stack/index.dart +++ b/lib/widgets/elements/Frame/Stack/Stack/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String _stackText0 = """### **简介** diff --git a/lib/widgets/elements/Frame/Table/Table/index.dart b/lib/widgets/elements/Frame/Table/Table/index.dart index c3137d7d..ac961f07 100644 --- a/lib/widgets/elements/Frame/Table/Table/index.dart +++ b/lib/widgets/elements/Frame/Table/Table/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './table_demo.dart'; const contentDesc0 = ''' diff --git a/lib/widgets/elements/Media/Icon/Icon/index.dart b/lib/widgets/elements/Media/Icon/Icon/index.dart index 83be570d..98532f8b 100644 --- a/lib/widgets/elements/Media/Icon/Icon/index.dart +++ b/lib/widgets/elements/Media/Icon/Icon/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const Text = ''' diff --git a/lib/widgets/elements/Media/Icon/IconData/index.dart b/lib/widgets/elements/Media/Icon/IconData/index.dart index 7c8479be..1f04174c 100644 --- a/lib/widgets/elements/Media/Icon/IconData/index.dart +++ b/lib/widgets/elements/Media/Icon/IconData/index.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'demo.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const Text = ''' ### **简介** diff --git a/lib/widgets/elements/Media/Icon/IconTheme/index.dart b/lib/widgets/elements/Media/Icon/IconTheme/index.dart index 19eb194a..5747d8b7 100644 --- a/lib/widgets/elements/Media/Icon/IconTheme/index.dart +++ b/lib/widgets/elements/Media/Icon/IconTheme/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const Text = ''' diff --git a/lib/widgets/elements/Media/Icon/IconThemeData/index.dart b/lib/widgets/elements/Media/Icon/IconThemeData/index.dart index 289b52d3..0a1c2900 100644 --- a/lib/widgets/elements/Media/Icon/IconThemeData/index.dart +++ b/lib/widgets/elements/Media/Icon/IconThemeData/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const Text = ''' diff --git a/lib/widgets/elements/Media/Icon/ImageIcon/index.dart b/lib/widgets/elements/Media/Icon/ImageIcon/index.dart index 1848e3cb..a5d2acd3 100644 --- a/lib/widgets/elements/Media/Icon/ImageIcon/index.dart +++ b/lib/widgets/elements/Media/Icon/ImageIcon/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const Text = ''' diff --git a/lib/widgets/elements/Media/Image/AssetImage/index.dart b/lib/widgets/elements/Media/Image/AssetImage/index.dart index 6290d1a8..cb9dc1c7 100644 --- a/lib/widgets/elements/Media/Image/AssetImage/index.dart +++ b/lib/widgets/elements/Media/Image/AssetImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-11-16 15:09:12 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './assetImage_demo.dart'; const contentText0 = ''' diff --git a/lib/widgets/elements/Media/Image/DecorationImage/index.dart b/lib/widgets/elements/Media/Image/DecorationImage/index.dart index 072d36e6..25d40d4c 100644 --- a/lib/widgets/elements/Media/Image/DecorationImage/index.dart +++ b/lib/widgets/elements/Media/Image/DecorationImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-11-16 15:12:39 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './decorationImage_demo.dart'; diff --git a/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart b/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart index 9aabe6fe..20d83db6 100644 --- a/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart +++ b/lib/widgets/elements/Media/Image/DecorationImagePainter/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-11-16 15:09:12 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const contentText0 = ''' ### **简介** diff --git a/lib/widgets/elements/Media/Image/ExactAssetImage/index.dart b/lib/widgets/elements/Media/Image/ExactAssetImage/index.dart index 350e48d2..b8b1af2d 100644 --- a/lib/widgets/elements/Media/Image/ExactAssetImage/index.dart +++ b/lib/widgets/elements/Media/Image/ExactAssetImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-08 14:12:21 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './exact_asset_image_demo.dart'; const contentText0 = ''' diff --git a/lib/widgets/elements/Media/Image/FadeInImage/index.dart b/lib/widgets/elements/Media/Image/FadeInImage/index.dart index a84461a9..6854f130 100644 --- a/lib/widgets/elements/Media/Image/FadeInImage/index.dart +++ b/lib/widgets/elements/Media/Image/FadeInImage/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './fade_in_image_demo.dart'; diff --git a/lib/widgets/elements/Media/Image/FileImage/index.dart b/lib/widgets/elements/Media/Image/FileImage/index.dart index 22e52f19..7119d097 100644 --- a/lib/widgets/elements/Media/Image/FileImage/index.dart +++ b/lib/widgets/elements/Media/Image/FileImage/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './file_image_demo.dart'; const contentText0 = ''' diff --git a/lib/widgets/elements/Media/Image/Image/index.dart b/lib/widgets/elements/Media/Image/Image/index.dart index 87adcd10..4d89505c 100644 --- a/lib/widgets/elements/Media/Image/Image/index.dart +++ b/lib/widgets/elements/Media/Image/Image/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; import './demo.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const String content0 = ''' ### **简介** diff --git a/lib/widgets/elements/Media/Image/MemoryImage/index.dart b/lib/widgets/elements/Media/Image/MemoryImage/index.dart index fb7fb42d..a7d42d87 100644 --- a/lib/widgets/elements/Media/Image/MemoryImage/index.dart +++ b/lib/widgets/elements/Media/Image/MemoryImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-08 20:48:28 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './memory_image_demo.dart'; const String _contentText0 = ''' diff --git a/lib/widgets/elements/Media/Image/NetworkImage/index.dart b/lib/widgets/elements/Media/Image/NetworkImage/index.dart index e03c55d7..b417e84c 100644 --- a/lib/widgets/elements/Media/Image/NetworkImage/index.dart +++ b/lib/widgets/elements/Media/Image/NetworkImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-08 17:32:57 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './network_image_demo.dart'; const contentText0 = ''' diff --git a/lib/widgets/elements/Media/Image/RawImage/index.dart b/lib/widgets/elements/Media/Image/RawImage/index.dart index 2fb7b03f..902f4a43 100644 --- a/lib/widgets/elements/Media/Image/RawImage/index.dart +++ b/lib/widgets/elements/Media/Image/RawImage/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; import './raw_image_demo.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const contentText0 = ''' ### **简介** diff --git a/lib/widgets/elements/Media/Image/paintImage/index.dart b/lib/widgets/elements/Media/Image/paintImage/index.dart index 51faa110..47f4b33d 100644 --- a/lib/widgets/elements/Media/Image/paintImage/index.dart +++ b/lib/widgets/elements/Media/Image/paintImage/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-08 20:19:01 */ import 'package:flutter/material.dart'; -import '../../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const String contentText0 = ''' ### **非Widget 待删除** diff --git a/lib/widgets/themes/Cupertino/CupertinoApp/index.dart b/lib/widgets/themes/Cupertino/CupertinoApp/index.dart index 21adb1d7..124c1658 100644 --- a/lib/widgets/themes/Cupertino/CupertinoApp/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoApp/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-07 15:52:45 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoButton/index.dart b/lib/widgets/themes/Cupertino/CupertinoButton/index.dart index 28c9d9f9..4f69f315 100644 --- a/lib/widgets/themes/Cupertino/CupertinoButton/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoButton/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoButton 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoColors/index.dart b/lib/widgets/themes/Cupertino/CupertinoColors/index.dart index b68cc15b..d8f5e6ca 100644 --- a/lib/widgets/themes/Cupertino/CupertinoColors/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoColors/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoButton 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart b/lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart index 12751a1a..0fca342c 100644 --- a/lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart +++ b/lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_go/common/icon_names.dart' as icon_names; +import 'package:flutter_go/resources/icon_names.dart' as icon_names; /* * CupertinoIcons 默认的实例 diff --git a/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart b/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart index 54026940..93b60c1d 100644 --- a/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoIcons/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoButton 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart index c907b3f3..939e791c 100644 --- a/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoNavigationBar/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoNavigationBar 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart b/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart index 3b442b76..e61ebc04 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPageRoute/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoPageRoute 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart b/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart index 050346ff..4e1808de 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPageScaffold/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoPageScaffold 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart b/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart index 30ab6e2e..24e93819 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPicker/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoPicker 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart b/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart index 742a6134..24d5a09a 100644 --- a/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoPopupSurface/index.dart @@ -7,7 +7,7 @@ * tartget: CupertinoPopupSurface 的示例 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart' as demoBox; const String content0 = ''' diff --git a/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart b/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart index cf8c4906..8e598703 100644 --- a/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoScrollbar/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_go/common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart b/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart index 061146de..2eb2d7c8 100644 --- a/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart +++ b/lib/widgets/themes/Cupertino/CupertinoSegmentedControl/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_go/common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart b/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart index 5895d1d1..9df6839b 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 'package:flutter_go/components/widget_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..6b48e1c5 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 'package:flutter_go/components/widget_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..1daee323 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 'package:flutter_go/components/widget_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..9aa300d1 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 'package:flutter_go/components/widget_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..0243367d 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 'package:flutter_go/components/widget_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..5cdb8516 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 'package:flutter_go/components/widget_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..b6c3b24c 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 'package:flutter_go/components/widget_demo.dart'; import 'demo.dart'; const Text0 = ''' ### **简介** diff --git a/lib/widgets/themes/Material/MaterialAccentColor/index.dart b/lib/widgets/themes/Material/MaterialAccentColor/index.dart index 66f39a3a..3e29db7d 100644 --- a/lib/widgets/themes/Material/MaterialAccentColor/index.dart +++ b/lib/widgets/themes/Material/MaterialAccentColor/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_go/common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart'; const Text0 = ''' diff --git a/lib/widgets/themes/Material/MaterialApp/index.dart b/lib/widgets/themes/Material/MaterialApp/index.dart index 9fce5d86..d6a9918b 100644 --- a/lib/widgets/themes/Material/MaterialApp/index.dart +++ b/lib/widgets/themes/Material/MaterialApp/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2019-01-07 15:52:45 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; const String content0 = ''' ### **简介** diff --git a/lib/widgets/themes/Material/MaterialButton/index.dart b/lib/widgets/themes/Material/MaterialButton/index.dart index 6658e2f2..7716f8a5 100644 --- a/lib/widgets/themes/Material/MaterialButton/index.dart +++ b/lib/widgets/themes/Material/MaterialButton/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-27 16:35:39 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/themes/Material/MaterialColor/index.dart b/lib/widgets/themes/Material/MaterialColor/index.dart index 106346a1..2d115912 100644 --- a/lib/widgets/themes/Material/MaterialColor/index.dart +++ b/lib/widgets/themes/Material/MaterialColor/index.dart @@ -5,7 +5,7 @@ * @Last Modified time: 2018-12-27 16:35:39 */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/lib/widgets/themes/Material/MaterialPageRoute/index.dart b/lib/widgets/themes/Material/MaterialPageRoute/index.dart index 0408084d..f4060185 100644 --- a/lib/widgets/themes/Material/MaterialPageRoute/index.dart +++ b/lib/widgets/themes/Material/MaterialPageRoute/index.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_go/common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const Text0 = ''' diff --git a/lib/widgets/themes/Material/MergeableMaterialItem/index.dart b/lib/widgets/themes/Material/MergeableMaterialItem/index.dart index 7bd1a322..291de1f0 100644 --- a/lib/widgets/themes/Material/MergeableMaterialItem/index.dart +++ b/lib/widgets/themes/Material/MergeableMaterialItem/index.dart @@ -6,7 +6,7 @@ */ import 'package:flutter/material.dart'; -import '../../../../common/widget_demo.dart'; +import 'package:flutter_go/components/widget_demo.dart'; import './demo.dart'; const String content0 = ''' diff --git a/pubspec.yaml b/pubspec.yaml index 705af0ec..9bb5b803 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -174,17 +174,18 @@ flutter: - assets/app.db - assets/images/ - assets/fonts/ - - lib/common/example_code_parser.dart - - lib/common/syntax_highlighter.dart + - lib/utils/example_code_parser.dart + - lib/utils/syntax_highlighter.dart fonts: - family: FlamanteRoma fonts: - asset: assets/fonts/Flamante-Roma-Medium.ttf - - asset: assets/fonts/Lato-Bold.ttf - asset: assets/fonts/Flamante-Roma-MediumItalic.ttf - style: italic + - family: LatoBold + fonts: + - asset: assets/fonts/Lato-Bold.ttf # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg