📝 简化代码,FlutterSdk升级到1.20.4

This commit is contained in:
toly
2020-09-30 14:56:54 +08:00
parent 48fbb972ba
commit 0d0b58ee48
23 changed files with 48 additions and 81 deletions

View File

@@ -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
```

View File

@@ -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';

View File

@@ -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();

View File

@@ -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

View File

@@ -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<UnitBottomBar> {
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<UnitBottomBar> {
Scaffold.of(context).openEndDrawer();
}
}
}

View File

@@ -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

View File

@@ -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;

View File

@@ -126,7 +126,6 @@ class _UnitSplashState extends State<UnitSplash> with TickerProviderStateMixin {
child: Container(
height: 120,
child: FlutterLogo(
// colors: primaryColor,
size: 60,
),
)),

View File

@@ -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

View File

@@ -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';

View File

@@ -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';

View File

@@ -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';

View File

@@ -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';

View File

@@ -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<IssuesPointContent> {
_loadRepo();
}
@override
Widget build(BuildContext context) {
return BlocBuilder<PointBloc, PointState>(
@@ -76,8 +68,9 @@ class _IssuesPointContentState extends State<IssuesPointContent> {
return SliverList(
delegate: SliverChildBuilderDelegate(
(ctx, int index) => GestureDetector(
onTap: (){
BlocProvider.of<PointCommentBloc>(ctx).add(EventLoadPointComment(issues[index]));
onTap: () {
BlocProvider.of<PointCommentBloc>(ctx)
.add(EventLoadPointComment(issues[index]));
Navigator.pushNamed(ctx, UnitRouter.point_detail);
},
child: IssueItem(issue: issues[index])),

View File

@@ -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();

View File

@@ -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';

View File

@@ -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';

View File

@@ -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';

View File

@@ -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';

View File

@@ -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';

View File

@@ -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';

View File

@@ -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

View File

@@ -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';