Skip to content

Commit 36a65f4

Browse files
toly1994328toly1994328
committed
🎨 优化结构，调整包位置
1 parent ef21901 commit 36a65f4

File tree

96 files changed

+433
-410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+433
-410
lines changed

‎lib/app/router.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flutter/material.dart';
2+
import 'package:flutter_unit/views/app/navigation/unit_navigation.dart';
23
import 'package:flutter_unit/views/pages/about/about_me_page.dart';
34
import 'package:flutter_unit/views/pages/about/about_app_page.dart';
45
import 'package:flutter_unit/views/pages/category/category_show.dart';
@@ -10,12 +11,12 @@ import 'package:flutter_unit/views/pages/setting/item_style_setting.dart';
1011
import 'package:flutter_unit/views/pages/setting/theme_color_setting.dart';
1112
import 'package:flutter_unit/views/pages/unit_todo/attr_unit_page.dart';
1213
import 'package:flutter_unit/views/pages/unit_todo/bug_unit_page.dart';
13-
import 'package:flutter_unit/views/pages/category/category_page.dart';
14+
1415
import 'package:flutter_unit/views/pages/detail/widget_detail_page.dart';
1516
import 'package:flutter_unit/views/pages/unit_todo/layout_unit_page.dart';
1617
import 'package:flutter_unit/views/pages/unit_todo/paint_unit_page.dart';
1718
import 'package:flutter_unit/views/pages/setting/setting_page.dart';
18-
import 'package:flutter_unit/views/pages/navigation/unit_navigation.dart';
19+
1920

2021
import 'utils/router_utils.dart';
2122

‎lib/blocs/bloc_exp.dart‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/// create by 张风捷特烈 on 2020/4/28
2+
/// contact me by email [email protected]
3+
/// 说明:
4+
5+
library bloc_unit;
6+
7+
export 'category/category_bloc.dart';
8+
export 'category/category_state.dart';
9+
export 'category/category_event.dart';
10+
11+
export 'category_widget/category_widget_bloc.dart';
12+
export 'category_widget/category_widget_state.dart';
13+
export 'category_widget/category_widget_event.dart';
14+
15+
export 'collect/collect_bloc.dart';
16+
export 'collect/collect_state.dart';
17+
export 'collect/collect_event.dart';
18+
19+
export 'detail/detail_bloc.dart';
20+
export 'detail/detail_state.dart';
21+
export 'detail/detail_event.dart';
22+
23+
24+
export 'home/home_bloc.dart';
25+
export 'home/home_state.dart';
26+
export 'home/home_event.dart';
27+
28+
export 'global/global_bloc.dart';
29+
export 'global/global_state.dart';
30+
export 'global/global_event.dart';
31+
32+
export 'search/search_bloc.dart';
33+
export 'search/search_state.dart';
34+
export 'search/search_event.dart';

‎lib/blocs/category_widget/category_widget_state.dart‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,3 @@ class CategoryWidgetEmptyState extends CategoryWidgetState{
2727
}
2828

2929

30-
class AddCategoryFailed extends CategoryWidgetState{
31-
32-
}

‎lib/blocs/widgets/home_bloc.dart‎ renamed to ‎lib/blocs/home/home_bloc.dart‎

File renamed without changes.

‎lib/blocs/widgets/home_event.dart‎ renamed to ‎lib/blocs/home/home_event.dart‎

File renamed without changes.

‎lib/blocs/widgets/home_state.dart‎ renamed to ‎lib/blocs/home/home_state.dart‎

File renamed without changes.

‎lib/main.dart‎

Lines changed: 3 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_bloc/flutter_bloc.dart';
3-
import 'package:flutter_unit/blocs/category_widget/category_widget_bloc.dart';
4-
import 'package:flutter_unit/storage/app_storage.dart';
5-
import 'package:flutter_unit/views/pages/splash/unit_splash.dart';
2+
import 'package:flutter_unit/views/app/bloc_wrapper.dart';
3+
import 'views/app/flutter_app.dart';
64

