@@ -22,7 +22,7 @@ part 'board_bloc.freezed.dart';
2222
2323class BoardBloc extends Bloc <BoardEvent , BoardState > {
2424 final BoardDataController _gridDataController;
25- late final AFBoardDataController boardController;
25+ late final AppFlowyBoardController boardController;
2626 final MoveRowFFIService _rowService;
2727 LinkedHashMap <String , GroupController > groupControllers = LinkedHashMap ();
2828
@@ -34,16 +34,16 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
3434 : _rowService = MoveRowFFIService (gridId: view.id),
3535 _gridDataController = BoardDataController (view: view),
3636 super (BoardState .initial (view.id)) {
37- boardController = AFBoardDataController (
38- onMoveColumn : (
37+ boardController = AppFlowyBoardController (
38+ onMoveGroup : (
3939 fromColumnId,
4040 fromIndex,
4141 toColumnId,
4242 toIndex,
4343 ) {
4444 _moveGroup (fromColumnId, toColumnId);
4545 },
46- onMoveColumnItem : (
46+ onMoveGroupItem : (
4747 columnId,
4848 fromIndex,
4949 toIndex,
@@ -52,15 +52,15 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
5252 final toRow = groupControllers[columnId]? .rowAtIndex (toIndex);
5353 _moveRow (fromRow, columnId, toRow);
5454 },
55- onMoveColumnItemToColumn : (
56- fromColumnId ,
55+ onMoveGroupItemToGroup : (
56+ fromGroupId ,
5757 fromIndex,
58- toColumnId ,
58+ toGroupId ,
5959 toIndex,
6060 ) {
61- final fromRow = groupControllers[fromColumnId ]? .rowAtIndex (fromIndex);
62- final toRow = groupControllers[toColumnId ]? .rowAtIndex (toIndex);
63- _moveRow (fromRow, toColumnId , toRow);
61+ final fromRow = groupControllers[fromGroupId ]? .rowAtIndex (fromIndex);
62+ final toRow = groupControllers[toGroupId ]? .rowAtIndex (toIndex);
63+ _moveRow (fromRow, toGroupId , toRow);
6464 },
6565 );
6666
@@ -165,10 +165,10 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
165165 boardController.clear ();
166166
167167 //
168- List <AFBoardColumnData > columns = groups
168+ List <AppFlowyGroupData > columns = groups
169169 .where ((group) => fieldController.getField (group.fieldId) != null )
170170 .map ((group) {
171- return AFBoardColumnData (
171+ return AppFlowyGroupData (
172172 id: group.groupId,
173173 name: group.desc,
174174 items: _buildRows (group),
@@ -178,7 +178,7 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
178178 ),
179179 );
180180 }).toList ();
181- boardController.addColumns (columns);
181+ boardController.addGroups (columns);
182182
183183 for (final group in groups) {
184184 final delegate = GroupControllerDelegateImpl (
@@ -227,8 +227,8 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
227227 if (isClosed) return ;
228228 for (final group in updatedGroups) {
229229 final columnController =
230- boardController.getColumnController (group.groupId);
231- columnController? .updateColumnName (group.desc);
230+ boardController.getGroupController (group.groupId);
231+ columnController? .updateGroupName (group.desc);
232232 }
233233 },
234234 onError: (err) {
@@ -243,13 +243,13 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
243243 );
244244 }
245245
246- List <AFColumnItem > _buildRows (GroupPB group) {
246+ List <AppFlowyGroupItem > _buildRows (GroupPB group) {
247247 final items = group.rows.map ((row) {
248248 final fieldContext = fieldController.getField (group.fieldId);
249249 return BoardColumnItem (row: row, fieldContext: fieldContext! );
250250 }).toList ();
251251
252- return < AFColumnItem > [...items];
252+ return < AppFlowyGroupItem > [...items];
253253 }
254254
255255 Future <void > _loadGrid (Emitter <BoardState > emit) async {
@@ -335,7 +335,7 @@ class GridFieldEquatable extends Equatable {
335335 UnmodifiableListView <FieldPB > get value => UnmodifiableListView (_fields);
336336}
337337
338- class BoardColumnItem extends AFColumnItem {
338+ class BoardColumnItem extends AppFlowyGroupItem {
339339 final RowPB row;
340340 final GridFieldContext fieldContext;
341341
@@ -350,7 +350,7 @@ class BoardColumnItem extends AFColumnItem {
350350
351351class GroupControllerDelegateImpl extends GroupControllerDelegate {
352352 final GridFieldController fieldController;
353- final AFBoardDataController controller;
353+ final AppFlowyBoardController controller;
354354 final void Function (String , RowPB , int ? ) onNewColumnItem;
355355
356356 GroupControllerDelegateImpl ({
@@ -369,16 +369,16 @@ class GroupControllerDelegateImpl extends GroupControllerDelegate {
369369
370370 if (index != null ) {
371371 final item = BoardColumnItem (row: row, fieldContext: fieldContext);
372- controller.insertColumnItem (group.groupId, index, item);
372+ controller.insertGroupItem (group.groupId, index, item);
373373 } else {
374374 final item = BoardColumnItem (row: row, fieldContext: fieldContext);
375- controller.addColumnItem (group.groupId, item);
375+ controller.addGroupItem (group.groupId, item);
376376 }
377377 }
378378
379379 @override
380380 void removeRow (GroupPB group, String rowId) {
381- controller.removeColumnItem (group.groupId, rowId);
381+ controller.removeGroupItem (group.groupId, rowId);
382382 }
383383
384384 @override
@@ -388,7 +388,7 @@ class GroupControllerDelegateImpl extends GroupControllerDelegate {
388388 Log .warn ("FieldContext should not be null" );
389389 return ;
390390 }
391- controller.updateColumnItem (
391+ controller.updateGroupItem (
392392 group.groupId,
393393 BoardColumnItem (row: row, fieldContext: fieldContext),
394394 );
@@ -404,9 +404,9 @@ class GroupControllerDelegateImpl extends GroupControllerDelegate {
404404 final item = BoardColumnItem (row: row, fieldContext: fieldContext);
405405
406406 if (index != null ) {
407- controller.insertColumnItem (group.groupId, index, item);
407+ controller.insertGroupItem (group.groupId, index, item);
408408 } else {
409- controller.addColumnItem (group.groupId, item);
409+ controller.addGroupItem (group.groupId, item);
410410 }
411411 onNewColumnItem (group.groupId, row, index);
412412 }
0 commit comments