Skip to content

Commit 467e009

Browse files
committed
refactor: rename files
1 parent f8d6aa3 commit 467e009

File tree

16 files changed

+101
-104
lines changed

16 files changed

+101
-104
lines changed

frontend/app_flowy/lib/startup/deps_resolver.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ void _resolveGridDeps(GetIt getIt) {
170170
),
171171
);
172172

173-
getIt.registerFactoryParam<SelectionCellBloc, GridSelectOptionCellContext, void>(
174-
(context, _) => SelectionCellBloc(
173+
getIt.registerFactoryParam<SelectOptionCellBloc, GridSelectOptionCellContext, void>(
174+
(context, _) => SelectOptionCellBloc(
175175
cellContext: context,
176176
),
177177
);

frontend/app_flowy/lib/workspace/application/grid/cell/selection_cell_bloc.dart renamed to frontend/app_flowy/lib/workspace/application/grid/cell/select_option_cell_bloc.dart

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import 'package:flutter_bloc/flutter_bloc.dart';
44
import 'package:freezed_annotation/freezed_annotation.dart';
55
import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';
66

7-
part 'selection_cell_bloc.freezed.dart';
7+
part 'select_option_cell_bloc.freezed.dart';
88

9-
class SelectionCellBloc extends Bloc<SelectionCellEvent, SelectionCellState> {
9+
class SelectOptionCellBloc extends Bloc<SelectOptionCellEvent, SelectOptionCellState> {
1010
final GridSelectOptionCellContext cellContext;
1111
void Function()? _onCellChangedFn;
1212

13-
SelectionCellBloc({
13+
SelectOptionCellBloc({
1414
required this.cellContext,
15-
}) : super(SelectionCellState.initial(cellContext)) {
16-
on<SelectionCellEvent>(
15+
}) : super(SelectOptionCellState.initial(cellContext)) {
16+
on<SelectOptionCellEvent>(
1717
(event, emit) async {
1818
await event.map(
1919
initial: (_InitialCell value) async {
@@ -44,7 +44,7 @@ class SelectionCellBloc extends Bloc<SelectionCellEvent, SelectionCellState> {
4444
_onCellChangedFn = cellContext.startListening(
4545
onCellChanged: ((selectOptionContext) {
4646
if (!isClosed) {
47-
add(SelectionCellEvent.didReceiveOptions(
47+
add(SelectOptionCellEvent.didReceiveOptions(
4848
selectOptionContext.options,
4949
selectOptionContext.selectOptions,
5050
));
@@ -55,25 +55,25 @@ class SelectionCellBloc extends Bloc<SelectionCellEvent, SelectionCellState> {
5555
}
5656

5757
@freezed
58-
class SelectionCellEvent with _$SelectionCellEvent {
59-
const factory SelectionCellEvent.initial() = _InitialCell;
60-
const factory SelectionCellEvent.didReceiveOptions(
58+
class SelectOptionCellEvent with _$SelectOptionCellEvent {
59+
const factory SelectOptionCellEvent.initial() = _InitialCell;
60+
const factory SelectOptionCellEvent.didReceiveOptions(
6161
List<SelectOption> options,
6262
List<SelectOption> selectedOptions,
6363
) = _DidReceiveOptions;
6464
}
6565

6666
@freezed
67-
class SelectionCellState with _$SelectionCellState {
68-
const factory SelectionCellState({
67+
class SelectOptionCellState with _$SelectOptionCellState {
68+
const factory SelectOptionCellState({
6969
required List<SelectOption> options,
7070
required List<SelectOption> selectedOptions,
71-
}) = _SelectionCellState;
71+
}) = _SelectOptionCellState;
7272

73-
factory SelectionCellState.initial(GridSelectOptionCellContext context) {
73+
factory SelectOptionCellState.initial(GridSelectOptionCellContext context) {
7474
final data = context.getCellData();
7575

76-
return SelectionCellState(
76+
return SelectOptionCellState(
7777
options: data?.options ?? [],
7878
selectedOptions: data?.selectOptions ?? [],
7979
);

frontend/app_flowy/lib/workspace/application/grid/cell/selection_editor_bloc.dart renamed to frontend/app_flowy/lib/workspace/application/grid/cell/select_option_editor_bloc.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import 'package:freezed_annotation/freezed_annotation.dart';
77
import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';
88
import 'select_option_service.dart';
99

10-
part 'selection_editor_bloc.freezed.dart';
10+
part 'select_option_editor_bloc.freezed.dart';
1111

12-
class SelectOptionEditorBloc extends Bloc<SelectOptionEditorEvent, SelectOptionEditorState> {
12+
class SelectOptionCellEditorBloc extends Bloc<SelectOptionEditorEvent, SelectOptionEditorState> {
1313
final SelectOptionService _selectOptionService;
1414
final GridSelectOptionCellContext cellContext;
1515
void Function()? _onCellChangedFn;
1616

17-
SelectOptionEditorBloc({
17+
SelectOptionCellEditorBloc({
1818
required this.cellContext,
1919
}) : _selectOptionService = SelectOptionService(gridCell: cellContext.gridCell),
2020
super(SelectOptionEditorState.initial(cellContext)) {

frontend/app_flowy/lib/workspace/application/grid/prelude.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export 'field/type_option/single_select_bloc.dart';
1818
// Cell
1919
export 'cell/text_cell_bloc.dart';
2020
export 'cell/number_cell_bloc.dart';
21-
export 'cell/selection_cell_bloc.dart';
21+
export 'cell/select_option_cell_bloc.dart';
2222
export 'cell/date_cell_bloc.dart';
2323
export 'cell/checkbox_cell_bloc.dart';
2424
export 'cell/cell_service/cell_service.dart';

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:styled_widget/styled_widget.dart';
1111
import 'checkbox_cell.dart';
1212
import 'date_cell/date_cell.dart';
1313
import 'number_cell.dart';
14-
import 'selection_cell/selection_cell.dart';
14+
import 'select_option_cell/select_option_cell.dart';
1515
import 'text_cell.dart';
1616

1717
GridCellWidget buildGridCellWidget(GridCell gridCell, GridCellCache cellCache, {GridCellStyle? style}) {

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/date_cell/date_cell.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:app_flowy/startup/startup.dart';
55
import 'package:app_flowy/workspace/application/grid/prelude.dart';
66

77
import '../cell_builder.dart';
8-
import 'calendar.dart';
8+
import 'date_editor.dart';
99

1010
class DateCellStyle extends GridCellStyle {
1111
Alignment alignment;
@@ -77,7 +77,7 @@ class _DateCellState extends State<DateCell> {
7777
void _showCalendar(BuildContext context) {
7878
final bloc = context.read<DateCellBloc>();
7979
widget.onFocus.value = true;
80-
final calendar = CellCalendar(onDismissed: () => widget.onFocus.value = false);
80+
final calendar = DateCellEditor(onDismissed: () => widget.onFocus.value = false);
8181
calendar.show(
8282
context,
8383
cellContext: bloc.cellContext.clone(),
Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,42 +22,33 @@ final kFirstDay = DateTime(kToday.year, kToday.month - 3, kToday.day);
2222
final kLastDay = DateTime(kToday.year, kToday.month + 3, kToday.day);
2323
const kMargin = EdgeInsets.symmetric(horizontal: 6, vertical: 10);
2424

25-
class CellCalendar with FlowyOverlayDelegate {
25+
class DateCellEditor with FlowyOverlayDelegate {
2626
final VoidCallback onDismissed;
2727

28-
const CellCalendar({
28+
const DateCellEditor({
2929
required this.onDismissed,
3030
});
3131

3232
Future<void> show(
3333
BuildContext context, {
3434
required GridDateCellContext cellContext,
3535
}) async {
36-
CellCalendar.remove(context);
36+
DateCellEditor.remove(context);
3737

3838
final result = await cellContext.getTypeOptionData();
3939
result.fold(
4040
(data) {
41-
final typeOptionData = DateTypeOption.fromBuffer(data);
42-
// DateTime? selectedDay;
43-
// final cellData = cellContext.getCellData();
44-
45-
// if (cellData != null) {
46-
// final timestamp = $fixnum.Int64.parseInt(cellData).toInt();
47-
// selectedDay = DateTime.fromMillisecondsSinceEpoch(timestamp * 1000);
48-
// }
49-
5041
final calendar = _CellCalendarWidget(
5142
cellContext: cellContext,
52-
dateTypeOption: typeOptionData,
43+
dateTypeOption: DateTypeOption.fromBuffer(data),
5344
);
5445

5546
FlowyOverlay.of(context).insertWithAnchor(
5647
widget: OverlayContainer(
5748
child: calendar,
5849
constraints: BoxConstraints.loose(const Size(320, 500)),
5950
),
60-
identifier: CellCalendar.identifier(),
51+
identifier: DateCellEditor.identifier(),
6152
anchorContext: context,
6253
anchorDirection: AnchorDirection.leftWithCenterAligned,
6354
style: FlowyOverlayStyle(blur: false),
@@ -73,7 +64,7 @@ class CellCalendar with FlowyOverlayDelegate {
7364
}
7465

7566
static String identifier() {
76-
return (CellCalendar).toString();
67+
return (DateCellEditor).toString();
7768
}
7869

7970
@override

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/prelude.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ export 'text_cell.dart';
33
export 'number_cell.dart';
44
export 'date_cell/date_cell.dart';
55
export 'checkbox_cell.dart';
6-
export 'selection_cell/selection_cell.dart';
6+
export 'select_option_cell/select_option_cell.dart';
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:flutter/material.dart';
1010
import 'package:flutter_bloc/flutter_bloc.dart';
1111

1212
import 'extension.dart';
13-
import 'selection_editor.dart';
13+
import 'select_option_editor.dart';
1414

1515
class SelectOptionCellStyle extends GridCellStyle {
1616
String placeholder;
@@ -41,20 +41,20 @@ class SingleSelectCell extends GridCellWidget {
4141
}
4242

4343
class _SingleSelectCellState extends State<SingleSelectCell> {
44-
late SelectionCellBloc _cellBloc;
44+
late SelectOptionCellBloc _cellBloc;
4545

4646
@override
4747
void initState() {
4848
final cellContext = widget.cellContextBuilder.build() as GridSelectOptionCellContext;
49-
_cellBloc = getIt<SelectionCellBloc>(param1: cellContext)..add(const SelectionCellEvent.initial());
49+
_cellBloc = getIt<SelectOptionCellBloc>(param1: cellContext)..add(const SelectOptionCellEvent.initial());
5050
super.initState();
5151
}
5252

5353
@override
5454
Widget build(BuildContext context) {
5555
return BlocProvider.value(
5656
value: _cellBloc,
57-
child: BlocBuilder<SelectionCellBloc, SelectionCellState>(
57+
child: BlocBuilder<SelectOptionCellBloc, SelectOptionCellState>(
5858
builder: (context, state) {
5959
return _SelectOptionCell(
6060
selectOptions: state.selectedOptions,
@@ -95,20 +95,20 @@ class MultiSelectCell extends GridCellWidget {
9595
}
9696

9797
class _MultiSelectCellState extends State<MultiSelectCell> {
98-
late SelectionCellBloc _cellBloc;
98+
late SelectOptionCellBloc _cellBloc;
9999

100100
@override
101101
void initState() {
102102
final cellContext = widget.cellContextBuilder.build() as GridSelectOptionCellContext;
103-
_cellBloc = getIt<SelectionCellBloc>(param1: cellContext)..add(const SelectionCellEvent.initial());
103+
_cellBloc = getIt<SelectOptionCellBloc>(param1: cellContext)..add(const SelectOptionCellEvent.initial());
104104
super.initState();
105105
}
106106

107107
@override
108108
Widget build(BuildContext context) {
109109
return BlocProvider.value(
110110
value: _cellBloc,
111-
child: BlocBuilder<SelectionCellBloc, SelectionCellState>(
111+
child: BlocBuilder<SelectOptionCellBloc, SelectOptionCellState>(
112112
builder: (context, state) {
113113
return _SelectOptionCell(
114114
selectOptions: state.selectedOptions,

0 commit comments

Comments
 (0)