From 57ab320fb69d89157bee123714a96485d3a64d7a Mon Sep 17 00:00:00 2001 From: toly <1981462002@qq.com> Date: Fri, 28 Aug 2020 15:06:57 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=8E=BB=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/app/router.dart | 2 +- lib/views/app/flutter_unit.dart | 2 +- lib/views/app/navigation/unit_navigation.dart | 2 +- lib/views/app/splash/unit_splash.dart | 4 ++-- lib/views/common/unit_drawer_header.dart | 2 +- lib/views/pages/about/version_info.dart | 2 +- lib/views/pages/category/category_detail.dart | 2 +- lib/views/pages/category/category_page.dart | 2 +- lib/views/pages/category/collect_page.dart | 2 +- lib/views/pages/category/default_collect_page.dart | 2 +- lib/views/pages/home/home_drawer.dart | 14 +++++++------- lib/views/pages/home/home_page.dart | 2 +- lib/views/pages/search/serach_page.dart | 2 +- lib/views/pages/setting/font_setting.dart | 1 + lib/views/pages/setting/setting_page.dart | 10 +++++----- lib/views/pages/unit_todo/point_unit_page.dart | 2 +- 16 files changed, 27 insertions(+), 26 deletions(-) diff --git a/lib/app/router.dart b/lib/app/router.dart index e209b8a..b5a391f 100644 --- a/lib/app/router.dart +++ b/lib/app/router.dart @@ -22,7 +22,7 @@ import 'package:flutter_unit/views/pages/setting/setting_page.dart'; import 'utils/router_utils.dart'; -class Router { +class UnitRouter { static const String detail = 'detail'; static const String home = '/'; static const String logo = 'logo'; diff --git a/lib/views/app/flutter_unit.dart b/lib/views/app/flutter_unit.dart index 5d53276..e897d16 100644 --- a/lib/views/app/flutter_unit.dart +++ b/lib/views/app/flutter_unit.dart @@ -23,7 +23,7 @@ class FlutterUnit extends StatelessWidget { // checkerboardRasterCacheImages:true, title: 'Flutter Unit', debugShowCheckedModeBanner: false, - onGenerateRoute: Router.generateRoute, + onGenerateRoute: UnitRouter.generateRoute, theme: ThemeData( primarySwatch: state.themeColor, fontFamily: state.fontFamily, diff --git a/lib/views/app/navigation/unit_navigation.dart b/lib/views/app/navigation/unit_navigation.dart index e88aa91..5ea0f31 100644 --- a/lib/views/app/navigation/unit_navigation.dart +++ b/lib/views/app/navigation/unit_navigation.dart @@ -58,7 +58,7 @@ class _UnitNavigationState extends State { elevation: 2, backgroundColor: color, child: const Icon(Icons.search), - onPressed: () => Navigator.of(context).pushNamed(Router.search), + onPressed: () => Navigator.of(context).pushNamed(UnitRouter.search), ); } diff --git a/lib/views/app/splash/unit_splash.dart b/lib/views/app/splash/unit_splash.dart index 304fe48..11c5a7e 100644 --- a/lib/views/app/splash/unit_splash.dart +++ b/lib/views/app/splash/unit_splash.dart @@ -54,7 +54,7 @@ class _UnitSplashState extends State with TickerProviderStateMixin { setState(() { _animEnd = true; Future.delayed(Duration(milliseconds: 500)).then((e) { - Navigator.of(context).pushReplacementNamed(Router.nav); + Navigator.of(context).pushReplacementNamed(UnitRouter.nav); }); }); } @@ -128,7 +128,7 @@ class _UnitSplashState extends State with TickerProviderStateMixin { child: Container( height: 120, child: FlutterLogo( - colors: primaryColor, +// colors: primaryColor, size: 60, ), )), diff --git a/lib/views/common/unit_drawer_header.dart b/lib/views/common/unit_drawer_header.dart index e0373b4..e5dc449 100644 --- a/lib/views/common/unit_drawer_header.dart +++ b/lib/views/common/unit_drawer_header.dart @@ -27,7 +27,7 @@ class UnitDrawerHeader extends StatelessWidget { crossAxisAlignment: WrapCrossAlignment.center, children: [ FlutterLogo( - colors: Colors.orange, +// colors: Colors.orange, size: 35, ), Text( diff --git a/lib/views/pages/about/version_info.dart b/lib/views/pages/about/version_info.dart index 6356bb1..03c706c 100644 --- a/lib/views/pages/about/version_info.dart +++ b/lib/views/pages/about/version_info.dart @@ -73,7 +73,7 @@ class VersionInfo extends StatelessWidget { ListTile( title: Text('应用详情',style: labelStyle,), trailing: _nextIcon(context), - onTap: () => Navigator.of(context).pushNamed(Router.about_app), + onTap: () => Navigator.of(context).pushNamed(UnitRouter.about_app), ), Divider(height: 1,indent: 10), ListTile( diff --git a/lib/views/pages/category/category_detail.dart b/lib/views/pages/category/category_detail.dart index 4072c3c..3f540b7 100644 --- a/lib/views/pages/category/category_detail.dart +++ b/lib/views/pages/category/category_detail.dart @@ -75,7 +75,7 @@ class CategoryShow extends StatelessWidget { _toDetailPage(BuildContext context, WidgetModel model) async { BlocProvider.of(context).add(FetchWidgetDetail(model)); - Navigator.pushNamed(context, Router.widget_detail, arguments: model); + Navigator.pushNamed(context, UnitRouter.widget_detail, arguments: model); } } diff --git a/lib/views/pages/category/category_page.dart b/lib/views/pages/category/category_page.dart index ca5baab..8f242d8 100644 --- a/lib/views/pages/category/category_page.dart +++ b/lib/views/pages/category/category_page.dart @@ -122,7 +122,7 @@ class CategoryPage extends StatelessWidget { _toDetailPage(BuildContext context, CategoryModel model) { BlocProvider.of(context) .add(EventLoadCategoryWidget(model.id)); - Navigator.pushNamed(context, Router.category_show, arguments: model); + Navigator.pushNamed(context, UnitRouter.category_show, arguments: model); } diff --git a/lib/views/pages/category/collect_page.dart b/lib/views/pages/category/collect_page.dart index 7ea031c..3090e52 100644 --- a/lib/views/pages/category/collect_page.dart +++ b/lib/views/pages/category/collect_page.dart @@ -57,7 +57,7 @@ class _CollectPageState extends State margin: EdgeInsets.all(10), child: FeedbackWidget( onPressed: (){ - Navigator.of(context).pushNamed(Router.login); + Navigator.of(context).pushNamed(UnitRouter.login); }, child: CircleImage( image: AssetImage('assets/images/icon_head.png'), diff --git a/lib/views/pages/category/default_collect_page.dart b/lib/views/pages/category/default_collect_page.dart index 2223638..c990425 100644 --- a/lib/views/pages/category/default_collect_page.dart +++ b/lib/views/pages/category/default_collect_page.dart @@ -58,7 +58,7 @@ class DefaultCollectPage extends StatelessWidget { _toDetailPage(BuildContext context, WidgetModel model) { BlocProvider.of(context).add(FetchWidgetDetail(model)); - Navigator.pushNamed(context, Router.widget_detail, arguments: model); + Navigator.pushNamed(context, UnitRouter.widget_detail, arguments: model); } } diff --git a/lib/views/pages/home/home_drawer.dart b/lib/views/pages/home/home_drawer.dart index b49f2f3..605a4a1 100644 --- a/lib/views/pages/home/home_drawer.dart +++ b/lib/views/pages/home/home_drawer.dart @@ -27,14 +27,14 @@ class HomeDrawer extends StatelessWidget { padding: EdgeInsets.zero, children: [ UnitDrawerHeader(color: color), - _buildItem(context, TolyIcon.icon_them, '应用设置', Router.setting), + _buildItem(context, TolyIcon.icon_them, '应用设置', UnitRouter.setting), _buildItem(context, TolyIcon.icon_layout, '数据统计', null), Divider(height: 1), _buildFlutterUnit(context), _buildItem(context, TolyIcon.icon_code, 'Dart 手册', null), Divider(height: 1), - _buildItem(context, Icons.info, '关于应用', Router.about_app), - _buildItem(context, TolyIcon.icon_kafei, '联系本王', Router.about_me), + _buildItem(context, Icons.info, '关于应用', UnitRouter.about_app), + _buildItem(context, TolyIcon.icon_kafei, '联系本王', UnitRouter.about_me), ], ), ); @@ -47,10 +47,10 @@ class HomeDrawer extends StatelessWidget { ), title: Text('Flutter 集录'), children: [ - _buildItem(context, TolyIcon.icon_tag, '属性集录', Router.attr), - _buildItem(context, Icons.palette, '绘画集录', Router.paint), - _buildItem(context, Icons.widgets, '布局集录', Router.layout), - _buildItem(context, TolyIcon.icon_bug, '要点集录', Router.bug), + _buildItem(context, TolyIcon.icon_tag, '属性集录', UnitRouter.attr), + _buildItem(context, Icons.palette, '绘画集录', UnitRouter.paint), + _buildItem(context, Icons.widgets, '布局集录', UnitRouter.layout), + _buildItem(context, TolyIcon.icon_bug, '要点集录', UnitRouter.bug), ], ); diff --git a/lib/views/pages/home/home_page.dart b/lib/views/pages/home/home_page.dart index 6b74cdb..32e9b31 100644 --- a/lib/views/pages/home/home_page.dart +++ b/lib/views/pages/home/home_page.dart @@ -99,7 +99,7 @@ class _HomePageState extends State with AutomaticKeepAliveClientMixin{ _toDetailPage(WidgetModel model) async { BlocProvider.of(context).add(FetchWidgetDetail(model)); - Navigator.pushNamed(context, Router.widget_detail, arguments: model); + Navigator.pushNamed(context, UnitRouter.widget_detail, arguments: model); } @override diff --git a/lib/views/pages/search/serach_page.dart b/lib/views/pages/search/serach_page.dart index a38d4d3..2d711e6 100644 --- a/lib/views/pages/search/serach_page.dart +++ b/lib/views/pages/search/serach_page.dart @@ -130,6 +130,6 @@ class _SearchPageState extends State { _toDetailPage(WidgetModel model) { BlocProvider.of(context).add(FetchWidgetDetail(model)); - Navigator.pushNamed(context, Router.widget_detail,arguments: model); + Navigator.pushNamed(context, UnitRouter.widget_detail,arguments: model); } } diff --git a/lib/views/pages/setting/font_setting.dart b/lib/views/pages/setting/font_setting.dart index 4532564..d8458b5 100644 --- a/lib/views/pages/setting/font_setting.dart +++ b/lib/views/pages/setting/font_setting.dart @@ -1,3 +1,4 @@ + import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/cons.dart'; diff --git a/lib/views/pages/setting/setting_page.dart b/lib/views/pages/setting/setting_page.dart index 63c6436..703b4db 100644 --- a/lib/views/pages/setting/setting_page.dart +++ b/lib/views/pages/setting/setting_page.dart @@ -25,7 +25,7 @@ class SettingPage extends StatelessWidget { ), title: Text('主题色设置'), trailing: _nextIcon(context), - onTap: () => Navigator.of(context).pushNamed(Router.theme_color_setting), + onTap: () => Navigator.of(context).pushNamed(UnitRouter.theme_color_setting), ), Divider(), ListTile( @@ -35,7 +35,7 @@ class SettingPage extends StatelessWidget { ), title: Text('字体设置'), trailing: _nextIcon(context), - onTap: () => Navigator.of(context).pushNamed(Router.font_setting), + onTap: () => Navigator.of(context).pushNamed(UnitRouter.font_setting), ), Divider(), ListTile( @@ -45,7 +45,7 @@ class SettingPage extends StatelessWidget { ), title: Text('item样式设置'), trailing: _nextIcon(context), - onTap: () => Navigator.of(context).pushNamed(Router.item_style_setting), + onTap: () => Navigator.of(context).pushNamed(UnitRouter.item_style_setting), ), Divider(), ListTile( @@ -55,7 +55,7 @@ class SettingPage extends StatelessWidget { ), title: Text('代码高亮样式'), trailing: _nextIcon(context), - onTap: () => Navigator.of(context).pushNamed(Router.code_style_setting), + onTap: () => Navigator.of(context).pushNamed(UnitRouter.code_style_setting), ), Divider(), _buildShowBg(context), @@ -69,7 +69,7 @@ class SettingPage extends StatelessWidget { ), title: Text('版本信息'), trailing: _nextIcon(context), - onTap: () => Navigator.of(context).pushNamed(Router.version_info), + onTap: () => Navigator.of(context).pushNamed(UnitRouter.version_info), ), ], ), diff --git a/lib/views/pages/unit_todo/point_unit_page.dart b/lib/views/pages/unit_todo/point_unit_page.dart index 088477c..f939df8 100644 --- a/lib/views/pages/unit_todo/point_unit_page.dart +++ b/lib/views/pages/unit_todo/point_unit_page.dart @@ -27,7 +27,7 @@ class BugUnitPage extends StatelessWidget { children: [ FeedbackWidget( onPressed: (){ - Navigator.of(context).pushNamed(Router.issues_point); + Navigator.of(context).pushNamed(UnitRouter.issues_point); }, child: CircleImage( image: AssetImage('assets/images/icon_head.png'),