Skip to content

Commit 11ca929

Browse files
committed
✨ 优化代码
1 parent 87d90a2 commit 11ca929

23 files changed

+331
-104
lines changed

lib/app/res/color_unit.dart

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import 'package:flutter/material.dart';
2+
3+
/// create by 张风捷特烈 on 2020/11/17
4+
/// contact me by email [email protected]
5+
/// 说明:
6+
7+
class ColorUnit{
8+
9+
// 文字相关
10+
static const Color input_border_color = Color(0xffD0D7DD);
11+
static const Color text_color = Color(0xff323C47);
12+
static const Color input_hit_text_color = Color(0xff939EA7);
13+
static const Color head_text_color = Color(0xff666666);
14+
15+
16+
17+
}

lib/app/res/size_unit.dart

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/// create by 张风捷特烈 on 2020/11/17
2+
/// contact me by email [email protected]
3+
/// 说明:
4+
5+
class SizeUnit {
6+
7+
// 小文字大小
8+
static const double home_h_padding = 10;
9+
static const double home_v_padding = 8;
10+
11+
// 文字相关
12+
static const double input_hit_text_size = 13;
13+
static const double input_text_size = 13;
14+
15+
// 小文字大小
16+
static const double small_text_size = 12;
17+
18+
// 标题文字大小
19+
static const double title_text_size = 14;
20+
21+
// 头文字大小
22+
static const double head_text_size = 18;
23+
24+
// 大文字大小
25+
static const double big_text_size = 22;
26+
}

lib/app/res/style/unit_text_style.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
33
import 'unit_color.dart';
44

