Skip to content

Commit d3823eb

Browse files
authored
refactor: moving grid widgets used by other database view to upper level folder
* refactor: export UIs in flowy_infra_ui * refactor: move cells to upper level folder * refactor: move cell blocs
1 parent 7106195 commit d3823eb

File tree

81 files changed

+224
-300
lines changed

Some content is hidden

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

81 files changed

+224
-300
lines changed

frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_data_controller.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import 'row_cache.dart';
44

55
typedef OnRowChanged = void Function(CellByFieldId, RowsChangedReason);
66

7-
class RowDataController {
7+
class RowController {
88
final String rowId;
99
final String viewId;
1010
final List<VoidCallback> _onRowChangedListeners = [];
1111
final RowCache _rowCache;
1212

1313
get cellCache => _rowCache.cellCache;
1414

15-
RowDataController({
15+
RowController({
1616
required this.rowId,
1717
required this.viewId,
1818
required RowCache rowCache,

frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import 'package:appflowy/generated/locale_keys.g.dart';
66
import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';
77
import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';
88
import 'package:appflowy/plugins/database_view/application/row/row_data_controller.dart';
9-
import 'package:appflowy/plugins/database_view/grid/presentation/widgets/cell/cell_builder.dart';
10-
import 'package:appflowy/plugins/database_view/grid/presentation/widgets/row/row_detail.dart';
9+
import 'package:appflowy/plugins/database_view/widgets/row/row_detail.dart';
1110
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
1211
import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';
1312
import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';
@@ -22,6 +21,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
2221

2322
import '../../widgets/card/cells/card_cell.dart';
2423
import '../../widgets/card/card_cell_builder.dart';
24+
import '../../widgets/row/cell_builder.dart';
2525
import '../application/board_bloc.dart';
2626
import '../../widgets/card/card.dart';
2727
import 'toolbar/board_toolbar.dart';
@@ -312,7 +312,7 @@ class _BoardContentState extends State<BoardContent> {
312312
rowPB: rowPB,
313313
);
314314

315-
final dataController = RowDataController(
315+
final dataController = RowController(
316316
rowId: rowInfo.rowPB.id,
317317
viewId: rowInfo.viewId,
318318
rowCache: rowCache,

frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/toolbar/board_toolbar.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'package:appflowy_popover/appflowy_popover.dart';
55
import 'package:easy_localization/easy_localization.dart';
66
import 'package:flowy_infra/theme_extension.dart';
77
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
8-
import 'package:flowy_infra_ui/style_widget/button.dart';
98
import 'package:flutter/material.dart';
109

1110
import 'board_setting.dart';

frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:appflowy/generated/locale_keys.g.dart';
22
import 'package:appflowy/plugins/database_view/application/row/row_data_controller.dart';
33
import 'package:appflowy/plugins/database_view/calendar/application/calendar_bloc.dart';
4-
import 'package:appflowy/plugins/database_view/grid/presentation/widgets/cell/cell_builder.dart';
54
import 'package:appflowy/plugins/database_view/widgets/card/card_cell_builder.dart';
65
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
76
import 'package:calendar_view/calendar_view.dart';
@@ -10,15 +9,14 @@ import 'package:flowy_infra/image.dart';
109
import 'package:flowy_infra/size.dart';
1110
import 'package:flowy_infra/theme_extension.dart';
1211
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
13-
import 'package:flowy_infra_ui/style_widget/button.dart';
1412
import 'package:flowy_infra_ui/style_widget/hover.dart';
15-
import 'package:flowy_infra_ui/style_widget/icon_button.dart';
1613
import 'package:flutter/material.dart';
1714
import 'package:flutter_bloc/flutter_bloc.dart';
1815
import 'package:provider/provider.dart';
1916

2017
import '../../grid/presentation/layout/sizes.dart';
21-
import '../../grid/presentation/widgets/row/row_detail.dart';
18+
import '../../widgets/row/cell_builder.dart';
19+
import '../../widgets/row/row_detail.dart';
2220
import 'layout/sizes.dart';
2321
import 'toolbar/calendar_toolbar.dart';
2422

@@ -167,7 +165,7 @@ class _CalendarPageState extends State<CalendarPage> {
167165
return FlowyHover(
168166
child: GestureDetector(
169167
onTap: () {
170-
final dataController = RowDataController(
168+
final dataController = RowController(
171169
rowId: event.cellId.rowId,
172170
viewId: widget.view.id,
173171
rowCache: _calendarBloc.rowCache,

frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_bloc.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ part 'row_bloc.freezed.dart';
1414

1515
class RowBloc extends Bloc<RowEvent, RowState> {
1616
final RowBackendService _rowBackendSvc;
17-
final RowDataController _dataController;
17+
final RowController _dataController;
1818

1919
RowBloc({
2020
required RowInfo rowInfo,
21-
required RowDataController dataController,
21+
required RowController dataController,
2222
}) : _rowBackendSvc = RowBackendService(viewId: rowInfo.viewId),
2323
_dataController = dataController,
2424
super(RowState.initial(rowInfo, dataController.loadData())) {

frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_detail_bloc.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import '../../../application/row/row_data_controller.dart';
77
part 'row_detail_bloc.freezed.dart';
88

99
class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {
10-
final RowDataController dataController;
10+
final RowController dataController;
1111

1212
RowDetailBloc({
1313
required this.dataController,

frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:appflowy/generated/locale_keys.g.dart';
2+
import 'package:appflowy/plugins/database_view/widgets/row/cell_builder.dart';
23
import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pbenum.dart';
34
import 'package:easy_localization/easy_localization.dart';
45
import 'package:flowy_infra_ui/flowy_infra_ui_web.dart';
@@ -23,11 +24,10 @@ import 'grid_scroll.dart';
2324
import 'layout/layout.dart';
2425
import 'layout/sizes.dart';
2526
import 'widgets/accessory_menu.dart';
26-
import 'widgets/cell/cell_builder.dart';
27-
import 'widgets/row/grid_row.dart';
27+
import 'widgets/row/row.dart';
2828
import 'widgets/footer/grid_footer.dart';
2929
import 'widgets/header/grid_header.dart';
30-
import 'widgets/row/row_detail.dart';
30+
import '../../widgets/row/row_detail.dart';
3131
import 'widgets/shortcuts.dart';
3232
import 'widgets/toolbar/grid_toolbar.dart';
3333

@@ -279,15 +279,15 @@ class _GridRowsState extends State<_GridRows> {
279279

280280
final fieldController =
281281
context.read<GridBloc>().databaseController.fieldController;
282-
final dataController = RowDataController(
282+
final dataController = RowController(
283283
rowId: rowInfo.rowPB.id,
284284
viewId: rowInfo.viewId,
285285
rowCache: rowCache,
286286
);
287287

288288
return SizeTransition(
289289
sizeFactor: animation,
290-
child: GridRowWidget(
290+
child: GridRow(
291291
rowInfo: rowInfo,
292292
dataController: dataController,
293293
cellBuilder: GridCellBuilder(cellCache: dataController.cellCache),
@@ -312,7 +312,7 @@ class _GridRowsState extends State<_GridRows> {
312312
RowCache rowCache,
313313
GridCellBuilder cellBuilder,
314314
) {
315-
final dataController = RowDataController(
315+
final dataController = RowController(
316316
viewId: rowInfo.viewId,
317317
rowId: rowInfo.rowPB.id,
318318
rowCache: rowCache,

frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/prelude.dart

Lines changed: 0 additions & 7 deletions
This file was deleted.

frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/checkbox.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'package:appflowy_popover/appflowy_popover.dart';
55
import 'package:easy_localization/easy_localization.dart';
66
import 'package:flowy_infra/image.dart';
77
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
8-
import 'package:flowy_infra_ui/widget/spacing.dart';
98
import 'package:appflowy_backend/protobuf/flowy-database/checkbox_filter.pbenum.dart';
109
import 'package:flutter/material.dart';
1110
import 'package:flutter_bloc/flutter_bloc.dart';

frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/checklist/checklist.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
44
import 'package:appflowy_popover/appflowy_popover.dart';
55
import 'package:easy_localization/easy_localization.dart';
66
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
7-
import 'package:flowy_infra_ui/widget/spacing.dart';
87
import 'package:appflowy_backend/protobuf/flowy-database/checklist_filter.pbenum.dart';
98
import 'package:flutter/material.dart';
109
import 'package:flutter_bloc/flutter_bloc.dart';

0 commit comments

Comments
 (0)