7-
import 'app/enums.dart';
8-
import 'app/router.dart';
9-
import 'blocs/category/category_bloc.dart';
10-
import 'blocs/category/category_event.dart';
11-
import 'blocs/collect/collect_bloc.dart';
12-
import 'blocs/collect/collect_event.dart';
13-
import 'blocs/detail/detail_bloc.dart';
14-
import 'blocs/global/global_bloc.dart';
15-
import 'blocs/global/global_event.dart';
16-
import 'blocs/global/global_state.dart';
17-
import 'blocs/search/search_bloc.dart';
18-
import 'blocs/widgets/home_bloc.dart';
19-
import 'blocs/widgets/home_event.dart';
20-
import 'repositories/impl/catagory_db_repository.dart';
21-
import 'repositories/impl/widget_db_repository.dart';
22-
23-
void main() async {
24-
// await Initial.init();
25-
// runApp(BlocWrapper(
26-
// child: ColorFiltered(
27-
// colorFilter: ColorFilter.mode(Colors.white, BlendMode.color),
28-
// child: FlutterApp())));
29-
runApp(BlocWrapper(child: FlutterApp()));
30-
}
31-
32-
final storage = AppStorage();
33-
34-
class BlocWrapper extends StatelessWidget {
35-
final Widget child;
36-
37-
BlocWrapper({this.child});
38-
39-
final repository = WidgetDbRepository(storage);
40-
final categoryRepo = CategoryDbRepository(storage);
41-
42-
// final CategoryBloc bloc = CategoryBloc(repository: CategoryDbRepository(storage))..add(EventLoadCategory());
43-
44-
@override
45-
Widget build(BuildContext context) {
46-
return MultiBlocProvider(//使用MultiBlocProvider包裹
47-
providers: [
48-
//Bloc提供器
49-
BlocProvider<GlobalBloc>(
50-
create: (_) => GlobalBloc(storage)..add(EventInitApp())),
51-
52-
BlocProvider<HomeBloc>(
53-
create: (_) => HomeBloc(repository: repository)
54-
..add(EventTabTap(WidgetFamily.statelessWidget))),
55-
56-
BlocProvider<DetailBloc>(
57-
create: (_) => DetailBloc(repository: repository)),
58-
BlocProvider<CategoryBloc>(
59-
create: (_) =>
60-
CategoryBloc(repository: categoryRepo)..add(EventLoadCategory())),
61-
62-
BlocProvider<CollectBloc>(
63-
create: (_) =>
64-
CollectBloc(repository: repository)..add(EventSetCollectData())),
65-
66-
BlocProvider<SearchBloc>(
67-
create: (_) => SearchBloc(repository: repository)),
68-
], child: child);
69-
}
70-
}
71-
72-
class FlutterApp extends StatelessWidget {
73-
@override
74-
Widget build(BuildContext context) {
75-
return BlocBuilder<GlobalBloc, GlobalState>(builder: (_, state) {
76-
return BlocProvider<CategoryWidgetBloc>(
77-
create: (_) => CategoryWidgetBloc(
78-
categoryBloc: BlocProvider.of<CategoryBloc>(context)),
79-
child: MaterialApp(
80-
title: 'Flutter Unit',
81-
debugShowCheckedModeBanner: false,
82-
onGenerateRoute: Router.generateRoute,
83-
theme: ThemeData(
84-
primarySwatch: state.themeColor,
85-
fontFamily: state.fontFamily,
86-
),
87-
home:
88-
UnitSplash()
89-
),
90-
);
91-
});
92-
}
93-
}
94-
//NavPage()
5+
void main() => runApp(BlocWrapper(child: FlutterApp()));

‎lib/views/app/bloc_wrapper.dart‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
import 'package:flutter/material.dart';
2+
import 'package:flutter_bloc/flutter_bloc.dart';
3+
import 'package:flutter_unit/app/enums.dart';
4+
import 'package:flutter_unit/blocs/bloc_exp.dart';
5+
import 'package:flutter_unit/repositories/impl/catagory_db_repository.dart';
6+
import 'package:flutter_unit/repositories/impl/widget_db_repository.dart';
7+
import 'package:flutter_unit/storage/app_storage.dart';
8+
9+
/// create by 张风捷特烈 on 2020/4/28
10+
/// contact me by email [email protected]
11+
/// 说明:
12+
13+
final storage = AppStorage();
14+
15+
class BlocWrapper extends StatelessWidget {
16+
final Widget child;
17+
18+
BlocWrapper({this.child});
19+
20+
final repository = WidgetDbRepository(storage);
21+
final categoryRepo = CategoryDbRepository(storage);
22+
23+
@override
24+
Widget build(BuildContext context) {
25+
return MultiBlocProvider(//使用MultiBlocProvider包裹
26+
providers: [
27+
//Bloc提供器
28+
BlocProvider<GlobalBloc>(
29+
create: (_) => GlobalBloc(storage)..add(EventInitApp())),
30+
31+
BlocProvider<HomeBloc>(
32+
create: (_) => HomeBloc(repository: repository)
33+
..add(EventTabTap(WidgetFamily.statelessWidget))),
34+
35+
BlocProvider<DetailBloc>(
36+
create: (_) => DetailBloc(repository: repository)),
37+
BlocProvider<CategoryBloc>(
38+
create: (_) =>
39+
CategoryBloc(repository: categoryRepo)..add(EventLoadCategory())),
40+
41+
BlocProvider<CollectBloc>(
42+
create: (_) =>
43+
CollectBloc(repository: repository)..add(EventSetCollectData())),
44+
45+
BlocProvider<SearchBloc>(
46+
create: (_) => SearchBloc(repository: repository)),
47+
], child: child);
48+
}
49+
}

‎lib/views/app/flutter_app.dart‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import 'package:flutter/material.dart';
2+
import 'package:flutter_bloc/flutter_bloc.dart';
3+
import 'package:flutter_unit/app/router.dart';
4+
import 'package:flutter_unit/blocs/bloc_exp.dart';
5+
import 'package:flutter_unit/views/app/splash/unit_splash.dart';
6+
7+
/// create by 张风捷特烈 on 2020/4/28
8+
/// contact me by email [email protected]
9+
/// 说明:
10+
11+
class FlutterApp extends StatelessWidget {
12+
@override
13+
Widget build(BuildContext context) {
14+
return BlocBuilder<GlobalBloc, GlobalState>(builder: (_, state) {
15+
return BlocProvider<CategoryWidgetBloc>(
16+
create: (_) => CategoryWidgetBloc(
17+
categoryBloc: BlocProvider.of<CategoryBloc>(context)),
18+
child: MaterialApp(
19+
title: 'Flutter Unit',
20+
debugShowCheckedModeBanner: false,
21+
onGenerateRoute: Router.generateRoute,
22+
theme: ThemeData(
23+
primarySwatch: state.themeColor,
24+
fontFamily: state.fontFamily,
25+
),
26+
home: UnitSplash()),
27+
);
28+
});
29+
}
30+
}

‎lib/views/pages/navigation/unit_bottom_bar.dart‎ renamed to ‎lib/views/app/navigation/unit_bottom_bar.dart‎

File renamed without changes.

0 commit comments

Comments
 (0)