55
///文本样式
6-
class TextStyleUnit {
6+
class TStyleUnit {
77
static const lagerTextSize = 30.0;
88
static const bigTextSize = 23.0;
99
static const normalTextSize = 18.0;

lib/app/res/style_unit.dart

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import 'package:flutter/material.dart';
2+
3+
import 'color_unit.dart';
4+
import 'size_unit.dart';
5+
6+
/// create by 张风捷特烈 on 2020/11/17
7+
/// contact me by email [email protected]
8+
/// 说明:
9+
10+
class TextStyleUnit {
11+
static const TextStyle hintStyle = const TextStyle(
12+
color: ColorUnit.input_hit_text_color,
13+
fontSize: SizeUnit.input_hit_text_size);
14+
15+
static const TextStyle primary = const TextStyle(
16+
color: ColorUnit.text_color, fontSize: SizeUnit.input_text_size);
17+
18+
static const TextStyle headTextStyle = const TextStyle(
19+
color: ColorUnit.head_text_color, fontSize: SizeUnit.head_text_size);
20+
21+
static const TextStyle smallSubTextStyle = const TextStyle(
22+
color: ColorUnit.input_hit_text_color,
23+
fontSize: SizeUnit.small_text_size);
24+
25+
static const TextStyle bigTextStyle = const TextStyle(
26+
color: ColorUnit.text_color, fontSize: SizeUnit.big_text_size);
27+
}

lib/blocs/bloc_exp.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ export 'global/global_bloc.dart';
2424
export 'global/global_state.dart';
2525
export 'global/global_event.dart';
2626

27-
export 'home/home_bloc.dart';
28-
export 'home/home_state.dart';
29-
export 'home/home_event.dart';
27+
export 'widgets/widgets_bloc.dart';
28+
export 'widgets/widgets_state.dart';
29+
export 'widgets/widgets_event.dart';
3030

3131

3232

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ import 'package:flutter_unit/app/enums.dart';
77
import 'package:flutter_unit/app/res/cons.dart';
88
import 'package:flutter_unit/repositories/itf/widget_repository.dart';
99

10-
import 'home_event.dart';
11-
import 'home_state.dart';
10+
import 'widgets_event.dart';
11+
import 'widgets_state.dart';
1212

1313
/// create by 张风捷特烈 on 2020-03-03
1414
/// contact me by email [email protected]
1515
/// 说明:
1616
17-
class HomeBloc extends Bloc<HomeEvent, HomeState> {
17+
class WidgetsBloc extends Bloc<WidgetsEvent, WidgetsState> {
1818
final WidgetRepository repository;
1919

20-
HomeBloc({@required this.repository});
20+
WidgetsBloc({@required this.repository});
2121

2222
@override
23-
HomeState get initialState => WidgetsLoading();
23+
WidgetsState get initialState => WidgetsLoading();
2424

2525
Color get activeHomeColor {
2626

@@ -31,13 +31,13 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
3131
}
3232

3333
@override
34-
Stream<HomeState> mapEventToState(HomeEvent event) async* {
34+
Stream<WidgetsState> mapEventToState(WidgetsEvent event) async* {
3535
if (event is EventTabTap) {
3636
yield* _mapLoadWidgetToState(event.family);
3737
}
3838
}
3939

40-
Stream<HomeState> _mapLoadWidgetToState(WidgetFamily family) async* {
40+
Stream<WidgetsState> _mapLoadWidgetToState(WidgetFamily family) async* {
4141
yield WidgetsLoading();
4242
try {
4343
final widgets = await this.repository.loadWidgets(family);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import 'package:flutter_unit/model/widget_model.dart';
99
/// contact me by email [email protected]
1010
/// 说明:
1111
12-
abstract class HomeEvent extends Equatable {
13-
const HomeEvent();
12+
abstract class WidgetsEvent extends Equatable {
13+
const WidgetsEvent();
1414
@override
1515
List<Object> get props => [];
1616
}
1717

18-
class EventTabTap extends HomeEvent {
18+
class EventTabTap extends WidgetsEvent {
1919
final WidgetFamily family;
2020

2121
EventTabTap(this.family);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ import 'package:flutter_unit/model/widget_model.dart';
77
/// contact me by email [email protected]
88
/// 说明: 主页状态类
99
10-
abstract class HomeState extends Equatable {
11-
const HomeState();
10+
abstract class WidgetsState extends Equatable {
11+
const WidgetsState();
1212

1313
@override
1414
List<Object> get props => [];
1515
}
1616

17-
class WidgetsLoading extends HomeState {
17+
class WidgetsLoading extends WidgetsState {
1818
const WidgetsLoading();
1919

2020
@override
2121
List<Object> get props => [];
2222
}
2323

24-
class WidgetsLoaded extends HomeState {
24+
class WidgetsLoaded extends WidgetsState {
2525
final List<WidgetModel> widgets;
2626
final WidgetFamily activeFamily;
2727

@@ -37,7 +37,7 @@ class WidgetsLoaded extends HomeState {
3737
}
3838
}
3939

40-
class WidgetsLoadFailed extends HomeState {
40+
class WidgetsLoadFailed extends WidgetsState {
4141
const WidgetsLoadFailed();
4242

4343
@override

lib/components/permanent/markdown/markdown_widget.dart

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,50 +29,50 @@ class MarkdownWidget extends StatelessWidget {
2929
color: UnitColor.subTextColor,
3030
border: new Border.all(
3131
color: UnitColor.subTextColor, width: 0.3)),
32-
blockquote: TextStyleUnit.smallTextWhite);
32+
blockquote: TStyleUnit.smallTextWhite);
3333
}
3434

3535
_getStyleSheetDark(BuildContext context) {
3636
return _getCommonSheet(context, Color.fromRGBO(40, 44, 52, 1.00)).copyWith(
37-
p: TextStyleUnit.smallTextWhite,
38-
h1: TextStyleUnit.largeLargeTextWhite,
39-
h2: TextStyleUnit.largeTextWhiteBold,
40-
h3: TextStyleUnit.normalTextMitWhiteBold,
41-
h4: TextStyleUnit.middleTextWhite,
42-
h5: TextStyleUnit.smallTextWhite,
43-
h6: TextStyleUnit.smallTextWhite,
37+
p: TStyleUnit.smallTextWhite,
38+
h1: TStyleUnit.largeLargeTextWhite,
39+
h2: TStyleUnit.largeTextWhiteBold,
40+
h3: TStyleUnit.normalTextMitWhiteBold,
41+
h4: TStyleUnit.middleTextWhite,
42+
h5: TStyleUnit.smallTextWhite,
43+
h6: TStyleUnit.smallTextWhite,
4444
em: const TextStyle(fontStyle: FontStyle.italic),
45-
strong: TextStyleUnit.middleTextWhiteBold,
46-
code: TextStyleUnit.smallSubText,
45+
strong: TStyleUnit.middleTextWhiteBold,
46+
code: TStyleUnit.smallSubText,
4747
);
4848
}
4949

5050
MarkdownStyleSheet _getStyleSheetWhite(BuildContext context) {
5151
return _getCommonSheet(context, Color.fromRGBO(40, 44, 52, 1.00)).copyWith(
52-
p: TextStyleUnit.smallText,
53-
h1: TextStyleUnit.largeLargeText,
54-
h2: TextStyleUnit.largeTextBold,
55-
h3: TextStyleUnit.normalTextBold,
56-
h4: TextStyleUnit.middleText,
57-
h5: TextStyleUnit.smallText,
58-
h6: TextStyleUnit.smallText,
59-
strong: TextStyleUnit.middleTextBold,
60-
code: TextStyleUnit.smallSubText,
52+
p: TStyleUnit.smallText,
53+
h1: TStyleUnit.largeLargeText,
54+
h2: TStyleUnit.largeTextBold,
55+
h3: TStyleUnit.normalTextBold,
56+
h4: TStyleUnit.middleText,
57+
h5: TStyleUnit.smallText,
58+
h6: TStyleUnit.smallText,
59+
strong: TStyleUnit.middleTextBold,
60+
code: TStyleUnit.smallSubText,
6161
);
6262
}
6363

6464
_getStyleSheetTheme(BuildContext context) {
6565
return _getCommonSheet(context, Color.fromRGBO(40, 44, 52, 1.00)).copyWith(
66-
p: TextStyleUnit.smallTextWhite,
67-
h1: TextStyleUnit.largeLargeTextWhite,
68-
h2: TextStyleUnit.largeTextWhiteBold,
69-
h3: TextStyleUnit.normalTextMitWhiteBold,
70-
h4: TextStyleUnit.middleTextWhite,
71-
h5: TextStyleUnit.smallTextWhite,
72-
h6: TextStyleUnit.smallTextWhite,
66+
p: TStyleUnit.smallTextWhite,
67+
h1: TStyleUnit.largeLargeTextWhite,
68+
h2: TStyleUnit.largeTextWhiteBold,
69+
h3: TStyleUnit.normalTextMitWhiteBold,
70+
h4: TStyleUnit.middleTextWhite,
71+
h5: TStyleUnit.smallTextWhite,
72+
h6: TStyleUnit.smallTextWhite,
7373
em: const TextStyle(fontStyle: FontStyle.italic),
74-
strong: TextStyleUnit.middleTextWhiteBold,
75-
code: TextStyleUnit.smallSubText,
74+
strong: TStyleUnit.middleTextWhiteBold,
75+
code: TStyleUnit.smallSubText,
7676
);
7777
}
7878

lib/components/project/loading_shower.dart

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import 'package:flutter/material.dart';
2+
import 'package:flutter_spinkit/flutter_spinkit.dart';
3+
import 'package:flutter_unit/app/res/style_unit.dart';
24
import 'package:flutter_unit/components/permanent/loading/planet_loading.dart';
35

46
/// create by 张风捷特烈 on 2020/10/24
@@ -9,6 +11,20 @@ class LoadingShower extends StatelessWidget {
911

1012
@override
1113
Widget build(BuildContext context) {
12-
return PlateLoading();
14+
return Center(
15+
child: Wrap(
16+
spacing: 10,
17+
direction: Axis.vertical,
18+
alignment: WrapAlignment.center,
19+
crossAxisAlignment: WrapCrossAlignment.center,
20+
children: [
21+
Container(
22+
width: 80,
23+
height: 80,
24+
child: SpinKitFadingCube(color: Theme.of(context).primaryColor)),
25+
Text("loading ...",style: TextStyleUnit.hintStyle,)
26+
],
27+
),
28+
);
1329
}
1430
}

0 commit comments

Comments
 (0)