From 0d0b58ee48c3c55ecd8a04e5187cbcf066a0c79e Mon Sep 17 00:00:00 2001 From: toly <1981462002@qq.com> Date: Wed, 30 Sep 2020 14:56:54 +0800 Subject: [PATCH] =?UTF-8?q?:pencil:=20=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?,FlutterSdk=E5=8D=87=E7=BA=A7=E5=88=B01.20.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- lib/blocs/bloc_exp.dart | 16 ++++++++++--- lib/views/app/bloc_wrapper.dart | 4 +--- lib/views/app/flutter_unit.dart | 2 +- lib/views/app/navigation/unit_bottom_bar.dart | 4 +++- lib/views/app/navigation/unit_navigation.dart | 3 +++ lib/views/app/splash/unit_paint.dart | 4 ++++ lib/views/app/splash/unit_splash.dart | 1 - lib/views/pages/category/category_detail.dart | 7 +----- lib/views/pages/category/category_page.dart | 6 +---- .../pages/category/edit_category_panel.dart | 3 +-- .../pages/detail/category_end_drawer.dart | 5 +--- .../pages/issues_point/issues_detail.dart | 3 +-- .../pages/issues_point/issues_point_page.dart | 23 +++++++------------ lib/views/pages/login/login_form.dart | 1 + lib/views/pages/login/login_page.dart | 9 -------- lib/views/pages/search/app_search_bar.dart | 3 +-- lib/views/pages/search/serach_page.dart | 8 +------ .../pages/setting/code_style_setting.dart | 4 +--- lib/views/pages/setting/font_setting.dart | 4 +--- .../pages/setting/item_style_setting.dart | 4 +--- lib/views/pages/setting/setting_page.dart | 7 +----- .../pages/setting/theme_color_setting.dart | 4 +--- 23 files changed, 48 insertions(+), 81 deletions(-) diff --git a/README.md b/README.md index bacb6c4..9a6a54d 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ ``` a1@toly ~ % flutter --version -Flutter 1.20.3 • channel stable • https://github.com/flutter/flutter.git -Framework • revision 216dee60c0 (10 days ago) • 2020-09-01 12:24:47 -0700 +Flutter 1.20.4 • channel stable • https://github.com/flutter/flutter.git +Framework • revision fba99f6cf9 (2 weeks ago) • 2020-09-14 15:32:52 -0700 Engine • revision d1bc06f032 Tools • Dart 2.9.2 ``` diff --git a/lib/blocs/bloc_exp.dart b/lib/blocs/bloc_exp.dart index b28a35b..9a86dbe 100644 --- a/lib/blocs/bloc_exp.dart +++ b/lib/blocs/bloc_exp.dart @@ -20,14 +20,24 @@ export 'detail/detail_bloc.dart'; export 'detail/detail_state.dart'; export 'detail/detail_event.dart'; +export 'global/global_bloc.dart'; +export 'global/global_state.dart'; +export 'global/global_event.dart'; export 'home/home_bloc.dart'; export 'home/home_state.dart'; export 'home/home_event.dart'; -export 'global/global_bloc.dart'; -export 'global/global_state.dart'; -export 'global/global_event.dart'; + + +export 'point/point_bloc.dart'; +export 'point/point_state.dart'; +export 'point/point_event.dart'; + + +export 'point_comment/point_comment_bloc.dart'; +export 'point_comment/point_comment_state.dart'; +export 'point_comment/point_comment_event.dart'; export 'search/search_bloc.dart'; export 'search/search_state.dart'; diff --git a/lib/views/app/bloc_wrapper.dart b/lib/views/app/bloc_wrapper.dart index fa01af6..60548fc 100644 --- a/lib/views/app/bloc_wrapper.dart +++ b/lib/views/app/bloc_wrapper.dart @@ -2,15 +2,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/enums.dart'; import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/blocs/point/point_bloc.dart'; -import 'package:flutter_unit/blocs/point_comment/point_comment_bloc.dart'; import 'package:flutter_unit/repositories/impl/catagory_db_repository.dart'; import 'package:flutter_unit/repositories/impl/widget_db_repository.dart'; import 'package:flutter_unit/storage/app_storage.dart'; /// create by 张风捷特烈 on 2020/4/28 /// contact me by email 1981462002@qq.com -/// 说明: +/// 说明: Bloc提供器包裹层 final storage = AppStorage(); diff --git a/lib/views/app/flutter_unit.dart b/lib/views/app/flutter_unit.dart index e831bb9..69fb31a 100644 --- a/lib/views/app/flutter_unit.dart +++ b/lib/views/app/flutter_unit.dart @@ -6,7 +6,7 @@ import 'package:flutter_unit/views/app/splash/unit_splash.dart'; /// create by 张风捷特烈 on 2020/4/28 /// contact me by email 1981462002@qq.com -/// 说明: +/// 说明: 主程序 class FlutterUnit extends StatelessWidget { @override diff --git a/lib/views/app/navigation/unit_bottom_bar.dart b/lib/views/app/navigation/unit_bottom_bar.dart index 328fac2..c131704 100644 --- a/lib/views/app/navigation/unit_bottom_bar.dart +++ b/lib/views/app/navigation/unit_bottom_bar.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; /// create by 张风捷特烈 on 2020-04-11 /// contact me by email 1981462002@qq.com -/// 说明: +/// 说明: 自定义底部导航栏 class UnitBottomBar extends StatefulWidget { final Color color; @@ -47,6 +47,7 @@ class _UnitBottomBarState extends State { var active = i == _position; bool left = i == 0; + return GestureDetector( onTap: () => _tapTab(i), onLongPress: () => _onLongPress(context, i), @@ -87,4 +88,5 @@ class _UnitBottomBarState extends State { Scaffold.of(context).openEndDrawer(); } } + } diff --git a/lib/views/app/navigation/unit_navigation.dart b/lib/views/app/navigation/unit_navigation.dart index 5ea0f31..667c34d 100644 --- a/lib/views/app/navigation/unit_navigation.dart +++ b/lib/views/app/navigation/unit_navigation.dart @@ -9,6 +9,9 @@ import 'package:flutter_unit/views/pages/category/home_right_drawer.dart'; import 'package:flutter_unit/views/pages/home/home_drawer.dart'; import 'package:flutter_unit/views/pages/home/home_page.dart'; +/// create by 张风捷特烈 on 2020-04-11 +/// contact me by email 1981462002@qq.com +/// 说明: 主题结构 左右滑页 + 底部导航栏 class UnitNavigation extends StatefulWidget { @override diff --git a/lib/views/app/splash/unit_paint.dart b/lib/views/app/splash/unit_paint.dart index 445612c..04eaa4d 100644 --- a/lib/views/app/splash/unit_paint.dart +++ b/lib/views/app/splash/unit_paint.dart @@ -1,5 +1,9 @@ import 'package:flutter/material.dart'; +/// create by 张风捷特烈 on 2020-03-07 +/// contact me by email 1981462002@qq.com +/// 说明: app 闪屏页画板 + class UnitPainter extends CustomPainter { Paint _paint; double width; diff --git a/lib/views/app/splash/unit_splash.dart b/lib/views/app/splash/unit_splash.dart index f0fe758..5568e60 100644 --- a/lib/views/app/splash/unit_splash.dart +++ b/lib/views/app/splash/unit_splash.dart @@ -126,7 +126,6 @@ class _UnitSplashState extends State with TickerProviderStateMixin { child: Container( height: 120, child: FlutterLogo( -// colors: primaryColor, size: 60, ), )), diff --git a/lib/views/pages/category/category_detail.dart b/lib/views/pages/category/category_detail.dart index 3f540b7..96af21a 100644 --- a/lib/views/pages/category/category_detail.dart +++ b/lib/views/pages/category/category_detail.dart @@ -3,17 +3,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_star/flutter_star.dart'; import 'package:flutter_unit/app/router.dart'; -import 'package:flutter_unit/blocs/category_widget/category_widget_bloc.dart'; -import 'package:flutter_unit/blocs/category_widget/category_widget_event.dart'; -import 'package:flutter_unit/blocs/category_widget/category_widget_state.dart'; -import 'package:flutter_unit/blocs/detail/detail_bloc.dart'; -import 'package:flutter_unit/blocs/detail/detail_event.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/components/permanent/circle_image.dart'; import 'package:flutter_unit/components/permanent/circle_text.dart'; import 'package:flutter_unit/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/model/category_model.dart'; import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/views/items/techno_widget_list_item.dart'; /// create by 张风捷特烈 on 2020-04-22 /// contact me by email 1981462002@qq.com diff --git a/lib/views/pages/category/category_page.dart b/lib/views/pages/category/category_page.dart index 8f242d8..fbe4ba5 100644 --- a/lib/views/pages/category/category_page.dart +++ b/lib/views/pages/category/category_page.dart @@ -1,11 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/router.dart'; -import 'package:flutter_unit/blocs/category/category_bloc.dart'; -import 'package:flutter_unit/blocs/category/category_event.dart'; -import 'package:flutter_unit/blocs/category/category_state.dart'; -import 'package:flutter_unit/blocs/category_widget/category_widget_bloc.dart'; -import 'package:flutter_unit/blocs/category_widget/category_widget_event.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/components/permanent/circle.dart'; import 'package:flutter_unit/model/category_model.dart'; diff --git a/lib/views/pages/category/edit_category_panel.dart b/lib/views/pages/category/edit_category_panel.dart index 28d7192..877a826 100644 --- a/lib/views/pages/category/edit_category_panel.dart +++ b/lib/views/pages/category/edit_category_panel.dart @@ -2,8 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/style/unit_color.dart'; import 'package:flutter_unit/app/utils/color_utils.dart'; -import 'package:flutter_unit/blocs/category/category_bloc.dart'; -import 'package:flutter_unit/blocs/category/category_event.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/components/permanent/edit_panel.dart'; import 'package:flutter_unit/components/permanent/input_button.dart'; import 'package:flutter_unit/components/project/color_chooser.dart'; diff --git a/lib/views/pages/detail/category_end_drawer.dart b/lib/views/pages/detail/category_end_drawer.dart index a36ed1a..b3dd3f0 100644 --- a/lib/views/pages/detail/category_end_drawer.dart +++ b/lib/views/pages/detail/category_end_drawer.dart @@ -1,9 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/blocs/category/category_bloc.dart'; -import 'package:flutter_unit/blocs/category/category_state.dart'; -import 'package:flutter_unit/blocs/category_widget/category_widget_bloc.dart'; -import 'package:flutter_unit/blocs/category_widget/category_widget_event.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/components/permanent/circle.dart'; import 'package:flutter_unit/components/permanent/panel.dart'; import 'package:flutter_unit/model/category_model.dart'; diff --git a/lib/views/pages/issues_point/issues_detail.dart b/lib/views/pages/issues_point/issues_detail.dart index ac15b09..b115679 100644 --- a/lib/views/pages/issues_point/issues_detail.dart +++ b/lib/views/pages/issues_point/issues_detail.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/utils/convert_man.dart'; -import 'package:flutter_unit/blocs/point_comment/point_comment_bloc.dart'; -import 'package:flutter_unit/blocs/point_comment/point_comment_state.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/components/permanent/circle_image.dart'; import 'package:flutter_unit/components/permanent/color_wrapper.dart'; import 'package:flutter_unit/components/permanent/markdown/markdown_widget.dart'; diff --git a/lib/views/pages/issues_point/issues_point_page.dart b/lib/views/pages/issues_point/issues_point_page.dart index 8dd14e2..bf3d8ce 100644 --- a/lib/views/pages/issues_point/issues_point_page.dart +++ b/lib/views/pages/issues_point/issues_point_page.dart @@ -1,27 +1,20 @@ -import 'dart:convert'; -import 'dart:ui'; - import 'package:flutter/cupertino.dart'; -/// create by 张风捷特烈 on 2020/6/17 -/// contact me by email 1981462002@qq.com -/// 说明: - import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_spinkit/flutter_spinkit.dart'; import 'package:flutter_unit/app/api/issues_api.dart'; import 'package:flutter_unit/app/router.dart'; -import 'package:flutter_unit/blocs/point/point_bloc.dart'; -import 'package:flutter_unit/blocs/point/point_event.dart'; -import 'package:flutter_unit/blocs/point/point_state.dart'; -import 'package:flutter_unit/blocs/point_comment/point_comment_bloc.dart'; -import 'package:flutter_unit/blocs/point_comment/point_comment_event.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/model/github/repository.dart'; import 'issue_item.dart'; import 'repo_widget.dart'; +/// create by 张风捷特烈 on 2020/6/17 +/// contact me by email 1981462002@qq.com +/// 说明: + class IssuesPointPage extends StatelessWidget { @override Widget build(BuildContext context) { @@ -43,7 +36,6 @@ class _IssuesPointContentState extends State { _loadRepo(); } - @override Widget build(BuildContext context) { return BlocBuilder( @@ -76,8 +68,9 @@ class _IssuesPointContentState extends State { return SliverList( delegate: SliverChildBuilderDelegate( (ctx, int index) => GestureDetector( - onTap: (){ - BlocProvider.of(ctx).add(EventLoadPointComment(issues[index])); + onTap: () { + BlocProvider.of(ctx) + .add(EventLoadPointComment(issues[index])); Navigator.pushNamed(ctx, UnitRouter.point_detail); }, child: IssueItem(issue: issues[index])), diff --git a/lib/views/pages/login/login_form.dart b/lib/views/pages/login/login_form.dart index b9eb0b8..1b4fab1 100644 --- a/lib/views/pages/login/login_form.dart +++ b/lib/views/pages/login/login_form.dart @@ -5,6 +5,7 @@ import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/components/permanent/feedback_widget.dart'; + class LoginFrom extends StatefulWidget { @override _LoginFromState createState() => _LoginFromState(); diff --git a/lib/views/pages/login/login_page.dart b/lib/views/pages/login/login_page.dart index ecba003..d300283 100644 --- a/lib/views/pages/login/login_page.dart +++ b/lib/views/pages/login/login_page.dart @@ -1,14 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/toly_icon.dart'; -//import 'package:santclient/app/global/SantIcon.dart'; -//import 'package:santclient/app/router/router.dart'; -//import 'package:santclient/bloc/authentic/bloc.dart'; -//import 'package:santclient/bloc/authentic/state.dart'; -//import 'package:santclient/bloc/bloc.dart'; -//import 'package:santclient/components/persistent/shape/arc_clipper.dart'; -//import 'package:santclient/components/project/error_msg.dart'; -//import 'package:santclient/components/project/loading_view.dart'; import 'arc_clipper.dart'; import 'login_form.dart'; diff --git a/lib/views/pages/search/app_search_bar.dart b/lib/views/pages/search/app_search_bar.dart index 0e85158..34ab5cb 100644 --- a/lib/views/pages/search/app_search_bar.dart +++ b/lib/views/pages/search/app_search_bar.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/blocs/search/search_bloc.dart'; -import 'package:flutter_unit/blocs/search/search_event.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/storage/dao/widget_dao.dart'; diff --git a/lib/views/pages/search/serach_page.dart b/lib/views/pages/search/serach_page.dart index 709e310..7e34e60 100644 --- a/lib/views/pages/search/serach_page.dart +++ b/lib/views/pages/search/serach_page.dart @@ -2,13 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/router.dart'; import 'package:flutter_unit/app/res/toly_icon.dart'; -import 'package:flutter_unit/blocs/collect/collect_bloc.dart'; -import 'package:flutter_unit/blocs/collect/collect_event.dart'; -import 'package:flutter_unit/blocs/detail/detail_bloc.dart'; -import 'package:flutter_unit/blocs/detail/detail_event.dart'; -import 'package:flutter_unit/blocs/search/search_bloc.dart'; -import 'package:flutter_unit/blocs/search/search_event.dart'; -import 'package:flutter_unit/blocs/search/search_state.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/components/permanent/circle.dart'; import 'package:flutter_unit/storage/dao/widget_dao.dart'; import 'package:flutter_unit/model/widget_model.dart'; diff --git a/lib/views/pages/setting/code_style_setting.dart b/lib/views/pages/setting/code_style_setting.dart index 164286a..801e377 100644 --- a/lib/views/pages/setting/code_style_setting.dart +++ b/lib/views/pages/setting/code_style_setting.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/blocs/global/global_bloc.dart'; -import 'package:flutter_unit/blocs/global/global_event.dart'; -import 'package:flutter_unit/blocs/global/global_state.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/components/permanent/code/code_widget.dart'; import 'package:flutter_unit/components/permanent/code/highlighter_style.dart'; import 'package:flutter_unit/components/permanent/feedback_widget.dart'; diff --git a/lib/views/pages/setting/font_setting.dart b/lib/views/pages/setting/font_setting.dart index d8458b5..8d2736c 100644 --- a/lib/views/pages/setting/font_setting.dart +++ b/lib/views/pages/setting/font_setting.dart @@ -2,9 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/blocs/global/global_bloc.dart'; -import 'package:flutter_unit/blocs/global/global_event.dart'; -import 'package:flutter_unit/blocs/global/global_state.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/components/permanent/circle.dart'; diff --git a/lib/views/pages/setting/item_style_setting.dart b/lib/views/pages/setting/item_style_setting.dart index ea0be0d..6e64dde 100644 --- a/lib/views/pages/setting/item_style_setting.dart +++ b/lib/views/pages/setting/item_style_setting.dart @@ -2,9 +2,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/blocs/global/global_bloc.dart'; -import 'package:flutter_unit/blocs/global/global_event.dart'; -import 'package:flutter_unit/blocs/global/global_state.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/components/permanent/circle.dart'; import 'package:flutter_unit/views/items/home_item_support.dart'; diff --git a/lib/views/pages/setting/setting_page.dart b/lib/views/pages/setting/setting_page.dart index 987b48a..16315f2 100644 --- a/lib/views/pages/setting/setting_page.dart +++ b/lib/views/pages/setting/setting_page.dart @@ -1,13 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/router.dart'; import 'package:flutter_unit/app/res/toly_icon.dart'; -import 'package:flutter_unit/blocs/global/global_bloc.dart'; -import 'package:flutter_unit/blocs/global/global_event.dart'; -import 'package:flutter_unit/blocs/global/global_state.dart'; -import 'package:flutter_unit/components/permanent/feedback_widget.dart'; -import 'package:flutter_unit/components/permanent/circle.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; class SettingPage extends StatelessWidget { @override diff --git a/lib/views/pages/setting/theme_color_setting.dart b/lib/views/pages/setting/theme_color_setting.dart index 7e4511f..5f3802d 100644 --- a/lib/views/pages/setting/theme_color_setting.dart +++ b/lib/views/pages/setting/theme_color_setting.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/blocs/global/global_bloc.dart'; -import 'package:flutter_unit/blocs/global/global_event.dart'; -import 'package:flutter_unit/blocs/global/global_state.dart'; +import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/components/permanent/circle.dart';