Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
refactor: move plugin application and presentation together
appflowy6d385e811f6b
diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/blank/blank.dart b/frontend/app_flowy/lib/plugins/blank/blank.dartsimilarity index 91%rename from frontend/app_flowy/lib/workspace/presentation/plugins/blank/blank.dartrename to frontend/app_flowy/lib/plugins/blank/blank.dartindex 05456f20f4..11f779eeb0 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/blank/blank.dart+++ b/frontend/app_flowy/lib/plugins/blank/blank.dart@@ -4,7 +4,7 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';class BlankPluginBuilder extends PluginBuilder {@override@@ -42,7 +42,8 @@ class BlankPagePlugin extends Plugin {class BlankPagePluginDisplay extends PluginDisplay with NavigationItem {@override- Widget get leftBarItem => FlowyText.medium(LocaleKeys.blankPageTitle.tr(), fontSize: 12);+ Widget get leftBarItem =>+ FlowyText.medium(LocaleKeys.blankPageTitle.tr(), fontSize: 12);@overrideWidget buildWidget() => const BlankPage();diff --git a/frontend/app_flowy/lib/workspace/application/board/board_bloc.dart b/frontend/app_flowy/lib/plugins/board/application/board_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/board/board_bloc.dartrename to frontend/app_flowy/lib/plugins/board/application/board_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/board/board.dart b/frontend/app_flowy/lib/plugins/board/board.dartsimilarity index 89%rename from frontend/app_flowy/lib/workspace/presentation/plugins/board/board.dartrename to frontend/app_flowy/lib/plugins/board/board.dartindex 30e8d2743c..11a6d415eb 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/board/board.dart+++ b/frontend/app_flowy/lib/plugins/board/board.dart@@ -1,10 +1,10 @@import 'package:app_flowy/workspace/presentation/home/home_stack.dart';-import 'package:app_flowy/workspace/presentation/plugins/widgets/left_bar_item.dart';+import 'package:app_flowy/workspace/presentation/widgets/left_bar_item.dart';import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:flutter/material.dart';-import 'src/board_page.dart';+import 'presentation/board_page.dart';class BoardPluginBuilder implements PluginBuilder {@overridediff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/board/src/board_page.dart b/frontend/app_flowy/lib/plugins/board/presentation/board_page.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/board/src/board_page.dartrename to frontend/app_flowy/lib/plugins/board/presentation/board_page.dartdiff --git a/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart b/frontend/app_flowy/lib/plugins/doc/application/doc_bloc.dartsimilarity index 85%rename from frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dartrename to frontend/app_flowy/lib/plugins/doc/application/doc_bloc.dartindex 8be4c40d85..ed12227af0 100644--- a/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart+++ b/frontend/app_flowy/lib/plugins/doc/application/doc_bloc.dart@@ -1,7 +1,7 @@import 'dart:convert';-import 'package:app_flowy/workspace/application/doc/doc_service.dart';-import 'package:app_flowy/workspace/application/trash/trash_service.dart';+import 'package:app_flowy/plugins/trash/application/trash_service.dart';import 'package:app_flowy/workspace/application/view/view_listener.dart';+import 'package:app_flowy/plugins/doc/application/doc_service.dart';import 'package:flowy_sdk/protobuf/flowy-folder/trash.pb.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';@@ -43,14 +43,17 @@ class DocumentBloc extends Bloc<DocumentEvent, DocumentState> {emit(state.copyWith(isDeleted: false));},deletePermanently: (DeletePermanently value) async {- final result = await trashService.deleteViews([Tuple2(view.id, TrashType.TrashView)]);+ final result = await trashService+ .deleteViews([Tuple2(view.id, TrashType.TrashView)]);- final newState = result.fold((l) => state.copyWith(forceClose: true), (r) => state);+ final newState = result.fold(+ (l) => state.copyWith(forceClose: true), (r) => state);emit(newState);},restorePage: (RestorePage value) async {final result = await trashService.putback(view.id);- final newState = result.fold((l) => state.copyWith(isDeleted: false), (r) => state);+ final newState = result.fold(+ (l) => state.copyWith(isDeleted: false), (r) => state);emit(newState);},);@@ -93,10 +96,12 @@ class DocumentBloc extends Bloc<DocumentEvent, DocumentState> {final documentDelta = document.toDelta();_composeDelta(delta, documentDelta);});- emit(state.copyWith(loadingState: DocumentLoadingState.finish(left(unit))));+ emit(state.copyWith(+ loadingState: DocumentLoadingState.finish(left(unit))));},(err) {- emit(state.copyWith(loadingState: DocumentLoadingState.finish(right(err))));+ emit(state.copyWith(+ loadingState: DocumentLoadingState.finish(right(err))));},);}@@ -156,5 +161,6 @@ class DocumentState with _$DocumentState {@freezedclass DocumentLoadingState with _$DocumentLoadingState {const factory DocumentLoadingState.loading() = _Loading;- const factory DocumentLoadingState.finish(Either<Unit, FlowyError> successOrFail) = _Finish;+ const factory DocumentLoadingState.finish(+ Either<Unit, FlowyError> successOrFail) = _Finish;}diff --git a/frontend/app_flowy/lib/workspace/application/doc/doc_service.dart b/frontend/app_flowy/lib/plugins/doc/application/doc_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/doc/doc_service.dartrename to frontend/app_flowy/lib/plugins/doc/application/doc_service.dartdiff --git a/frontend/app_flowy/lib/workspace/application/doc/prelude.dart b/frontend/app_flowy/lib/plugins/doc/application/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/doc/prelude.dartrename to frontend/app_flowy/lib/plugins/doc/application/prelude.dartdiff --git a/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart b/frontend/app_flowy/lib/plugins/doc/application/share_bloc.dartsimilarity index 84%rename from frontend/app_flowy/lib/workspace/application/doc/share_bloc.dartrename to frontend/app_flowy/lib/plugins/doc/application/share_bloc.dartindex ba3c7676c6..98904c035a 100644--- a/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart+++ b/frontend/app_flowy/lib/plugins/doc/application/share_bloc.dart@@ -1,8 +1,8 @@import 'dart:async';import 'dart:io';import 'package:app_flowy/startup/tasks/rust_sdk.dart';-import 'package:app_flowy/workspace/application/doc/share_service.dart';import 'package:app_flowy/workspace/application/markdown/delta_markdown.dart';+import 'package:app_flowy/plugins/doc/application/share_service.dart';import 'package:flowy_sdk/protobuf/flowy-text-block/entities.pb.dart';import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';@@ -14,13 +14,15 @@ part 'share_bloc.freezed.dart';class DocShareBloc extends Bloc<DocShareEvent, DocShareState> {ShareService service;ViewPB view;- DocShareBloc({required this.view, required this.service}) : super(const DocShareState.initial()) {+ DocShareBloc({required this.view, required this.service})+ : super(const DocShareState.initial()) {on<DocShareEvent>((event, emit) async {await event.map(shareMarkdown: (ShareMarkdown value) async {await service.exportMarkdown(view.id).then((result) {result.fold(- (value) => emit(DocShareState.finish(left(_convertDeltaToMarkdown(value)))),+ (value) => emit(+ DocShareState.finish(left(_convertDeltaToMarkdown(value)))),(error) => emit(DocShareState.finish(right(error))),);});@@ -73,5 +75,6 @@ class DocShareEvent with _$DocShareEvent {class DocShareState with _$DocShareState {const factory DocShareState.initial() = _Initial;const factory DocShareState.loading() = _Loading;- const factory DocShareState.finish(Either<ExportDataPB, FlowyError> successOrFail) = _Finish;+ const factory DocShareState.finish(+ Either<ExportDataPB, FlowyError> successOrFail) = _Finish;}diff --git a/frontend/app_flowy/lib/workspace/application/doc/share_service.dart b/frontend/app_flowy/lib/plugins/doc/application/share_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/doc/share_service.dartrename to frontend/app_flowy/lib/plugins/doc/application/share_service.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dart b/frontend/app_flowy/lib/plugins/doc/document.dartsimilarity index 85%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dartrename to frontend/app_flowy/lib/plugins/doc/document.dartindex c09843873d..91bae222c1 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dart+++ b/frontend/app_flowy/lib/plugins/doc/document.dart@@ -1,14 +1,14 @@library docuemnt_plugin;import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/startup/startup.dart';import 'package:app_flowy/workspace/application/appearance.dart';-import 'package:app_flowy/workspace/application/doc/share_bloc.dart';import 'package:app_flowy/workspace/application/view/view_listener.dart';+import 'package:app_flowy/plugins/doc/application/share_bloc.dart';import 'package:app_flowy/workspace/presentation/home/home_stack.dart';import 'package:app_flowy/workspace/presentation/home/toast.dart';-import 'package:app_flowy/workspace/presentation/plugins/widgets/left_bar_item.dart';+import 'package:app_flowy/workspace/presentation/widgets/left_bar_item.dart';import 'package:app_flowy/workspace/presentation/widgets/dialogs.dart';import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:clipboard/clipboard.dart';@@ -26,12 +26,7 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:provider/provider.dart';-import 'src/document_page.dart';--export './src/document_page.dart';-export './src/widget/toolbar/history_button.dart';-export './src/widget/toolbar/tool_bar.dart';-export './src/widget/toolbar/toolbar_icon_button.dart';+import 'document_page.dart';class DocumentPluginBuilder extends PluginBuilder {@override@@ -58,7 +53,9 @@ class DocumentPlugin implements Plugin {ViewListener? _listener;late PluginType _pluginType;- DocumentPlugin({required PluginType pluginType, required ViewPB view, Key? key}) : _view = view {+ DocumentPlugin(+ {required PluginType pluginType, required ViewPB view, Key? key})+ : _view = view {_pluginType = pluginType;_listener = getIt<ViewListener>(param1: view);_listener?.start(onViewUpdated: (result) {@@ -112,7 +109,8 @@ class DocumentPluginDisplay extends PluginDisplay<int> with NavigationItem {class DocumentShareButton extends StatelessWidget {final ViewPB view;- DocumentShareButton({Key? key, required this.view}) : super(key: ValueKey(view.hashCode));+ DocumentShareButton({Key? key, required this.view})+ : super(key: ValueKey(view.hashCode));@overrideWidget build(BuildContext context) {@@ -149,7 +147,8 @@ class DocumentShareButton extends StatelessWidget {fontSize: 12,borderRadius: Corners.s6Border,color: Colors.lightBlue,- onPressed: () => _showActionList(context, Offset(-(buttonWidth / 2), 10)),+ onPressed: () => _showActionList(+ context, Offset(-(buttonWidth / 2), 10)),),),),@@ -165,7 +164,8 @@ class DocumentShareButton extends StatelessWidget {case ExportType.Link:break;case ExportType.Markdown:- FlutterClipboard.copy(exportData.data).then((value) => Log.info('copied to clipboard'));+ FlutterClipboard.copy(exportData.data)+ .then((value) => Log.info('copied to clipboard'));break;case ExportType.Text:break;@@ -179,11 +179,15 @@ class DocumentShareButton extends StatelessWidget {result.fold(() {}, (action) {switch (action) {case ShareAction.markdown:- context.read<DocShareBloc>().add(const DocShareEvent.shareMarkdown());- showMessageToast('Exported to: ${LocaleKeys.notifications_export_path.tr()}');+ context+ .read<DocShareBloc>()+ .add(const DocShareEvent.shareMarkdown());+ showMessageToast(+ 'Exported to: ${LocaleKeys.notifications_export_path.tr()}');break;case ShareAction.copyLink:- FlowyAlertDialog(title: LocaleKeys.shareAction_workInProgress.tr()).show(context);+ FlowyAlertDialog(title: LocaleKeys.shareAction_workInProgress.tr())+ .show(context);break;}});@@ -198,7 +202,8 @@ class DocumentShareButton extends StatelessWidget {class ShareActions with ActionList<ShareActionWrapper>, FlowyOverlayDelegate {final Function(dartz.Option<ShareAction>) onSelected;- final _items = ShareAction.values.map((action) => ShareActionWrapper(action)).toList();+ final _items =+ ShareAction.values.map((action) => ShareActionWrapper(action)).toList();ShareActions({required this.onSelected});@@ -212,7 +217,8 @@ class ShareActions with ActionList<ShareActionWrapper>, FlowyOverlayDelegate {List<ShareActionWrapper> get items => _items;@override- void Function(dartz.Option<ShareActionWrapper> p1) get selectCallback => (result) {+ void Function(dartz.Option<ShareActionWrapper> p1) get selectCallback =>+ (result) {result.fold(() => onSelected(dartz.none()),(wrapper) => onSelected(diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/document_page.dart b/frontend/app_flowy/lib/plugins/doc/document_page.dartsimilarity index 85%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/document_page.dartrename to frontend/app_flowy/lib/plugins/doc/document_page.dartindex 3598c5a5ac..7a7550ed2c 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/document_page.dart+++ b/frontend/app_flowy/lib/plugins/doc/document_page.dart@@ -1,7 +1,7 @@import 'package:app_flowy/startup/startup.dart';import 'package:app_flowy/workspace/application/appearance.dart';-import 'package:app_flowy/workspace/application/doc/doc_bloc.dart';-import 'package:app_flowy/workspace/presentation/plugins/doc/document.dart';+import 'package:app_flowy/plugins/doc/presentation/banner.dart';+import 'package:app_flowy/plugins/doc/presentation/toolbar/tool_bar.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_scroll_bar.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter_quill/flutter_quill.dart' as quill;@@ -10,8 +10,8 @@ import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:provider/provider.dart';+import 'application/doc_bloc.dart';import 'styles.dart';-import 'widget/banner.dart';class DocumentPage extends StatefulWidget {final ViewPB view;@@ -29,7 +29,8 @@ class _DocumentPageState extends State<DocumentPage> {@overridevoid initState() {- documentBloc = getIt<DocumentBloc>(param1: super.widget.view)..add(const DocumentEvent.initial());+ documentBloc = getIt<DocumentBloc>(param1: super.widget.view)+ ..add(const DocumentEvent.initial());super.initState();}@@ -39,10 +40,12 @@ class _DocumentPageState extends State<DocumentPage> {providers: [BlocProvider<DocumentBloc>.value(value: documentBloc),],- child: BlocBuilder<DocumentBloc, DocumentState>(builder: (context, state) {+ child:+ BlocBuilder<DocumentBloc, DocumentState>(builder: (context, state) {return state.loadingState.map(// loading: (_) => const FlowyProgressIndicator(),- loading: (_) => SizedBox.expand(child: Container(color: Colors.transparent)),+ loading: (_) =>+ SizedBox.expand(child: Container(color: Colors.transparent)),finish: (result) => result.successOrFail.fold((_) {if (state.forceClose) {@@ -90,8 +93,11 @@ class _DocumentPageState extends State<DocumentPage> {Widget _renderBanner(BuildContext context) {return DocumentBanner(- onRestore: () => context.read<DocumentBloc>().add(const DocumentEvent.restorePage()),- onDelete: () => context.read<DocumentBloc>().add(const DocumentEvent.deletePermanently()),+ onRestore: () =>+ context.read<DocumentBloc>().add(const DocumentEvent.restorePage()),+ onDelete: () => context+ .read<DocumentBloc>()+ .add(const DocumentEvent.deletePermanently()),);}diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/banner.dart b/frontend/app_flowy/lib/plugins/doc/presentation/banner.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/banner.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/banner.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/style_widgets.dart b/frontend/app_flowy/lib/plugins/doc/presentation/style_widgets.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/style_widgets.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/style_widgets.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/check_button.dart b/frontend/app_flowy/lib/plugins/doc/presentation/toolbar/check_button.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/check_button.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/toolbar/check_button.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/color_picker.dart b/frontend/app_flowy/lib/plugins/doc/presentation/toolbar/color_picker.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/color_picker.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/toolbar/color_picker.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/header_button.dart b/frontend/app_flowy/lib/plugins/doc/presentation/toolbar/header_button.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/header_button.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/toolbar/header_button.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/history_button.dart b/frontend/app_flowy/lib/plugins/doc/presentation/toolbar/history_button.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/history_button.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/toolbar/history_button.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/image_button.dart b/frontend/app_flowy/lib/plugins/doc/presentation/toolbar/image_button.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/image_button.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/toolbar/image_button.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/link_button.dart b/frontend/app_flowy/lib/plugins/doc/presentation/toolbar/link_button.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/link_button.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/toolbar/link_button.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/toggle_button.dart b/frontend/app_flowy/lib/plugins/doc/presentation/toolbar/toggle_button.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/toggle_button.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/toolbar/toggle_button.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/tool_bar.dart b/frontend/app_flowy/lib/plugins/doc/presentation/toolbar/tool_bar.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/tool_bar.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/toolbar/tool_bar.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/toolbar_icon_button.dart b/frontend/app_flowy/lib/plugins/doc/presentation/toolbar/toolbar_icon_button.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/widget/toolbar/toolbar_icon_button.dartrename to frontend/app_flowy/lib/plugins/doc/presentation/toolbar/toolbar_icon_button.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/styles.dart b/frontend/app_flowy/lib/plugins/doc/styles.dartsimilarity index 86%rename from frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/styles.dartrename to frontend/app_flowy/lib/plugins/doc/styles.dartindex c6eb292c49..d3dee3f97a 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/src/styles.dart+++ b/frontend/app_flowy/lib/plugins/doc/styles.dart@@ -1,11 +1,10 @@+import 'package:app_flowy/plugins/doc/presentation/style_widgets.dart';import 'package:flutter/material.dart';import 'package:flutter_quill/flutter_quill.dart';import 'package:provider/provider.dart';import 'package:tuple/tuple.dart';import 'package:flowy_infra/theme.dart';-import 'widget/style_widgets.dart';-DefaultStyles customStyles(BuildContext context) {const baseSpacing = Tuple2<double, double>(6, 0);@@ -53,7 +52,8 @@ DefaultStyles customStyles(BuildContext context) {const Tuple2(8, 0),const Tuple2(0, 0),null),- paragraph: DefaultTextBlockStyle(baseStyle, const Tuple2(10, 0), const Tuple2(0, 0), null),+ paragraph: DefaultTextBlockStyle(+ baseStyle, const Tuple2(10, 0), const Tuple2(0, 0), null),bold: const TextStyle(fontWeight: FontWeight.bold),italic: const TextStyle(fontStyle: FontStyle.italic),small: const TextStyle(fontSize: 12, color: Colors.black45),@@ -78,8 +78,8 @@ DefaultStyles customStyles(BuildContext context) {const Tuple2(0, 0),const Tuple2(0, 0),null),- lists:- DefaultListBlockStyle(baseStyle, baseSpacing, const Tuple2(0, 6), null, StyleWidgetBuilder.checkbox(theme)),+ lists: DefaultListBlockStyle(baseStyle, baseSpacing, const Tuple2(0, 6),+ null, StyleWidgetBuilder.checkbox(theme)),quote: DefaultTextBlockStyle(TextStyle(color: baseStyle.color!.withOpacity(0.6)),baseSpacing,@@ -102,9 +102,12 @@ DefaultStyles customStyles(BuildContext context) {color: Colors.grey.shade50,borderRadius: BorderRadius.circular(2),)),- indent: DefaultTextBlockStyle(baseStyle, baseSpacing, const Tuple2(0, 6), null),- align: DefaultTextBlockStyle(baseStyle, const Tuple2(0, 0), const Tuple2(0, 0), null),- leading: DefaultTextBlockStyle(baseStyle, const Tuple2(0, 0), const Tuple2(0, 0), null),+ indent: DefaultTextBlockStyle(+ baseStyle, baseSpacing, const Tuple2(0, 6), null),+ align: DefaultTextBlockStyle(+ baseStyle, const Tuple2(0, 0), const Tuple2(0, 0), null),+ leading: DefaultTextBlockStyle(+ baseStyle, const Tuple2(0, 0), const Tuple2(0, 0), null),sizeSmall: const TextStyle(fontSize: 10),sizeLarge: const TextStyle(fontSize: 18),sizeHuge: const TextStyle(fontSize: 22));diff --git a/frontend/app_flowy/lib/workspace/application/grid/block/block_cache.dart b/frontend/app_flowy/lib/plugins/grid/application/block/block_cache.dartsimilarity index 90%rename from frontend/app_flowy/lib/workspace/application/grid/block/block_cache.dartrename to frontend/app_flowy/lib/plugins/grid/application/block/block_cache.dartindex 3c99c0e0e1..5ccff7c838 100644--- a/frontend/app_flowy/lib/workspace/application/grid/block/block_cache.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/block/block_cache.dart@@ -1,6 +1,6 @@import 'dart:async';-import 'package:app_flowy/workspace/application/grid/grid_service.dart';-import 'package:app_flowy/workspace/application/grid/row/row_service.dart';+import 'package:app_flowy/plugins/grid/application/grid_service.dart';+import 'package:app_flowy/plugins/grid/application/row/row_service.dart';import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-grid/block_entities.pb.dart';diff --git a/frontend/app_flowy/lib/workspace/application/grid/block/block_listener.dart b/frontend/app_flowy/lib/plugins/grid/application/block/block_listener.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/block/block_listener.dartrename to frontend/app_flowy/lib/plugins/grid/application/block/block_listener.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/cell_listener.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_listener.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/cell_listener.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/cell_listener.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_cache.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_cache.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_cache.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_cache.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_data_loader.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_loader.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_data_loader.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_loader.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_data_persistence.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_persistence.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_data_persistence.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_persistence.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_field_notifier.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_field_notifier.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_field_notifier.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_field_notifier.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_service.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_service.dartsimilarity index 90%rename from frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_service.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_service.dartindex 47cd67a55f..2bef94c16a 100644--- a/frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/cell_service.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_service.dart@@ -1,7 +1,7 @@import 'dart:async';import 'dart:collection';-import 'package:app_flowy/workspace/application/grid/grid_service.dart';+import 'package:app_flowy/plugins/grid/application/grid_service.dart';import 'package:dartz/dartz.dart';import 'package:equatable/equatable.dart';import 'package:flowy_sdk/dispatch/dispatch.dart';@@ -14,8 +14,8 @@ import 'package:flowy_sdk/protobuf/flowy-grid/select_option.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/url_type_option_entities.pb.dart';import 'package:flutter/foundation.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'package:app_flowy/workspace/application/grid/cell/cell_listener.dart';-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';+import 'package:app_flowy/plugins/grid/application/cell/cell_listener.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'dart:convert' show utf8;import '../../field/type_option/type_option_service.dart';diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/context_builder.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/context_builder.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/cell_service/context_builder.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/context_builder.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/checkbox_cell_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/checkbox_cell_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/checkbox_cell_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/checkbox_cell_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/date_cal_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dartsimilarity index 86%rename from frontend/app_flowy/lib/workspace/application/grid/cell/date_cal_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dartindex d99bdbf817..85dbbb40be 100644--- a/frontend/app_flowy/lib/workspace/application/grid/cell/date_cal_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart@@ -1,6 +1,7 @@import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';-import 'package:easy_localization/easy_localization.dart' show StringTranslateExtension;+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';+import 'package:easy_localization/easy_localization.dart'+ show StringTranslateExtension;import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-error-code/code.pb.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';@@ -40,7 +41,8 @@ class DateCalBloc extends Bloc<DateCalEvent, DateCalState> {},didReceiveCellUpdate: (DateCellDataPB? cellData) {final calData = calDataFromCellData(cellData);- final time = calData.foldRight("", (dateData, previous) => dateData.time);+ final time =+ calData.foldRight("", (dateData, previous) => dateData.time);emit(state.copyWith(calData: calData, time: time));},setIncludeTime: (includeTime) async {@@ -57,15 +59,18 @@ class DateCalBloc extends Bloc<DateCalEvent, DateCalState> {await _updateDateData(emit, time: time);}},- didUpdateCalData: (Option<CalendarData> data, Option<String> timeFormatError) {- emit(state.copyWith(calData: data, timeFormatError: timeFormatError));+ didUpdateCalData:+ (Option<CalendarData> data, Option<String> timeFormatError) {+ emit(state.copyWith(+ calData: data, timeFormatError: timeFormatError));},);},);}- Future<void> _updateDateData(Emitter<DateCalState> emit, {DateTime? date, String? time}) {+ Future<void> _updateDateData(Emitter<DateCalState> emit,+ {DateTime? date, String? time}) {final CalendarData newDateData = state.calData.fold(() => CalendarData(date: date ?? DateTime.now(), time: time),(dateData) {@@ -84,13 +89,17 @@ class DateCalBloc extends Bloc<DateCalEvent, DateCalState> {return _saveDateData(emit, newDateData);}- Future<void> _saveDateData(Emitter<DateCalState> emit, CalendarData newCalData) async {+ Future<void> _saveDateData(+ Emitter<DateCalState> emit, CalendarData newCalData) async {if (state.calData == Some(newCalData)) {return;}- updateCalData(Option<CalendarData> calData, Option<String> timeFormatError) {- if (!isClosed) add(DateCalEvent.didUpdateCalData(calData, timeFormatError));+ updateCalData(+ Option<CalendarData> calData, Option<String> timeFormatError) {+ if (!isClosed) {+ add(DateCalEvent.didUpdateCalData(calData, timeFormatError));+ }}cellContext.saveCellData(newCalData, resultCallback: (result) {@@ -172,7 +181,9 @@ class DateCalBloc extends Bloc<DateCalEvent, DateCalState> {);result.fold(- (l) => emit(state.copyWith(dateTypeOption: newDateTypeOption, timeHintText: _timeHintText(newDateTypeOption))),+ (l) => emit(state.copyWith(+ dateTypeOption: newDateTypeOption,+ timeHintText: _timeHintText(newDateTypeOption))),(err) => Log.error(err),);}@@ -182,14 +193,17 @@ class DateCalBloc extends Bloc<DateCalEvent, DateCalState> {class DateCalEvent with _$DateCalEvent {const factory DateCalEvent.initial() = _Initial;const factory DateCalEvent.selectDay(DateTime day) = _SelectDay;- const factory DateCalEvent.setCalFormat(CalendarFormat format) = _CalendarFormat;+ const factory DateCalEvent.setCalFormat(CalendarFormat format) =+ _CalendarFormat;const factory DateCalEvent.setFocusedDay(DateTime day) = _FocusedDay;const factory DateCalEvent.setTimeFormat(TimeFormat timeFormat) = _TimeFormat;const factory DateCalEvent.setDateFormat(DateFormat dateFormat) = _DateFormat;const factory DateCalEvent.setIncludeTime(bool includeTime) = _IncludeTime;const factory DateCalEvent.setTime(String time) = _Time;- const factory DateCalEvent.didReceiveCellUpdate(DateCellDataPB? data) = _DidReceiveCellUpdate;- const factory DateCalEvent.didUpdateCalData(Option<CalendarData> data, Option<String> timeFormatError) =+ const factory DateCalEvent.didReceiveCellUpdate(DateCellDataPB? data) =+ _DidReceiveCellUpdate;+ const factory DateCalEvent.didUpdateCalData(+ Option<CalendarData> data, Option<String> timeFormatError) =_DidUpdateCalData;}diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/date_cell_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/date_cell_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/date_cell_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/date_cell_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/number_cell_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/number_cell_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/number_cell_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/number_cell_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/select_option_cell_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_cell_bloc.dartsimilarity index 87%rename from frontend/app_flowy/lib/workspace/application/grid/cell/select_option_cell_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/select_option_cell_bloc.dartindex d0db8669fa..d823568e17 100644--- a/frontend/app_flowy/lib/workspace/application/grid/cell/select_option_cell_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_cell_bloc.dart@@ -2,11 +2,12 @@ import 'dart:async';import 'package:flowy_sdk/protobuf/flowy-grid/select_option.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';+import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';part 'select_option_cell_bloc.freezed.dart';-class SelectOptionCellBloc extends Bloc<SelectOptionCellEvent, SelectOptionCellState> {+class SelectOptionCellBloc+ extends Bloc<SelectOptionCellEvent, SelectOptionCellState> {final GridSelectOptionCellController cellContext;void Function()? _onCellChangedFn;@@ -66,7 +67,8 @@ class SelectOptionCellState with _$SelectOptionCellState {required List<SelectOptionPB> selectedOptions,}) = _SelectOptionCellState;- factory SelectOptionCellState.initial(GridSelectOptionCellController context) {+ factory SelectOptionCellState.initial(+ GridSelectOptionCellController context) {final data = context.getCellData();return SelectOptionCellState(diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/select_option_editor_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_editor_bloc.dartsimilarity index 84%rename from frontend/app_flowy/lib/workspace/application/grid/cell/select_option_editor_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/select_option_editor_bloc.dartindex 0990dca28a..6ee7fe9f32 100644--- a/frontend/app_flowy/lib/workspace/application/grid/cell/select_option_editor_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_editor_bloc.dart@@ -4,20 +4,22 @@ import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-grid/select_option.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';+import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';import 'select_option_service.dart';import 'package:collection/collection.dart';part 'select_option_editor_bloc.freezed.dart';-class SelectOptionCellEditorBloc extends Bloc<SelectOptionEditorEvent, SelectOptionEditorState> {+class SelectOptionCellEditorBloc+ extends Bloc<SelectOptionEditorEvent, SelectOptionEditorState> {final SelectOptionService _selectOptionService;final GridSelectOptionCellController cellController;Timer? _delayOperation;SelectOptionCellEditorBloc({required this.cellController,- }) : _selectOptionService = SelectOptionService(cellId: cellController.cellId),+ }) : _selectOptionService =+ SelectOptionService(cellId: cellController.cellId),super(SelectOptionEditorState.initial(cellController)) {on<SelectOptionEditorEvent>((event, emit) async {@@ -87,7 +89,8 @@ class SelectOptionCellEditorBloc extends Bloc<SelectOptionEditorEvent, SelectOpt}void _onSelectOption(String optionId) {- final hasSelected = state.selectedOptions.firstWhereOrNull((option) => option.id == optionId);+ final hasSelected = state.selectedOptions+ .firstWhereOrNull((option) => option.id == optionId);if (hasSelected != null) {_selectOptionService.unSelect(optionId: optionId);} else {@@ -96,7 +99,8 @@ class SelectOptionCellEditorBloc extends Bloc<SelectOptionEditorEvent, SelectOpt}void _filterOption(String optionName, Emitter<SelectOptionEditorState> emit) {- final _MakeOptionResult result = _makeOptions(Some(optionName), state.allOptions);+ final _MakeOptionResult result =+ _makeOptions(Some(optionName), state.allOptions);emit(state.copyWith(filter: Some(optionName),options: result.options,@@ -112,7 +116,8 @@ class SelectOptionCellEditorBloc extends Bloc<SelectOptionEditorEvent, SelectOptreturn;}return result.fold(- (data) => add(SelectOptionEditorEvent.didReceiveOptions(data.options, data.selectOptions)),+ (data) => add(SelectOptionEditorEvent.didReceiveOptions(+ data.options, data.selectOptions)),(err) {Log.error(err);return null;@@ -122,7 +127,8 @@ class SelectOptionCellEditorBloc extends Bloc<SelectOptionEditorEvent, SelectOpt});}- _MakeOptionResult _makeOptions(Option<String> filter, List<SelectOptionPB> allOptions) {+ _MakeOptionResult _makeOptions(+ Option<String> filter, List<SelectOptionPB> allOptions) {final List<SelectOptionPB> options = List.from(allOptions);Option<String> createOption = filter;@@ -165,12 +171,18 @@ class SelectOptionCellEditorBloc extends Bloc<SelectOptionEditorEvent, SelectOptclass SelectOptionEditorEvent with _$SelectOptionEditorEvent {const factory SelectOptionEditorEvent.initial() = _Initial;const factory SelectOptionEditorEvent.didReceiveOptions(- List<SelectOptionPB> options, List<SelectOptionPB> selectedOptions) = _DidReceiveOptions;- const factory SelectOptionEditorEvent.newOption(String optionName) = _NewOption;- const factory SelectOptionEditorEvent.selectOption(String optionId) = _SelectOption;- const factory SelectOptionEditorEvent.updateOption(SelectOptionPB option) = _UpdateOption;- const factory SelectOptionEditorEvent.deleteOption(SelectOptionPB option) = _DeleteOption;- const factory SelectOptionEditorEvent.filterOption(String optionName) = _SelectOptionFilter;+ List<SelectOptionPB> options, List<SelectOptionPB> selectedOptions) =+ _DidReceiveOptions;+ const factory SelectOptionEditorEvent.newOption(String optionName) =+ _NewOption;+ const factory SelectOptionEditorEvent.selectOption(String optionId) =+ _SelectOption;+ const factory SelectOptionEditorEvent.updateOption(SelectOptionPB option) =+ _UpdateOption;+ const factory SelectOptionEditorEvent.deleteOption(SelectOptionPB option) =+ _DeleteOption;+ const factory SelectOptionEditorEvent.filterOption(String optionName) =+ _SelectOptionFilter;}@freezed@@ -183,7 +195,8 @@ class SelectOptionEditorState with _$SelectOptionEditorState {required Option<String> filter,}) = _SelectOptionEditorState;- factory SelectOptionEditorState.initial(GridSelectOptionCellController context) {+ factory SelectOptionEditorState.initial(+ GridSelectOptionCellController context) {final data = context.getCellData(loadIfNotExist: false);return SelectOptionEditorState(options: data?.options ?? [],diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/select_option_service.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_service.dartsimilarity index 92%rename from frontend/app_flowy/lib/workspace/application/grid/cell/select_option_service.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/select_option_service.dartindex b6966a3e4e..9172450ef0 100644--- a/frontend/app_flowy/lib/workspace/application/grid/cell/select_option_service.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_service.dart@@ -2,7 +2,7 @@ import 'package:dartz/dartz.dart';import 'package:flowy_sdk/dispatch/dispatch.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/cell_entities.pb.dart';-import 'package:app_flowy/workspace/application/grid/field/type_option/type_option_service.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_service.dart';import 'package:flowy_sdk/protobuf/flowy-grid/select_option.pb.dart';import 'cell_service/cell_service.dart';@@ -15,7 +15,9 @@ class SelectOptionService {String get rowId => cellId.rowId;Future<Either<Unit, FlowyError>> create({required String name}) {- return TypeOptionService(gridId: gridId, fieldId: fieldId).newOption(name: name).then(+ return TypeOptionService(gridId: gridId, fieldId: fieldId)+ .newOption(name: name)+ .then((result) {return result.fold((option) {diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/text_cell_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/text_cell_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/text_cell_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/text_cell_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/url_cell_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/url_cell_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/url_cell_editor_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_editor_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/cell/url_cell_editor_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_editor_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/field_action_sheet_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_action_sheet_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/field/field_action_sheet_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/field_action_sheet_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/field_cell_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_cell_bloc.dartsimilarity index 86%rename from frontend/app_flowy/lib/workspace/application/grid/field/field_cell_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/field_cell_bloc.dartindex 8a2a0e2d06..ce09ba20bf 100644--- a/frontend/app_flowy/lib/workspace/application/grid/field/field_cell_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/field_cell_bloc.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/workspace/application/grid/field/field_listener.dart';-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';+import 'package:app_flowy/plugins/grid/application/field/field_listener.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -15,7 +15,8 @@ class FieldCellBloc extends Bloc<FieldCellEvent, FieldCellState> {FieldCellBloc({required GridFieldCellContext cellContext,}) : _fieldListener = SingleFieldListener(fieldId: cellContext.field.id),- _fieldService = FieldService(gridId: cellContext.gridId, fieldId: cellContext.field.id),+ _fieldService = FieldService(+ gridId: cellContext.gridId, fieldId: cellContext.field.id),super(FieldCellState.initial(cellContext)) {on<FieldCellEvent>((event, emit) async {@@ -62,8 +63,10 @@ class FieldCellBloc extends Bloc<FieldCellEvent, FieldCellState> {@freezedclass FieldCellEvent with _$FieldCellEvent {const factory FieldCellEvent.initial() = _InitialCell;- const factory FieldCellEvent.didReceiveFieldUpdate(GridFieldPB field) = _DidReceiveFieldUpdate;- const factory FieldCellEvent.startUpdateWidth(double offset) = _StartUpdateWidth;+ const factory FieldCellEvent.didReceiveFieldUpdate(GridFieldPB field) =+ _DidReceiveFieldUpdate;+ const factory FieldCellEvent.startUpdateWidth(double offset) =+ _StartUpdateWidth;const factory FieldCellEvent.endUpdateWidth() = _EndUpdateWidth;}@@ -75,7 +78,8 @@ class FieldCellState with _$FieldCellState {required double width,}) = _FieldCellState;- factory FieldCellState.initial(GridFieldCellContext cellContext) => FieldCellState(+ factory FieldCellState.initial(GridFieldCellContext cellContext) =>+ FieldCellState(gridId: cellContext.gridId,field: cellContext.field,width: cellContext.field.width.toDouble(),diff --git a/frontend/app_flowy/lib/workspace/application/grid/field/field_editor_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_editor_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/field/field_editor_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/field_editor_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/field_listener.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_listener.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/field/field_listener.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/field_listener.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/field_service.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/field/field_service.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/field_service.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/field_type_option_edit_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_type_option_edit_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/field/field_type_option_edit_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/field_type_option_edit_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/grid_header_listener.dart b/frontend/app_flowy/lib/plugins/grid/application/field/grid_header_listener.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/field/grid_header_listener.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/grid_header_listener.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/grid_listenr.dart b/frontend/app_flowy/lib/plugins/grid/application/field/grid_listenr.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/field/grid_listenr.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/grid_listenr.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/date_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/date_bloc.dartsimilarity index 76%rename from frontend/app_flowy/lib/workspace/application/grid/field/type_option/date_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/type_option/date_bloc.dartindex 00deff56e7..f995a0bad0 100644--- a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/date_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/date_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/type_option_service.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_service.dart';import 'package:flowy_sdk/protobuf/flowy-grid/date_type_option.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/date_type_option_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -16,20 +16,24 @@ class DateTypeOptionDataParser extends TypeOptionDataParser<DateTypeOption> {}}-class DateTypeOptionBloc extends Bloc<DateTypeOptionEvent, DateTypeOptionState> {+class DateTypeOptionBloc+ extends Bloc<DateTypeOptionEvent, DateTypeOptionState> {DateTypeOptionBloc({required DateTypeOptionContext typeOptionContext}): super(DateTypeOptionState.initial(typeOptionContext.typeOption)) {on<DateTypeOptionEvent>((event, emit) async {event.map(didSelectDateFormat: (_DidSelectDateFormat value) {- emit(state.copyWith(typeOption: _updateTypeOption(dateFormat: value.format)));+ emit(state.copyWith(+ typeOption: _updateTypeOption(dateFormat: value.format)));},didSelectTimeFormat: (_DidSelectTimeFormat value) {- emit(state.copyWith(typeOption: _updateTypeOption(timeFormat: value.format)));+ emit(state.copyWith(+ typeOption: _updateTypeOption(timeFormat: value.format)));},includeTime: (_IncludeTime value) {- emit(state.copyWith(typeOption: _updateTypeOption(includeTime: value.includeTime)));+ emit(state.copyWith(+ typeOption: _updateTypeOption(includeTime: value.includeTime)));},);},@@ -65,9 +69,12 @@ class DateTypeOptionBloc extends Bloc<DateTypeOptionEvent, DateTypeOptionState>@freezedclass DateTypeOptionEvent with _$DateTypeOptionEvent {- const factory DateTypeOptionEvent.didSelectDateFormat(DateFormat format) = _DidSelectDateFormat;- const factory DateTypeOptionEvent.didSelectTimeFormat(TimeFormat format) = _DidSelectTimeFormat;- const factory DateTypeOptionEvent.includeTime(bool includeTime) = _IncludeTime;+ const factory DateTypeOptionEvent.didSelectDateFormat(DateFormat format) =+ _DidSelectDateFormat;+ const factory DateTypeOptionEvent.didSelectTimeFormat(TimeFormat format) =+ _DidSelectTimeFormat;+ const factory DateTypeOptionEvent.includeTime(bool includeTime) =+ _IncludeTime;}@freezed@@ -76,5 +83,6 @@ class DateTypeOptionState with _$DateTypeOptionState {required DateTypeOption typeOption,}) = _DateTypeOptionState;- factory DateTypeOptionState.initial(DateTypeOption typeOption) => DateTypeOptionState(typeOption: typeOption);+ factory DateTypeOptionState.initial(DateTypeOption typeOption) =>+ DateTypeOptionState(typeOption: typeOption);}diff --git a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/edit_select_option_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/edit_select_option_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/field/type_option/edit_select_option_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/type_option/edit_select_option_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/multi_select_type_option.dart b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/multi_select_type_option.dartsimilarity index 81%rename from frontend/app_flowy/lib/workspace/application/grid/field/type_option/multi_select_type_option.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/type_option/multi_select_type_option.dartindex e0e242305b..ebc88aaf95 100644--- a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/multi_select_type_option.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/multi_select_type_option.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-grid/multi_select_type_option.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/select_option.pb.dart';@@ -7,7 +7,8 @@ import 'package:protobuf/protobuf.dart';import 'select_option_type_option_bloc.dart';import 'type_option_service.dart';-class MultiSelectTypeOptionContext extends TypeOptionWidgetContext<MultiSelectTypeOption>+class MultiSelectTypeOptionContext+ extends TypeOptionWidgetContext<MultiSelectTypeOption>with SelectOptionTypeOptionAction {final TypeOptionService service;@@ -25,7 +26,8 @@ class MultiSelectTypeOptionContext extends TypeOptionWidgetContext<MultiSelectTyreturn (SelectOptionPB option) {typeOption.freeze();typeOption = typeOption.rebuild((typeOption) {- final index = typeOption.options.indexWhere((element) => element.id == option.id);+ final index =+ typeOption.options.indexWhere((element) => element.id == option.id);if (index != -1) {typeOption.options.removeAt(index);}@@ -61,7 +63,8 @@ class MultiSelectTypeOptionContext extends TypeOptionWidgetContext<MultiSelectTyreturn (SelectOptionPB option) {typeOption.freeze();typeOption = typeOption.rebuild((typeOption) {- final index = typeOption.options.indexWhere((element) => element.id == option.id);+ final index =+ typeOption.options.indexWhere((element) => element.id == option.id);if (index != -1) {typeOption.options[index] = option;}@@ -71,7 +74,8 @@ class MultiSelectTypeOptionContext extends TypeOptionWidgetContext<MultiSelectTy}}-class MultiSelectTypeOptionWidgetDataParser extends TypeOptionDataParser<MultiSelectTypeOption> {+class MultiSelectTypeOptionWidgetDataParser+ extends TypeOptionDataParser<MultiSelectTypeOption> {@overrideMultiSelectTypeOption fromBuffer(List<int> buffer) {return MultiSelectTypeOption.fromBuffer(buffer);diff --git a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/number_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/number_bloc.dartsimilarity index 82%rename from frontend/app_flowy/lib/workspace/application/grid/field/type_option/number_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/type_option/number_bloc.dartindex 804ce3ee11..7228adf90e 100644--- a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/number_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/number_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/type_option_service.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_service.dart';import 'package:flowy_sdk/protobuf/flowy-grid/format.pbenum.dart';import 'package:flowy_sdk/protobuf/flowy-grid/number_type_option.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -10,14 +10,16 @@ part 'number_bloc.freezed.dart';typedef NumberTypeOptionContext = TypeOptionWidgetContext<NumberTypeOption>;-class NumberTypeOptionWidgetDataParser extends TypeOptionDataParser<NumberTypeOption> {+class NumberTypeOptionWidgetDataParser+ extends TypeOptionDataParser<NumberTypeOption> {@overrideNumberTypeOption fromBuffer(List<int> buffer) {return NumberTypeOption.fromBuffer(buffer);}}-class NumberTypeOptionBloc extends Bloc<NumberTypeOptionEvent, NumberTypeOptionState> {+class NumberTypeOptionBloc+ extends Bloc<NumberTypeOptionEvent, NumberTypeOptionState> {NumberTypeOptionBloc({required NumberTypeOptionContext typeOptionContext}): super(NumberTypeOptionState.initial(typeOptionContext.typeOption)) {on<NumberTypeOptionEvent>(@@ -46,7 +48,8 @@ class NumberTypeOptionBloc extends Bloc<NumberTypeOptionEvent, NumberTypeOptionS@freezedclass NumberTypeOptionEvent with _$NumberTypeOptionEvent {- const factory NumberTypeOptionEvent.didSelectFormat(NumberFormat format) = _DidSelectFormat;+ const factory NumberTypeOptionEvent.didSelectFormat(NumberFormat format) =+ _DidSelectFormat;}@freezed@@ -55,7 +58,8 @@ class NumberTypeOptionState with _$NumberTypeOptionState {required NumberTypeOption typeOption,}) = _NumberTypeOptionState;- factory NumberTypeOptionState.initial(NumberTypeOption typeOption) => NumberTypeOptionState(+ factory NumberTypeOptionState.initial(NumberTypeOption typeOption) =>+ NumberTypeOptionState(typeOption: typeOption,);}diff --git a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/number_format_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/number_format_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/field/type_option/number_format_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/type_option/number_format_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/select_option_type_option_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/select_option_type_option_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/field/type_option/select_option_type_option_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/type_option/select_option_type_option_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/single_select_type_option.dart b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/single_select_type_option.dartsimilarity index 81%rename from frontend/app_flowy/lib/workspace/application/grid/field/type_option/single_select_type_option.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/type_option/single_select_type_option.dartindex 857838de38..bdf89b5b78 100644--- a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/single_select_type_option.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/single_select_type_option.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-grid/select_option.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/single_select_type_option.pb.dart';@@ -7,7 +7,8 @@ import 'package:protobuf/protobuf.dart';import 'select_option_type_option_bloc.dart';import 'type_option_service.dart';-class SingleSelectTypeOptionContext extends TypeOptionWidgetContext<SingleSelectTypeOptionPB>+class SingleSelectTypeOptionContext+ extends TypeOptionWidgetContext<SingleSelectTypeOptionPB>with SelectOptionTypeOptionAction {final TypeOptionService service;@@ -25,7 +26,8 @@ class SingleSelectTypeOptionContext extends TypeOptionWidgetContext<SingleSelectreturn (SelectOptionPB option) {typeOption.freeze();typeOption = typeOption.rebuild((typeOption) {- final index = typeOption.options.indexWhere((element) => element.id == option.id);+ final index =+ typeOption.options.indexWhere((element) => element.id == option.id);if (index != -1) {typeOption.options.removeAt(index);}@@ -61,7 +63,8 @@ class SingleSelectTypeOptionContext extends TypeOptionWidgetContext<SingleSelectreturn (SelectOptionPB option) {typeOption.freeze();typeOption = typeOption.rebuild((typeOption) {- final index = typeOption.options.indexWhere((element) => element.id == option.id);+ final index =+ typeOption.options.indexWhere((element) => element.id == option.id);if (index != -1) {typeOption.options[index] = option;}@@ -71,7 +74,8 @@ class SingleSelectTypeOptionContext extends TypeOptionWidgetContext<SingleSelect}}-class SingleSelectTypeOptionWidgetDataParser extends TypeOptionDataParser<SingleSelectTypeOptionPB> {+class SingleSelectTypeOptionWidgetDataParser+ extends TypeOptionDataParser<SingleSelectTypeOptionPB> {@overrideSingleSelectTypeOptionPB fromBuffer(List<int> buffer) {return SingleSelectTypeOptionPB.fromBuffer(buffer);diff --git a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/type_option_service.dart b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_service.dartsimilarity index 93%rename from frontend/app_flowy/lib/workspace/application/grid/field/type_option/type_option_service.dartrename to frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_service.dartindex fca6995b3f..d7873e0c86 100644--- a/frontend/app_flowy/lib/workspace/application/grid/field/type_option/type_option_service.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_service.dart@@ -1,6 +1,6 @@import 'dart:typed_data';-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'package:dartz/dartz.dart';import 'package:flowy_sdk/dispatch/dispatch.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';@@ -92,7 +92,9 @@ class TypeOptionContext2<T> {return Future(() => left(_data!));}- return _fieldService.getFieldTypeOptionData(fieldType: field.fieldType).then((result) {+ return _fieldService+ .getFieldTypeOptionData(fieldType: field.fieldType)+ .then((result) {return result.fold((data) {_data = dataBuilder.fromBuffer(data.typeOptionData);diff --git a/frontend/app_flowy/lib/workspace/application/grid/grid_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/grid_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/grid_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/grid_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/grid_header_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/grid_header_bloc.dartsimilarity index 83%rename from frontend/app_flowy/lib/workspace/application/grid/grid_header_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/grid_header_bloc.dartindex b34064da13..06a6b791d8 100644--- a/frontend/app_flowy/lib/workspace/application/grid/grid_header_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/grid_header_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -33,7 +33,8 @@ class GridHeaderBloc extends Bloc<GridHeaderEvent, GridHeaderState> {);}- Future<void> _moveField(_MoveField value, Emitter<GridHeaderState> emit) async {+ Future<void> _moveField(+ _MoveField value, Emitter<GridHeaderState> emit) async {final fields = List<GridFieldPB>.from(state.fields);fields.insert(value.toIndex, fields.removeAt(value.fromIndex));emit(state.copyWith(fields: fields));@@ -62,13 +63,16 @@ class GridHeaderBloc extends Bloc<GridHeaderEvent, GridHeaderState> {@freezedclass GridHeaderEvent with _$GridHeaderEvent {const factory GridHeaderEvent.initial() = _InitialHeader;- const factory GridHeaderEvent.didReceiveFieldUpdate(List<GridFieldPB> fields) = _DidReceiveFieldUpdate;- const factory GridHeaderEvent.moveField(GridFieldPB field, int fromIndex, int toIndex) = _MoveField;+ const factory GridHeaderEvent.didReceiveFieldUpdate(+ List<GridFieldPB> fields) = _DidReceiveFieldUpdate;+ const factory GridHeaderEvent.moveField(+ GridFieldPB field, int fromIndex, int toIndex) = _MoveField;}@freezedclass GridHeaderState with _$GridHeaderState {- const factory GridHeaderState({required List<GridFieldPB> fields}) = _GridHeaderState;+ const factory GridHeaderState({required List<GridFieldPB> fields}) =+ _GridHeaderState;factory GridHeaderState.initial(List<GridFieldPB> fields) {// final List<GridFieldPB> newFields = List.from(fields);diff --git a/frontend/app_flowy/lib/workspace/application/grid/grid_service.dart b/frontend/app_flowy/lib/plugins/grid/application/grid_service.dartsimilarity index 89%rename from frontend/app_flowy/lib/workspace/application/grid/grid_service.dartrename to frontend/app_flowy/lib/plugins/grid/application/grid_service.dartindex 1f8b4336fc..14fbf2bf62 100644--- a/frontend/app_flowy/lib/workspace/application/grid/grid_service.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/grid_service.dart@@ -1,6 +1,6 @@import 'dart:collection';-import 'package:app_flowy/workspace/application/grid/field/grid_listenr.dart';+import 'package:app_flowy/plugins/grid/application/field/grid_listenr.dart';import 'package:dartz/dartz.dart';import 'package:flowy_sdk/dispatch/dispatch.dart';import 'package:flowy_sdk/log.dart';@@ -26,13 +26,15 @@ class GridService {return GridEventGetGrid(payload).send();}- Future<Either<GridRowPB, FlowyError>> createRow({Option<String>? startRowId}) {+ Future<Either<GridRowPB, FlowyError>> createRow(+ {Option<String>? startRowId}) {CreateRowPayloadPB payload = CreateRowPayloadPB.create()..gridId = gridId;startRowId?.fold(() => null, (id) => payload.startRowId = id);return GridEventCreateRow(payload).send();}- Future<Either<RepeatedGridFieldPB, FlowyError>> getFields({required List<GridFieldIdPB> fieldIds}) {+ Future<Either<RepeatedGridFieldPB, FlowyError>> getFields(+ {required List<GridFieldIdPB> fieldIds}) {final payload = QueryFieldPayloadPB.create()..gridId = gridId..fieldIds = RepeatedGridFieldIdPB(items: fieldIds);@@ -64,9 +66,11 @@ class GridFieldCache {final GridFieldsListener _fieldListener;FieldsNotifier? _fieldNotifier = FieldsNotifier();final Map<FieldsCallback, VoidCallback> _fieldsCallbackMap = {};- final Map<FieldChangesetCallback, FieldChangesetCallback> _changesetCallbackMap = {};+ final Map<FieldChangesetCallback, FieldChangesetCallback>+ _changesetCallbackMap = {};- GridFieldCache({required this.gridId}) : _fieldListener = GridFieldsListener(gridId: gridId) {+ GridFieldCache({required this.gridId})+ : _fieldListener = GridFieldsListener(gridId: gridId) {_fieldListener.start(onFieldsChanged: (result) {result.fold((changeset) {@@ -88,7 +92,8 @@ class GridFieldCache {_fieldNotifier = null;}- UnmodifiableListView<GridFieldPB> get unmodifiableFields => UnmodifiableListView(_fieldNotifier?.fields ?? []);+ UnmodifiableListView<GridFieldPB> get unmodifiableFields =>+ UnmodifiableListView(_fieldNotifier?.fields ?? []);List<GridFieldPB> get fields => [..._fieldNotifier?.fields ?? []];@@ -175,7 +180,8 @@ class GridFieldCache {}final List<GridFieldPB> newFields = fields;for (final updatedField in updatedFields) {- final index = newFields.indexWhere((field) => field.id == updatedField.id);+ final index =+ newFields.indexWhere((field) => field.id == updatedField.id);if (index != -1) {newFields.removeAt(index);newFields.insert(index, updatedField);diff --git a/frontend/app_flowy/lib/workspace/application/grid/prelude.dart b/frontend/app_flowy/lib/plugins/grid/application/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/prelude.dartrename to frontend/app_flowy/lib/plugins/grid/application/prelude.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/row/row_action_sheet_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/row/row_action_sheet_bloc.dartsimilarity index 86%rename from frontend/app_flowy/lib/workspace/application/grid/row/row_action_sheet_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/row/row_action_sheet_bloc.dartindex 9fe12f3ff5..7881e485cb 100644--- a/frontend/app_flowy/lib/workspace/application/grid/row/row_action_sheet_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/row/row_action_sheet_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/grid/row/row_service.dart';+import 'package:app_flowy/plugins/grid/application/row/row_service.dart';import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -8,7 +8,8 @@ import 'package:dartz/dartz.dart';part 'row_action_sheet_bloc.freezed.dart';-class RowActionSheetBloc extends Bloc<RowActionSheetEvent, RowActionSheetState> {+class RowActionSheetBloc+ extends Bloc<RowActionSheetEvent, RowActionSheetState> {final RowService _rowService;RowActionSheetBloc({required GridRowInfo rowData})@@ -56,7 +57,8 @@ class RowActionSheetState with _$RowActionSheetState {required GridRowInfo rowData,}) = _RowActionSheetState;- factory RowActionSheetState.initial(GridRowInfo rowData) => RowActionSheetState(+ factory RowActionSheetState.initial(GridRowInfo rowData) =>+ RowActionSheetState(rowData: rowData,);}diff --git a/frontend/app_flowy/lib/workspace/application/grid/row/row_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/row/row_bloc.dartsimilarity index 81%rename from frontend/app_flowy/lib/workspace/application/grid/row/row_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/row/row_bloc.dartindex 1d7224383d..3b755d1524 100644--- a/frontend/app_flowy/lib/workspace/application/grid/row/row_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/row/row_bloc.dart@@ -1,5 +1,5 @@import 'dart:collection';-import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';+import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';import 'package:equatable/equatable.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -34,7 +34,9 @@ class RowBloc extends Bloc<RowEvent, RowState> {_rowService.createRow();},didReceiveCellDatas: (_DidReceiveCellDatas value) async {- final fields = value.gridCellMap.values.map((e) => GridCellEquatable(e.field)).toList();+ final fields = value.gridCellMap.values+ .map((e) => GridCellEquatable(e.field))+ .toList();final snapshots = UnmodifiableListView(fields);emit(state.copyWith(gridCellMap: value.gridCellMap,@@ -59,7 +61,8 @@ class RowBloc extends Bloc<RowEvent, RowState> {Future<void> _startListening() async {_rowListenFn = _rowCache.addListener(rowId: state.rowInfo.id,- onCellUpdated: (cellDatas, reason) => add(RowEvent.didReceiveCellDatas(cellDatas, reason)),+ onCellUpdated: (cellDatas, reason) =>+ add(RowEvent.didReceiveCellDatas(cellDatas, reason)),listenWhen: () => !isClosed,);}@@ -69,7 +72,8 @@ class RowBloc extends Bloc<RowEvent, RowState> {class RowEvent with _$RowEvent {const factory RowEvent.initial() = _InitialRow;const factory RowEvent.createRow() = _CreateRow;- const factory RowEvent.didReceiveCellDatas(GridCellMap gridCellMap, GridRowChangeReason reason) =+ const factory RowEvent.didReceiveCellDatas(+ GridCellMap gridCellMap, GridRowChangeReason reason) =_DidReceiveCellDatas;}@@ -82,10 +86,12 @@ class RowState with _$RowState {GridRowChangeReason? changeReason,}) = _RowState;- factory RowState.initial(GridRowInfo rowInfo, GridCellMap cellDataMap) => RowState(+ factory RowState.initial(GridRowInfo rowInfo, GridCellMap cellDataMap) =>+ RowState(rowInfo: rowInfo,gridCellMap: cellDataMap,- snapshots: UnmodifiableListView(cellDataMap.values.map((e) => GridCellEquatable(e.field)).toList()),+ snapshots: UnmodifiableListView(+ cellDataMap.values.map((e) => GridCellEquatable(e.field)).toList()),);}diff --git a/frontend/app_flowy/lib/workspace/application/grid/row/row_detail_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/row/row_detail_bloc.dartsimilarity index 84%rename from frontend/app_flowy/lib/workspace/application/grid/row/row_detail_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/row/row_detail_bloc.dartindex 966310fe8c..900b56f9a5 100644--- a/frontend/app_flowy/lib/workspace/application/grid/row/row_detail_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/row/row_detail_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';+import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';@@ -42,7 +42,8 @@ class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {Future<void> _startListening() async {_rowListenFn = _rowCache.addListener(rowId: rowInfo.id,- onCellUpdated: (cellDatas, reason) => add(RowDetailEvent.didReceiveCellDatas(cellDatas.values.toList())),+ onCellUpdated: (cellDatas, reason) =>+ add(RowDetailEvent.didReceiveCellDatas(cellDatas.values.toList())),listenWhen: () => !isClosed,);}@@ -58,7 +59,8 @@ class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {@freezedclass RowDetailEvent with _$RowDetailEvent {const factory RowDetailEvent.initial() = _Initial;- const factory RowDetailEvent.didReceiveCellDatas(List<GridCellIdentifier> gridCells) = _DidReceiveCellDatas;+ const factory RowDetailEvent.didReceiveCellDatas(+ List<GridCellIdentifier> gridCells) = _DidReceiveCellDatas;}@freezeddiff --git a/frontend/app_flowy/lib/workspace/application/grid/row/row_listener.dart b/frontend/app_flowy/lib/plugins/grid/application/row/row_listener.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/row/row_listener.dartrename to frontend/app_flowy/lib/plugins/grid/application/row/row_listener.dartdiff --git a/frontend/app_flowy/lib/workspace/application/grid/row/row_service.dart b/frontend/app_flowy/lib/plugins/grid/application/row/row_service.dartsimilarity index 90%rename from frontend/app_flowy/lib/workspace/application/grid/row/row_service.dartrename to frontend/app_flowy/lib/plugins/grid/application/row/row_service.dartindex 893ebb719b..4fd18a1fdd 100644--- a/frontend/app_flowy/lib/workspace/application/grid/row/row_service.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/row/row_service.dart@@ -1,5 +1,5 @@import 'dart:collection';-import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';+import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';import 'package:dartz/dartz.dart';import 'package:flowy_sdk/dispatch/dispatch.dart';import 'package:flowy_sdk/log.dart';@@ -53,9 +53,12 @@ class GridRowCache {_rowChangeReasonNotifier = _GridRowChangesetNotifier(),_fieldNotifier = notifier {//- notifier.onFieldsChanged(() => _rowChangeReasonNotifier.receive(const GridRowChangeReason.fieldDidChange()));+ notifier.onFieldsChanged(() => _rowChangeReasonNotifier+ .receive(const GridRowChangeReason.fieldDidChange()));notifier.onFieldChanged((field) => _cellCache.remove(field.id));- _rowInfos = block.rows.map((rowInfo) => buildGridRow(rowInfo.id, rowInfo.height.toDouble())).toList();+ _rowInfos = block.rows+ .map((rowInfo) => buildGridRow(rowInfo.id, rowInfo.height.toDouble()))+ .toList();}Future<void> dispose() async {@@ -81,7 +84,9 @@ class GridRowCache {final List<GridRowInfo> newRows = [];final DeletedIndexs deletedIndex = [];- final Map<String, String> deletedRowByRowId = {for (var rowId in deletedRows) rowId: rowId};+ final Map<String, String> deletedRowByRowId = {+ for (var rowId in deletedRows) rowId: rowId+ };_rowInfos.asMap().forEach((index, row) {if (deletedRowByRowId[row.id] == null) {@@ -107,7 +112,8 @@ class GridRowCache {rowId: insertRow.rowId,);insertIndexs.add(insertIndex);- _rowInfos.insert(insertRow.index, (buildGridRow(insertRow.rowId, insertRow.height.toDouble())));+ _rowInfos.insert(insertRow.index,+ (buildGridRow(insertRow.rowId, insertRow.height.toDouble())));}_rowChangeReasonNotifier.receive(GridRowChangeReason.insert(insertIndexs));@@ -126,7 +132,8 @@ class GridRowCache {_rowByRowId[rowId] = updatedRow.row;_rowInfos.removeAt(index);- _rowInfos.insert(index, buildGridRow(rowId, updatedRow.row.height.toDouble()));+ _rowInfos.insert(+ index, buildGridRow(rowId, updatedRow.row.height.toDouble()));updatedIndexs[rowId] = UpdatedIndex(index: index, rowId: rowId);}}@@ -225,7 +232,8 @@ class GridRowCache {updatedRow.freeze();_rowByRowId[updatedRow.id] = updatedRow;- final index = _rowInfos.indexWhere((gridRow) => gridRow.id == updatedRow.id);+ final index =+ _rowInfos.indexWhere((gridRow) => gridRow.id == updatedRow.id);if (index != -1) {// update the corresponding row in _rows if they are not the sameif (_rowInfos[index].rawRow != updatedRow) {@@ -237,7 +245,8 @@ class GridRowCache {updatedIndexs[row.id] = UpdatedIndex(index: index, rowId: row.id);//- _rowChangeReasonNotifier.receive(GridRowChangeReason.update(updatedIndexs));+ _rowChangeReasonNotifier+ .receive(GridRowChangeReason.update(updatedIndexs));}}}@@ -275,7 +284,8 @@ class RowService {final String blockId;final String rowId;- RowService({required this.gridId, required this.blockId, required this.rowId});+ RowService(+ {required this.gridId, required this.blockId, required this.rowId});Future<Either<GridRowPB, FlowyError>> createRow() {CreateRowPayloadPB payload = CreateRowPayloadPB.create()@@ -285,7 +295,8 @@ class RowService {return GridEventCreateRow(payload).send();}- Future<Either<Unit, FlowyError>> moveRow(String rowId, int fromIndex, int toIndex) {+ Future<Either<Unit, FlowyError>> moveRow(+ String rowId, int fromIndex, int toIndex) {final payload = MoveItemPayloadPB.create()..gridId = gridId..itemId = rowIddiff --git a/frontend/app_flowy/lib/workspace/application/grid/setting/property_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/setting/property_bloc.dartsimilarity index 73%rename from frontend/app_flowy/lib/workspace/application/grid/setting/property_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/setting/property_bloc.dartindex ee16eb0455..7c185279ae 100644--- a/frontend/app_flowy/lib/workspace/application/grid/setting/property_bloc.dart+++ b/frontend/app_flowy/lib/plugins/grid/application/setting/property_bloc.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';-import 'package:app_flowy/workspace/application/grid/grid_service.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';+import 'package:app_flowy/plugins/grid/application/grid_service.dart';import 'package:flowy_sdk/log.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -22,8 +22,10 @@ class GridPropertyBloc extends Bloc<GridPropertyEvent, GridPropertyState> {_startListening();},setFieldVisibility: (_SetFieldVisibility value) async {- final fieldService = FieldService(gridId: gridId, fieldId: value.fieldId);- final result = await fieldService.updateField(visibility: value.visibility);+ final fieldService =+ FieldService(gridId: gridId, fieldId: value.fieldId);+ final result =+ await fieldService.updateField(visibility: value.visibility);result.fold((l) => null,(err) => Log.error(err),@@ -50,7 +52,8 @@ class GridPropertyBloc extends Bloc<GridPropertyEvent, GridPropertyState> {}void _startListening() {- _onFieldsFn = (fields) => add(GridPropertyEvent.didReceiveFieldUpdate(fields));+ _onFieldsFn =+ (fields) => add(GridPropertyEvent.didReceiveFieldUpdate(fields));_fieldCache.addListener(onFields: _onFieldsFn,listenWhen: () => !isClosed,@@ -61,9 +64,12 @@ class GridPropertyBloc extends Bloc<GridPropertyEvent, GridPropertyState> {@freezedclass GridPropertyEvent with _$GridPropertyEvent {const factory GridPropertyEvent.initial() = _Initial;- const factory GridPropertyEvent.setFieldVisibility(String fieldId, bool visibility) = _SetFieldVisibility;- const factory GridPropertyEvent.didReceiveFieldUpdate(List<GridFieldPB> fields) = _DidReceiveFieldUpdate;- const factory GridPropertyEvent.moveField(int fromIndex, int toIndex) = _MoveField;+ const factory GridPropertyEvent.setFieldVisibility(+ String fieldId, bool visibility) = _SetFieldVisibility;+ const factory GridPropertyEvent.didReceiveFieldUpdate(+ List<GridFieldPB> fields) = _DidReceiveFieldUpdate;+ const factory GridPropertyEvent.moveField(int fromIndex, int toIndex) =+ _MoveField;}@freezed@@ -73,7 +79,8 @@ class GridPropertyState with _$GridPropertyState {required List<GridFieldPB> fields,}) = _GridPropertyState;- factory GridPropertyState.initial(String gridId, List<GridFieldPB> fields) => GridPropertyState(+ factory GridPropertyState.initial(String gridId, List<GridFieldPB> fields) =>+ GridPropertyState(gridId: gridId,fields: fields,);diff --git a/frontend/app_flowy/lib/workspace/application/grid/setting/setting_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/setting/setting_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/grid/setting/setting_bloc.dartrename to frontend/app_flowy/lib/plugins/grid/application/setting/setting_bloc.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/grid.dart b/frontend/app_flowy/lib/plugins/grid/grid.dartsimilarity index 90%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/grid.dartrename to frontend/app_flowy/lib/plugins/grid/grid.dartindex 776dd833ea..c0c6d78642 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/grid.dart+++ b/frontend/app_flowy/lib/plugins/grid/grid.dart@@ -1,12 +1,12 @@import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/workspace/presentation/home/home_stack.dart';-import 'package:app_flowy/workspace/presentation/plugins/widgets/left_bar_item.dart';+import 'package:app_flowy/workspace/presentation/widgets/left_bar_item.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';import 'package:flutter/material.dart';-import 'src/grid_page.dart';+import 'presentation/grid_page.dart';class GridPluginBuilder implements PluginBuilder {@overridediff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/controller/flowy_table_selection.dart b/frontend/app_flowy/lib/plugins/grid/presentation/controller/flowy_table_selection.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/controller/flowy_table_selection.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/controller/flowy_table_selection.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/controller/grid_scroll.dart b/frontend/app_flowy/lib/plugins/grid/presentation/controller/grid_scroll.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/controller/grid_scroll.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/controller/grid_scroll.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/grid_page.dart b/frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dartsimilarity index 87%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/grid_page.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dartindex 4aae99acbe..ed6306a972 100755--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/grid_page.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dart@@ -1,6 +1,6 @@import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/grid/grid_bloc.dart';-import 'package:app_flowy/workspace/application/grid/row/row_service.dart';+import 'package:app_flowy/plugins/grid/application/grid_bloc.dart';+import 'package:app_flowy/plugins/grid/application/row/row_service.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_scroll_bar.dart';@@ -35,13 +35,15 @@ class _GridPageState extends State<GridPage> {return MultiBlocProvider(providers: [BlocProvider<GridBloc>(- create: (context) => getIt<GridBloc>(param1: widget.view)..add(const GridEvent.initial()),+ create: (context) => getIt<GridBloc>(param1: widget.view)+ ..add(const GridEvent.initial()),),],child: BlocBuilder<GridBloc, GridState>(builder: (context, state) {return state.loadingState.map(- loading: (_) => const Center(child: CircularProgressIndicator.adaptive()),+ loading: (_) =>+ const Center(child: CircularProgressIndicator.adaptive()),finish: (result) => result.successOrFail.fold((_) => const GridShortcuts(child: FlowyGrid()),(err) => FlowyErrorPage(err.toString()),@@ -76,7 +78,8 @@ class FlowyGrid extends StatefulWidget {}class _FlowyGridState extends State<FlowyGrid> {- final _scrollController = GridScrollController(scrollGroupContorller: LinkedScrollControllerGroup());+ final _scrollController = GridScrollController(+ scrollGroupContorller: LinkedScrollControllerGroup());late ScrollController headerScrollController;@override@@ -204,7 +207,8 @@ class _GridRowsState extends State<_GridRows> {for (final item in value.items) {_key.currentState?.removeItem(item.index,- (context, animation) => _renderRow(context, item.row, animation),+ (context, animation) =>+ _renderRow(context, item.row, animation),);}},@@ -215,8 +219,10 @@ class _GridRowsState extends State<_GridRows> {return SliverAnimatedList(key: _key,initialItemCount: context.read<GridBloc>().state.rowInfos.length,- itemBuilder: (BuildContext context, int index, Animation<double> animation) {- final GridRowInfo rowInfo = context.read<GridBloc>().state.rowInfos[index];+ itemBuilder:+ (BuildContext context, int index, Animation<double> animation) {+ final GridRowInfo rowInfo =+ context.read<GridBloc>().state.rowInfos[index];return _renderRow(context, rowInfo, animation);},);@@ -229,7 +235,8 @@ class _GridRowsState extends State<_GridRows> {GridRowInfo rowInfo,Animation<double> animation,) {- final rowCache = context.read<GridBloc>().getRowCache(rowInfo.blockId, rowInfo.id);+ final rowCache =+ context.read<GridBloc>().getRowCache(rowInfo.blockId, rowInfo.id);final fieldCache = context.read<GridBloc>().fieldCache;if (rowCache != null) {return SizeTransition(@@ -266,10 +273,10 @@ class _GridFooter extends StatelessWidget {SizedBox(width: GridSize.leadingHeaderPadding),Column(crossAxisAlignment: CrossAxisAlignment.start,- children: [+ children: [const SizedBox(width: 120, child: GridAddRowButton()),const SizedBox(height: 30),- _rowCountTextWidget(theme: theme,count: rowCount)+ _rowCountTextWidget(theme: theme, count: rowCount)],),],@@ -280,16 +287,18 @@ class _GridFooter extends StatelessWidget {);}- Widget _rowCountTextWidget({required AppTheme theme, required int count}){+ Widget _rowCountTextWidget({required AppTheme theme, required int count}) {return Row(mainAxisAlignment: MainAxisAlignment.start,children: [- FlowyText.regular('Count : ',- fontSize: 13,- color: theme.shader3,+ FlowyText.regular(+ 'Count : ',+ fontSize: 13,+ color: theme.shader3,),- FlowyText.regular(count.toString(),- fontSize: 13,+ FlowyText.regular(+ count.toString(),+ fontSize: 13,),],);diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/layout/layout.dart b/frontend/app_flowy/lib/plugins/grid/presentation/layout/layout.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/layout/layout.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/layout/layout.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/layout/sizes.dart b/frontend/app_flowy/lib/plugins/grid/presentation/layout/sizes.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/layout/sizes.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/layout/sizes.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_accessory.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_accessory.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_accessory.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_accessory.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_builder.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_builder.dartsimilarity index 77%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_builder.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_builder.dartindex f785672f71..1913aac786 100755--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_builder.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_builder.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';-import 'package:app_flowy/workspace/application/grid/grid_service.dart';+import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';+import 'package:app_flowy/plugins/grid/application/grid_service.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter/services.dart';import 'package:flutter/widgets.dart';@@ -30,19 +30,36 @@ class GridCellBuilder {final key = cell.key();switch (cell.fieldType) {case FieldType.Checkbox:- return GridCheckboxCell(cellControllerBuilder: cellControllerBuilder, key: key);+ return GridCheckboxCell(+ cellControllerBuilder: cellControllerBuilder, key: key);case FieldType.DateTime:- return GridDateCell(cellControllerBuilder: cellControllerBuilder, key: key, style: style);+ return GridDateCell(+ cellControllerBuilder: cellControllerBuilder,+ key: key,+ style: style);case FieldType.SingleSelect:- return GridSingleSelectCell(cellContorllerBuilder: cellControllerBuilder, style: style, key: key);+ return GridSingleSelectCell(+ cellContorllerBuilder: cellControllerBuilder,+ style: style,+ key: key);case FieldType.MultiSelect:- return GridMultiSelectCell(cellContorllerBuilder: cellControllerBuilder, style: style, key: key);+ return GridMultiSelectCell(+ cellContorllerBuilder: cellControllerBuilder,+ style: style,+ key: key);case FieldType.Number:- return GridNumberCell(cellContorllerBuilder: cellControllerBuilder, key: key);+ return GridNumberCell(+ cellContorllerBuilder: cellControllerBuilder, key: key);case FieldType.RichText:- return GridTextCell(cellContorllerBuilder: cellControllerBuilder, style: style, key: key);+ return GridTextCell(+ cellContorllerBuilder: cellControllerBuilder,+ style: style,+ key: key);case FieldType.URL:- return GridURLCell(cellContorllerBuilder: cellControllerBuilder, style: style, key: key);+ return GridURLCell(+ cellContorllerBuilder: cellControllerBuilder,+ style: style,+ key: key);}throw UnimplementedError;}@@ -65,7 +82,8 @@ abstract class CellEditable {ValueNotifier<bool> get onCellEditing;}-abstract class GridCellWidget extends StatefulWidget implements CellAccessory, CellEditable, CellShortcuts {+abstract class GridCellWidget extends StatefulWidget+ implements CellAccessory, CellEditable, CellShortcuts {GridCellWidget({Key? key}) : super(key: key) {onCellEditing.addListener(() {onCellFocus.value = onCellEditing.value;@@ -83,7 +101,8 @@ abstract class GridCellWidget extends StatefulWidget implements CellAccessory, Cfinal ValueNotifier<bool> onCellEditing = ValueNotifier<bool>(false);@override- List<GridCellAccessory> Function(GridCellAccessoryBuildContext buildContext)? get accessoryBuilder => null;+ List<GridCellAccessory> Function(GridCellAccessoryBuildContext buildContext)?+ get accessoryBuilder => null;@overridefinal GridCellFocusListener beginFocus = GridCellFocusListener();@@ -129,12 +148,14 @@ abstract class GridCellState<T extends GridCellWidget> extends State<T> {void onInsert(String value) {}}-abstract class GridFocusNodeCellState<T extends GridCellWidget> extends GridCellState<T> {+abstract class GridFocusNodeCellState<T extends GridCellWidget>+ extends GridCellState<T> {SingleListenrFocusNode focusNode = SingleListenrFocusNode();@overridevoid initState() {- widget.shortcutHandlers[CellKeyboardKey.onEnter] = () => focusNode.unfocus();+ widget.shortcutHandlers[CellKeyboardKey.onEnter] =+ () => focusNode.unfocus();_listenOnFocusNodeChanged();super.initState();}diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_cotainer.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_cotainer.dartsimilarity index 80%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_cotainer.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_cotainer.dartindex fbb343dd6c..b88508837c 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_cotainer.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_cotainer.dart@@ -1,10 +1,10 @@-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/row/grid_row.dart';import 'package:flowy_infra/theme.dart';import 'package:flutter/widgets.dart';import 'package:provider/provider.dart';import 'package:styled_widget/styled_widget.dart';+import '../../layout/sizes.dart';+import '../row/grid_row.dart';import 'cell_accessory.dart';import 'cell_builder.dart';import 'cell_shortcuts.dart';@@ -24,9 +24,11 @@ class CellContainer extends StatelessWidget {@overrideWidget build(BuildContext context) {- return ChangeNotifierProxyProvider<RegionStateNotifier, CellContainerNotifier>(+ return ChangeNotifierProxyProvider<RegionStateNotifier,+ CellContainerNotifier>(create: (_) => CellContainerNotifier(child),- update: (_, rowStateNotifier, cellStateNotifier) => cellStateNotifier!..onEnter = rowStateNotifier.onEnter,+ update: (_, rowStateNotifier, cellStateNotifier) =>+ cellStateNotifier!..onEnter = rowStateNotifier.onEnter,child: Selector<CellContainerNotifier, bool>(selector: (context, notifier) => notifier.isFocus,builder: (context, isFocus, _) {@@ -39,7 +41,8 @@ class CellContainer extends StatelessWidget {));if (accessories.isNotEmpty) {- container = CellEnterRegion(child: container, accessories: accessories);+ container =+ CellEnterRegion(child: container, accessories: accessories);}}@@ -65,7 +68,8 @@ class CellContainer extends StatelessWidget {return BoxDecoration(border: Border.fromBorderSide(borderSide));} else {final borderSide = BorderSide(color: theme.shader5, width: 1.0);- return BoxDecoration(border: Border(right: borderSide, bottom: borderSide));+ return BoxDecoration(+ border: Border(right: borderSide, bottom: borderSide));}}}@@ -73,7 +77,9 @@ class CellContainer extends StatelessWidget {class CellEnterRegion extends StatelessWidget {final Widget child;final List<GridCellAccessory> accessories;- const CellEnterRegion({required this.child, required this.accessories, Key? key}) : super(key: key);+ const CellEnterRegion(+ {required this.child, required this.accessories, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {@@ -82,13 +88,18 @@ class CellEnterRegion extends StatelessWidget {builder: (context, onEnter, _) {List<Widget> children = [child];if (onEnter) {- children.add(CellAccessoryContainer(accessories: accessories).positioned(right: 0));+ children.add(CellAccessoryContainer(accessories: accessories)+ .positioned(right: 0));}return MouseRegion(cursor: SystemMouseCursors.click,- onEnter: (p) => Provider.of<CellContainerNotifier>(context, listen: false).onEnter = true,- onExit: (p) => Provider.of<CellContainerNotifier>(context, listen: false).onEnter = false,+ onEnter: (p) =>+ Provider.of<CellContainerNotifier>(context, listen: false)+ .onEnter = true,+ onExit: (p) =>+ Provider.of<CellContainerNotifier>(context, listen: false)+ .onEnter = false,child: Stack(alignment: AlignmentDirectional.center,fit: StackFit.expand,diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_decoration.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_decoration.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_decoration.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_decoration.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_shortcuts.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_shortcuts.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/cell_shortcuts.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_shortcuts.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/checkbox_cell.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checkbox_cell.dartsimilarity index 77%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/checkbox_cell.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checkbox_cell.dartindex 9fcbaf751f..d334cc38af 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/checkbox_cell.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checkbox_cell.dart@@ -1,5 +1,5 @@import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flutter/widgets.dart';@@ -23,7 +23,8 @@ class _CheckboxCellState extends GridCellState<GridCheckboxCell> {@overridevoid initState() {final cellContext = widget.cellControllerBuilder.build();- _cellBloc = getIt<CheckboxCellBloc>(param1: cellContext)..add(const CheckboxCellEvent.initial());+ _cellBloc = getIt<CheckboxCellBloc>(param1: cellContext)+ ..add(const CheckboxCellEvent.initial());super.initState();}@@ -33,11 +34,15 @@ class _CheckboxCellState extends GridCellState<GridCheckboxCell> {value: _cellBloc,child: BlocBuilder<CheckboxCellBloc, CheckboxCellState>(builder: (context, state) {- final icon = state.isSelected ? svgWidget('editor/editor_check') : svgWidget('editor/editor_uncheck');+ final icon = state.isSelected+ ? svgWidget('editor/editor_check')+ : svgWidget('editor/editor_uncheck');return Align(alignment: Alignment.centerLeft,child: FlowyIconButton(- onPressed: () => context.read<CheckboxCellBloc>().add(const CheckboxCellEvent.select()),+ onPressed: () => context+ .read<CheckboxCellBloc>()+ .add(const CheckboxCellEvent.select()),iconPadding: EdgeInsets.zero,icon: icon,width: 20,diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/date_cell/date_cell.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_cell.dartsimilarity index 85%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/date_cell/date_cell.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_cell.dartindex 78d18a50e8..3254f58e6c 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/date_cell/date_cell.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_cell.dart@@ -2,7 +2,7 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/widgets.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';import '../cell_builder.dart';import 'date_editor.dart';@@ -44,13 +44,16 @@ class _DateCellState extends GridCellState<GridDateCell> {@overridevoid initState() {final cellContext = widget.cellControllerBuilder.build();- _cellBloc = getIt<DateCellBloc>(param1: cellContext)..add(const DateCellEvent.initial());+ _cellBloc = getIt<DateCellBloc>(param1: cellContext)+ ..add(const DateCellEvent.initial());super.initState();}@overrideWidget build(BuildContext context) {- final alignment = widget.cellStyle != null ? widget.cellStyle!.alignment : Alignment.center;+ final alignment = widget.cellStyle != null+ ? widget.cellStyle!.alignment+ : Alignment.center;return BlocProvider.value(value: _cellBloc,child: BlocBuilder<DateCellBloc, DateCellState>(@@ -77,7 +80,8 @@ class _DateCellState extends GridCellState<GridDateCell> {void _showCalendar(BuildContext context) {final bloc = context.read<DateCellBloc>();widget.onCellEditing.value = true;- final calendar = DateCellEditor(onDismissed: () => widget.onCellEditing.value = false);+ final calendar =+ DateCellEditor(onDismissed: () => widget.onCellEditing.value = false);calendar.show(context,cellController: bloc.cellContext.clone(),diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/date_cell/date_editor.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dartsimilarity index 90%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/date_cell/date_editor.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dartindex 36ad22ec53..a439506815 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/date_cell/date_editor.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart@@ -1,7 +1,5 @@import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/application/grid/cell/date_cal_bloc.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/type_option/date.dart';+import 'package:app_flowy/plugins/grid/application/cell/date_cal_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';@@ -15,7 +13,10 @@ import 'package:flowy_sdk/protobuf/flowy-grid/date_type_option.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:table_calendar/table_calendar.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';++import '../../../layout/sizes.dart';+import '../../header/type_option/date.dart';final kToday = DateTime.now();final kFirstDay = DateTime(kToday.year, kToday.month - 3, kToday.day);@@ -35,7 +36,8 @@ class DateCellEditor with FlowyOverlayDelegate {}) async {DateCellEditor.remove(context);- final result = await cellController.getFieldTypeOption(DateTypeOptionDataParser());+ final result =+ await cellController.getFieldTypeOption(DateTypeOptionDataParser());result.fold((dateTypeOption) {final calendar = _CellCalendarWidget(@@ -167,7 +169,9 @@ class _CellCalendarWidget extends StatelessWidget {},onDaySelected: (selectedDay, focusedDay) {_CalDateTimeSetting.hide(context);- context.read<DateCalBloc>().add(DateCalEvent.selectDay(selectedDay));+ context+ .read<DateCalBloc>()+ .add(DateCalEvent.selectDay(selectedDay));},onFormatChanged: (format) {_CalDateTimeSetting.hide(context);@@ -175,7 +179,9 @@ class _CellCalendarWidget extends StatelessWidget {},onPageChanged: (focusedDay) {_CalDateTimeSetting.hide(context);- context.read<DateCalBloc>().add(DateCalEvent.setFocusedDay(focusedDay));+ context+ .read<DateCalBloc>()+ .add(DateCalEvent.setFocusedDay(focusedDay));},);},@@ -200,11 +206,14 @@ class _IncludeTimeButton extends StatelessWidget {children: [svgWidget("grid/clock", color: theme.iconColor),const HSpace(4),- FlowyText.medium(LocaleKeys.grid_field_includeTime.tr(), fontSize: 14),+ FlowyText.medium(LocaleKeys.grid_field_includeTime.tr(),+ fontSize: 14),const Spacer(),Switch(value: includeTime,- onChanged: (newValue) => context.read<DateCalBloc>().add(DateCalEvent.setIncludeTime(newValue)),+ onChanged: (newValue) => context+ .read<DateCalBloc>()+ .add(DateCalEvent.setIncludeTime(newValue)),),],),@@ -294,7 +303,9 @@ class _DateTypeOptionButton extends StatelessWidget {@overrideWidget build(BuildContext context) {final theme = context.watch<AppTheme>();- final title = LocaleKeys.grid_field_dateFormat.tr() + " &" + LocaleKeys.grid_field_timeFormat.tr();+ final title = LocaleKeys.grid_field_dateFormat.tr() ++ " &" ++ LocaleKeys.grid_field_timeFormat.tr();return BlocSelector<DateCalBloc, DateCalState, DateTypeOption>(selector: (state) => state.dateTypeOption,builder: (context, dateTypeOption) {@@ -321,7 +332,9 @@ class _DateTypeOptionButton extends StatelessWidget {class _CalDateTimeSetting extends StatefulWidget {final DateTypeOption dateTypeOption;final Function(DateCalEvent) onEvent;- const _CalDateTimeSetting({required this.dateTypeOption, required this.onEvent, Key? key}) : super(key: key);+ const _CalDateTimeSetting(+ {required this.dateTypeOption, required this.onEvent, Key? key})+ : super(key: key);@overrideState<_CalDateTimeSetting> createState() => _CalDateTimeSettingState();@@ -358,7 +371,8 @@ class _CalDateTimeSettingState extends State<_CalDateTimeSetting> {DateFormatButton(onTap: () {final list = DateFormatList(selectedFormat: widget.dateTypeOption.dateFormat,- onSelected: (format) => widget.onEvent(DateCalEvent.setDateFormat(format)),+ onSelected: (format) =>+ widget.onEvent(DateCalEvent.setDateFormat(format)),);_showOverlay(context, list);}),@@ -367,7 +381,8 @@ class _CalDateTimeSettingState extends State<_CalDateTimeSetting> {onTap: () {final list = TimeFormatList(selectedFormat: widget.dateTypeOption.timeFormat,- onSelected: (format) => widget.onEvent(DateCalEvent.setTimeFormat(format)),+ onSelected: (format) =>+ widget.onEvent(DateCalEvent.setTimeFormat(format)),);_showOverlay(context, list);},diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/number_cell.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/number_cell.dartsimilarity index 82%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/number_cell.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/number_cell.dartindex 573a4168c9..8c6db0afe9 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/number_cell.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/number_cell.dart@@ -1,6 +1,6 @@import 'dart:async';import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -26,8 +26,10 @@ class _NumberCellState extends GridFocusNodeCellState<GridNumberCell> {@overridevoid initState() {final cellContext = widget.cellContorllerBuilder.build();- _cellBloc = getIt<NumberCellBloc>(param1: cellContext)..add(const NumberCellEvent.initial());- _controller = TextEditingController(text: contentFromState(_cellBloc.state));+ _cellBloc = getIt<NumberCellBloc>(param1: cellContext)+ ..add(const NumberCellEvent.initial());+ _controller =+ TextEditingController(text: contentFromState(_cellBloc.state));super.initState();}@@ -39,7 +41,8 @@ class _NumberCellState extends GridFocusNodeCellState<GridNumberCell> {listeners: [BlocListener<NumberCellBloc, NumberCellState>(listenWhen: (p, c) => p.content != c.content,- listener: (context, state) => _controller.text = contentFromState(state),+ listener: (context, state) =>+ _controller.text = contentFromState(state),),],child: TextField(@@ -70,7 +73,8 @@ class _NumberCellState extends GridFocusNodeCellState<GridNumberCell> {if (mounted) {_delayOperation?.cancel();_delayOperation = Timer(const Duration(milliseconds: 300), () {- if (_cellBloc.isClosed == false && _controller.text != contentFromState(_cellBloc.state)) {+ if (_cellBloc.isClosed == false &&+ _controller.text != contentFromState(_cellBloc.state)) {_cellBloc.add(NumberCellEvent.updateCell(_controller.text));}});diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/prelude.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/prelude.dartsimilarity index 85%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/prelude.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/prelude.dartindex 792e58810f..7b34d8fcdf 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/prelude.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/prelude.dart@@ -4,3 +4,4 @@ export 'number_cell.dart';export 'date_cell/date_cell.dart';export 'checkbox_cell.dart';export 'select_option_cell/select_option_cell.dart';+export 'url_cell/url_cell.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/extension.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/extension.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/extension.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/extension.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/select_option_cell.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dartsimilarity index 86%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/select_option_cell.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dartindex f822e503d2..53c77c6016 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/select_option_cell.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dart@@ -1,6 +1,6 @@import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/cell/cell_builder.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';+import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/text.dart';// ignore: unused_import@@ -9,6 +9,7 @@ import 'package:flowy_sdk/protobuf/flowy-grid/select_option.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../cell_builder.dart';import 'extension.dart';import 'select_option_editor.dart';@@ -45,8 +46,10 @@ class _SingleSelectCellState extends State<GridSingleSelectCell> {@overridevoid initState() {- final cellContext = widget.cellContorllerBuilder.build() as GridSelectOptionCellController;- _cellBloc = getIt<SelectOptionCellBloc>(param1: cellContext)..add(const SelectOptionCellEvent.initial());+ final cellContext =+ widget.cellContorllerBuilder.build() as GridSelectOptionCellController;+ _cellBloc = getIt<SelectOptionCellBloc>(param1: cellContext)+ ..add(const SelectOptionCellEvent.initial());super.initState();}@@ -99,8 +102,10 @@ class _MultiSelectCellState extends State<GridMultiSelectCell> {@overridevoid initState() {- final cellContext = widget.cellContorllerBuilder.build() as GridSelectOptionCellController;- _cellBloc = getIt<SelectOptionCellBloc>(param1: cellContext)..add(const SelectOptionCellEvent.initial());+ final cellContext =+ widget.cellContorllerBuilder.build() as GridSelectOptionCellController;+ _cellBloc = getIt<SelectOptionCellBloc>(param1: cellContext)+ ..add(const SelectOptionCellEvent.initial());super.initState();}@@ -147,7 +152,8 @@ class _SelectOptionCell extends StatelessWidget {if (selectOptions.isEmpty && cellStyle != null) {child = Align(alignment: Alignment.centerLeft,- child: FlowyText.medium(cellStyle!.placeholder, fontSize: 14, color: theme.shader3),+ child: FlowyText.medium(cellStyle!.placeholder,+ fontSize: 14, color: theme.shader3),);} else {final tags = selectOptions@@ -172,8 +178,10 @@ class _SelectOptionCell extends StatelessWidget {InkWell(onTap: () {onFocus(true);- final cellContext = cellContorllerBuilder.build() as GridSelectOptionCellController;- SelectOptionCellEditor.show(context, cellContext, () => onFocus(false));+ final cellContext =+ cellContorllerBuilder.build() as GridSelectOptionCellController;+ SelectOptionCellEditor.show(+ context, cellContext, () => onFocus(false));},),],diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/select_option_editor.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_editor.dartsimilarity index 82%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/select_option_editor.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_editor.dartindex 95f2bf1e03..c07eef5617 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/select_option_editor.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_editor.dart@@ -1,9 +1,7 @@import 'dart:collection';-import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';-import 'package:app_flowy/workspace/application/grid/cell/select_option_editor_bloc.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/type_option/select_option_editor.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/common/text_field.dart';+import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';+import 'package:app_flowy/plugins/grid/application/cell/select_option_editor_bloc.dart';+import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -18,6 +16,9 @@ import 'package:easy_localization/easy_localization.dart';import 'package:app_flowy/generated/locale_keys.g.dart';import 'package:textfield_tags/textfield_tags.dart';+import '../../../layout/sizes.dart';+import '../../common/text_field.dart';+import '../../header/type_option/select_option_editor.dart';import 'extension.dart';import 'text_field.dart';@@ -105,7 +106,8 @@ class _OptionList extends StatelessWidget {builder: (context, state) {List<Widget> cells = [];cells.addAll(state.options.map((option) {- return _SelectOptionCell(option, state.selectedOptions.contains(option));+ return _SelectOptionCell(+ option, state.selectedOptions.contains(option));}).toList());state.createOption.fold(@@ -146,8 +148,10 @@ class _TextField extends StatelessWidget {Widget build(BuildContext context) {return BlocBuilder<SelectOptionCellEditorBloc, SelectOptionEditorState>(builder: (context, state) {- final optionMap = LinkedHashMap<String, SelectOptionPB>.fromIterable(state.selectedOptions,- key: (option) => option.name, value: (option) => option);+ final optionMap = LinkedHashMap<String, SelectOptionPB>.fromIterable(+ state.selectedOptions,+ key: (option) => option.name,+ value: (option) => option);return SizedBox(height: 42,@@ -156,12 +160,17 @@ class _TextField extends StatelessWidget {selectedOptionMap: optionMap,distanceToText: _editorPannelWidth * 0.7,tagController: _tagController,- onClick: () => FlowyOverlay.of(context).remove(SelectOptionTypeOptionEditor.identifier),+ onClick: () => FlowyOverlay.of(context)+ .remove(SelectOptionTypeOptionEditor.identifier),newText: (text) {- context.read<SelectOptionCellEditorBloc>().add(SelectOptionEditorEvent.filterOption(text));+ context+ .read<SelectOptionCellEditorBloc>()+ .add(SelectOptionEditorEvent.filterOption(text));},onNewTag: (tagName) {- context.read<SelectOptionCellEditorBloc>().add(SelectOptionEditorEvent.newOption(tagName));+ context+ .read<SelectOptionCellEditorBloc>()+ .add(SelectOptionEditorEvent.newOption(tagName));},),);@@ -208,7 +217,9 @@ class _CreateOptionCell extends StatelessWidget {SelectOptionTag(name: name,color: theme.shader6,- onSelected: () => context.read<SelectOptionCellEditorBloc>().add(SelectOptionEditorEvent.newOption(name)),+ onSelected: () => context+ .read<SelectOptionCellEditorBloc>()+ .add(SelectOptionEditorEvent.newOption(name)),),],);@@ -218,7 +229,8 @@ class _CreateOptionCell extends StatelessWidget {class _SelectOptionCell extends StatelessWidget {final SelectOptionPB option;final bool isSelected;- const _SelectOptionCell(this.option, this.isSelected, {Key? key}) : super(key: key);+ const _SelectOptionCell(this.option, this.isSelected, {Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {@@ -232,7 +244,9 @@ class _SelectOptionCell extends StatelessWidget {child: SelectOptionTagCell(option: option,onSelected: (option) {- context.read<SelectOptionCellEditorBloc>().add(SelectOptionEditorEvent.selectOption(option.id));+ context+ .read<SelectOptionCellEditorBloc>()+ .add(SelectOptionEditorEvent.selectOption(option.id));},children: [if (isSelected)@@ -258,12 +272,17 @@ class _SelectOptionCell extends StatelessWidget {final pannel = SelectOptionTypeOptionEditor(option: option,onDeleted: () {- context.read<SelectOptionCellEditorBloc>().add(SelectOptionEditorEvent.deleteOption(option));+ context+ .read<SelectOptionCellEditorBloc>()+ .add(SelectOptionEditorEvent.deleteOption(option));},onUpdated: (updatedOption) {- context.read<SelectOptionCellEditorBloc>().add(SelectOptionEditorEvent.updateOption(updatedOption));+ context+ .read<SelectOptionCellEditorBloc>()+ .add(SelectOptionEditorEvent.updateOption(updatedOption));},- key: ValueKey(option.id), // Use ValueKey to refresh the UI, otherwise, it will remain the old value.+ key: ValueKey(option+ .id), // Use ValueKey to refresh the UI, otherwise, it will remain the old value.);final overlayIdentifier = (SelectOptionTypeOptionEditor).toString();diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/text_field.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/text_field.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/text_field.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/text_field.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/text_cell.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/text_cell.dartsimilarity index 94%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/text_cell.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/text_cell.dartindex 55bf757ba4..29471c13b6 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/text_cell.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/text_cell.dart@@ -2,7 +2,7 @@ import 'dart:async';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'cell_builder.dart';class GridTextCellStyle extends GridCellStyle {@@ -86,7 +86,8 @@ class _GridTextCellState extends GridFocusNodeCellState<GridTextCell> {if (mounted) {_delayOperation?.cancel();_delayOperation = Timer(const Duration(milliseconds: 300), () {- if (_cellBloc.isClosed == false && _controller.text != _cellBloc.state.content) {+ if (_cellBloc.isClosed == false &&+ _controller.text != _cellBloc.state.content) {_cellBloc.add(TextCellEvent.updateText(_controller.text));}});diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/url_cell/cell_editor.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/cell_editor.dartsimilarity index 87%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/url_cell/cell_editor.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/cell_editor.dartindex b6bc8daa21..9095d73fa6 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/url_cell/cell_editor.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/cell_editor.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';-import 'package:app_flowy/workspace/application/grid/cell/url_cell_editor_bloc.dart';+import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';+import 'package:app_flowy/plugins/grid/application/cell/url_cell_editor_bloc.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'dart:async';@@ -9,7 +9,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';class URLCellEditor extends StatefulWidget with FlowyOverlayDelegate {final GridURLCellController cellController;final VoidCallback completed;- const URLCellEditor({required this.cellController, required this.completed, Key? key}) : super(key: key);+ const URLCellEditor(+ {required this.cellController, required this.completed, Key? key})+ : super(key: key);@overrideState<URLCellEditor> createState() => _URLCellEditorState();@@ -105,7 +107,8 @@ class _URLCellEditorState extends State<URLCellEditor> {Future<void> focusChanged() async {if (mounted) {- if (_cellBloc.isClosed == false && _controller.text != _cellBloc.state.content) {+ if (_cellBloc.isClosed == false &&+ _controller.text != _cellBloc.state.content) {_cellBloc.add(URLCellEditorEvent.updateText(_controller.text));}}diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/url_cell/url_cell.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/url_cell.dartsimilarity index 73%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/url_cell/url_cell.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/url_cell.dartindex 9cc14fbbda..bb39b8f276 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/url_cell/url_cell.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/url_cell.dart@@ -1,16 +1,16 @@import 'dart:async';import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/application/grid/cell/url_cell_bloc.dart';+import 'package:app_flowy/plugins/grid/application/cell/url_cell_bloc.dart';import 'package:app_flowy/workspace/presentation/home/toast.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/cell/cell_accessory.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'package:url_launcher/url_launcher.dart';+import '../cell_accessory.dart';import '../cell_builder.dart';import 'cell_editor.dart';@@ -48,34 +48,41 @@ class GridURLCell extends GridCellWidget {@overrideGridCellState<GridURLCell> createState() => _GridURLCellState();- GridCellAccessory accessoryFromType(GridURLCellAccessoryType ty, GridCellAccessoryBuildContext buildContext) {+ GridCellAccessory accessoryFromType(+ GridURLCellAccessoryType ty, GridCellAccessoryBuildContext buildContext) {switch (ty) {case GridURLCellAccessoryType.edit:- final cellContext = cellContorllerBuilder.build() as GridURLCellController;- return _EditURLAccessory(cellContext: cellContext, anchorContext: buildContext.anchorContext);+ final cellContext =+ cellContorllerBuilder.build() as GridURLCellController;+ return _EditURLAccessory(+ cellContext: cellContext,+ anchorContext: buildContext.anchorContext);case GridURLCellAccessoryType.copyURL:- final cellContext = cellContorllerBuilder.build() as GridURLCellController;+ final cellContext =+ cellContorllerBuilder.build() as GridURLCellController;return _CopyURLAccessory(cellContext: cellContext);}}@override- List<GridCellAccessory> Function(GridCellAccessoryBuildContext buildContext) get accessoryBuilder => (buildContext) {- final List<GridCellAccessory> accessories = [];- if (cellStyle != null) {- accessories.addAll(cellStyle!.accessoryTypes.map((ty) {- return accessoryFromType(ty, buildContext);- }));- }-- // If the accessories is empty then the default accessory will be GridURLCellAccessoryType.edit- if (accessories.isEmpty) {- accessories.add(accessoryFromType(GridURLCellAccessoryType.edit, buildContext));- }-- return accessories;- };+ List<GridCellAccessory> Function(GridCellAccessoryBuildContext buildContext)+ get accessoryBuilder => (buildContext) {+ final List<GridCellAccessory> accessories = [];+ if (cellStyle != null) {+ accessories.addAll(cellStyle!.accessoryTypes.map((ty) {+ return accessoryFromType(ty, buildContext);+ }));+ }++ // If the accessories is empty then the default accessory will be GridURLCellAccessoryType.edit+ if (accessories.isEmpty) {+ accessories.add(accessoryFromType(+ GridURLCellAccessoryType.edit, buildContext));+ }++ return accessories;+ };}class _GridURLCellState extends GridCellState<GridURLCell> {@@ -83,7 +90,8 @@ class _GridURLCellState extends GridCellState<GridURLCell> {@overridevoid initState() {- final cellContext = widget.cellContorllerBuilder.build() as GridURLCellController;+ final cellContext =+ widget.cellContorllerBuilder.build() as GridURLCellController;_cellBloc = URLCellBloc(cellContext: cellContext);_cellBloc.add(const URLCellEvent.initial());super.initState();@@ -132,7 +140,8 @@ class _GridURLCellState extends GridCellState<GridURLCell> {if (url.isNotEmpty && await canLaunchUrl(uri)) {await launchUrl(uri);} else {- final cellContext = widget.cellContorllerBuilder.build() as GridURLCellController;+ final cellContext =+ widget.cellContorllerBuilder.build() as GridURLCellController;widget.onCellEditing.value = true;URLCellEditor.show(context, cellContext, () {widget.onCellEditing.value = false;@@ -177,7 +186,8 @@ class _EditURLAccessory extends StatelessWidget with GridCellAccessory {class _CopyURLAccessory extends StatelessWidget with GridCellAccessory {final GridURLCellController cellContext;- const _CopyURLAccessory({required this.cellContext, Key? key}) : super(key: key);+ const _CopyURLAccessory({required this.cellContext, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {@@ -187,7 +197,8 @@ class _CopyURLAccessory extends StatelessWidget with GridCellAccessory {@overridevoid onTap() {- final content = cellContext.getCellData(loadIfNotExist: false)?.content ?? "";+ final content =+ cellContext.getCellData(loadIfNotExist: false)?.content ?? "";Clipboard.setData(ClipboardData(text: content));showMessageToast(LocaleKeys.grid_row_copyProperty.tr());}diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/common/text_field.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/common/text_field.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/common/text_field.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/common/text_field.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/footer/grid_footer.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/footer/grid_footer.dartsimilarity index 91%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/footer/grid_footer.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/footer/grid_footer.dartindex 6ed8700cfc..f7b5ab350a 100755--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/footer/grid_footer.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/footer/grid_footer.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/grid/grid_bloc.dart';+import 'package:app_flowy/plugins/grid/application/grid_bloc.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/button.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/constants.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/constants.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/constants.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/constants.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_cell.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dartsimilarity index 90%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_cell.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dartindex 1d13870bbf..aec88f5eaf 100755--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_cell.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dart@@ -1,6 +1,5 @@-import 'package:app_flowy/workspace/application/grid/field/field_cell_bloc.dart';-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';+import 'package:app_flowy/plugins/grid/application/field/field_cell_bloc.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -9,6 +8,7 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../layout/sizes.dart';import 'field_type_extension.dart';import 'field_cell_action_sheet.dart';@@ -21,7 +21,8 @@ class GridFieldCell extends StatelessWidget {@overrideWidget build(BuildContext context) {return BlocProvider(- create: (context) => FieldCellBloc(cellContext: cellContext)..add(const FieldCellEvent.initial()),+ create: (context) => FieldCellBloc(cellContext: cellContext)+ ..add(const FieldCellEvent.initial()),child: BlocBuilder<FieldCellBloc, FieldCellState>(// buildWhen: (p, c) => p.field != c.field,builder: (context, state) {@@ -53,7 +54,8 @@ class GridFieldCell extends StatelessWidget {void _showActionSheet(BuildContext context) {final state = context.read<FieldCellBloc>().state;GridFieldCellActionSheet(- cellContext: GridFieldCellContext(gridId: state.gridId, field: state.field),+ cellContext:+ GridFieldCellContext(gridId: state.gridId, field: state.field),onEdited: () => _showFieldEditor(context),).show(context);}@@ -96,7 +98,8 @@ class _GridHeaderCellContainer extends StatelessWidget {return Container(width: width,decoration: decoration,- child: ConstrainedBox(constraints: const BoxConstraints.expand(), child: child),+ child: ConstrainedBox(+ constraints: const BoxConstraints.expand(), child: child),);}}diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_cell_action_sheet.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell_action_sheet.dartsimilarity index 83%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_cell_action_sheet.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell_action_sheet.dartindex 3e7f0c9271..cd884cd557 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_cell_action_sheet.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell_action_sheet.dart@@ -1,6 +1,5 @@import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -12,10 +11,15 @@ import 'package:flutter_bloc/flutter_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:app_flowy/generated/locale_keys.g.dart';-class GridFieldCellActionSheet extends StatelessWidget with FlowyOverlayDelegate {+import '../../layout/sizes.dart';++class GridFieldCellActionSheet extends StatelessWidget+ with FlowyOverlayDelegate {final GridFieldCellContext cellContext;final VoidCallback onEdited;- const GridFieldCellActionSheet({required this.cellContext, required this.onEdited, Key? key}) : super(key: key);+ const GridFieldCellActionSheet(+ {required this.cellContext, required this.onEdited, Key? key})+ : super(key: key);void show(BuildContext overlayContext) {FlowyOverlay.of(overlayContext).insertWithAnchor(@@ -44,7 +48,8 @@ class GridFieldCellActionSheet extends StatelessWidget with FlowyOverlayDelegate},),const VSpace(6),- _FieldOperationList(cellContext, () => FlowyOverlay.of(context).remove(identifier())),+ _FieldOperationList(cellContext,+ () => FlowyOverlay.of(context).remove(identifier())),],),),@@ -73,7 +78,8 @@ class _EditFieldButton extends StatelessWidget {return SizedBox(height: GridSize.typeOptionItemHeight,child: FlowyButton(- text: FlowyText.medium(LocaleKeys.grid_field_editProperty.tr(), fontSize: 12),+ text: FlowyText.medium(LocaleKeys.grid_field_editProperty.tr(),+ fontSize: 12),hoverColor: theme.hover,onTap: onEdited,),@@ -86,7 +92,8 @@ class _EditFieldButton extends StatelessWidget {class _FieldOperationList extends StatelessWidget {final GridFieldCellContext fieldData;final VoidCallback onDismissed;- const _FieldOperationList(this.fieldData, this.onDismissed, {Key? key}) : super(key: key);+ const _FieldOperationList(this.fieldData, this.onDismissed, {Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {@@ -143,7 +150,8 @@ class FieldActionCell extends StatelessWidget {Widget build(BuildContext context) {final theme = context.watch<AppTheme>();return FlowyButton(- text: FlowyText.medium(action.title(), fontSize: 12, color: enable ? null : theme.shader4),+ text: FlowyText.medium(action.title(),+ fontSize: 12, color: enable ? null : theme.shader4),hoverColor: theme.hover,onTap: () {if (enable) {@@ -188,13 +196,19 @@ extension _FieldActionExtension on FieldAction {void run(BuildContext context) {switch (this) {case FieldAction.hide:- context.read<FieldActionSheetBloc>().add(const FieldActionSheetEvent.hideField());+ context+ .read<FieldActionSheetBloc>()+ .add(const FieldActionSheetEvent.hideField());break;case FieldAction.duplicate:- context.read<FieldActionSheetBloc>().add(const FieldActionSheetEvent.duplicateField());+ context+ .read<FieldActionSheetBloc>()+ .add(const FieldActionSheetEvent.duplicateField());break;case FieldAction.delete:- context.read<FieldActionSheetBloc>().add(const FieldActionSheetEvent.deleteField());+ context+ .read<FieldActionSheetBloc>()+ .add(const FieldActionSheetEvent.deleteField());break;}}diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_editor.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_editor.dartsimilarity index 88%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_editor.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_editor.dartindex 3a857a9fb4..30a76a34bb 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_editor.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_editor.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/workspace/application/grid/field/field_editor_bloc.dart';-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';+import 'package:app_flowy/plugins/grid/application/field/field_editor_bloc.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/text.dart';@@ -36,7 +36,8 @@ class FieldEditor extends StatelessWidget with FlowyOverlayDelegate {return ListView(shrinkWrap: true,children: [- FlowyText.medium(LocaleKeys.grid_field_editProperty.tr(), fontSize: 12),+ FlowyText.medium(LocaleKeys.grid_field_editProperty.tr(),+ fontSize: 12),const VSpace(10),const _FieldNameCell(),const VSpace(10),@@ -85,7 +86,8 @@ class _FieldTypeOptionCell extends StatelessWidget {return state.field.fold(() => const SizedBox(),(fieldContext) {- final dataController = context.read<FieldEditorBloc>().dataController;+ final dataController =+ context.read<FieldEditorBloc>().dataController;return FieldTypeOptionEditor(dataController: dataController);},);@@ -105,7 +107,9 @@ class _FieldNameCell extends StatelessWidget {name: state.name,errorText: context.read<FieldEditorBloc>().state.errorText,onNameChanged: (newName) {- context.read<FieldEditorBloc>().add(FieldEditorEvent.updateName(newName));+ context+ .read<FieldEditorBloc>()+ .add(FieldEditorEvent.updateName(newName));},);},diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_name_input.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_name_input.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_name_input.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_name_input.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_type_extension.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_extension.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_type_extension.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_extension.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_type_list.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_list.dartsimilarity index 93%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_type_list.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_list.dartindex 0ea53fb547..de9b3a809f 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_type_list.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_list.dart@@ -1,4 +1,3 @@-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -8,6 +7,7 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter/material.dart';+import '../../layout/sizes.dart';import 'field_type_extension.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -15,7 +15,8 @@ typedef SelectFieldCallback = void Function(FieldType);class FieldTypeList extends StatelessWidget with FlowyOverlayDelegate {final SelectFieldCallback onSelectField;- const FieldTypeList({required this.onSelectField, Key? key}) : super(key: key);+ const FieldTypeList({required this.onSelectField, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_type_option_editor.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dartsimilarity index 82%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_type_option_editor.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dartindex 95dd39bae9..c2a12bb7ad 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_type_option_editor.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dart@@ -9,14 +9,15 @@ import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/field_type_list.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';+import '../../layout/sizes.dart';import 'field_type_extension.dart';+import 'field_type_list.dart';import 'type_option/builder.dart';typedef UpdateFieldCallback = void Function(GridFieldPB, Uint8List);-typedef SwitchToFieldCallback = Future<Either<FieldTypeOptionDataPB, FlowyError>> Function(+typedef SwitchToFieldCallback+ = Future<Either<FieldTypeOptionDataPB, FlowyError>> Function(String fieldId,FieldType fieldType,);@@ -39,12 +40,15 @@ class _FieldTypeOptionEditorState extends State<FieldTypeOptionEditor> {@overrideWidget build(BuildContext context) {return BlocProvider(- create: (context) =>- FieldTypeOptionEditBloc(widget.dataController)..add(const FieldTypeOptionEditEvent.initial()),+ create: (context) => FieldTypeOptionEditBloc(widget.dataController)+ ..add(const FieldTypeOptionEditEvent.initial()),child: BlocBuilder<FieldTypeOptionEditBloc, FieldTypeOptionEditState>(builder: (context, state) {- List<Widget> children = [_switchFieldTypeButton(context, widget.dataController.field)];- final typeOptionWidget = _typeOptionWidget(context: context, state: state);+ List<Widget> children = [+ _switchFieldTypeButton(context, widget.dataController.field)+ ];+ final typeOptionWidget =+ _typeOptionWidget(context: context, state: state);if (typeOptionWidget != null) {children.add(typeOptionWidget);@@ -95,7 +99,8 @@ class _FieldTypeOptionEditorState extends State<FieldTypeOptionEditor> {);}- void _showOverlay(BuildContext context, Widget child, {VoidCallback? onRemoved}) {+ void _showOverlay(BuildContext context, Widget child,+ {VoidCallback? onRemoved}) {final identifier = child.toString();if (currentOverlayIdentifier != null) {FlowyOverlay.of(context).remove(currentOverlayIdentifier!);diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/grid_header.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dartsimilarity index 84%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/grid_header.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dartindex 5a888129b5..df7be4ee2b 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/grid_header.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dart@@ -1,6 +1,5 @@import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -9,6 +8,7 @@ import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:reorderables/reorderables.dart';+import '../../layout/sizes.dart';import 'field_editor.dart';import 'field_cell.dart';@@ -24,7 +24,8 @@ class GridHeaderSliverAdaptor extends StatefulWidget {}) : super(key: key);@override- State<GridHeaderSliverAdaptor> createState() => _GridHeaderSliverAdaptorState();+ State<GridHeaderSliverAdaptor> createState() =>+ _GridHeaderSliverAdaptorState();}class _GridHeaderSliverAdaptorState extends State<GridHeaderSliverAdaptor> {@@ -32,12 +33,14 @@ class _GridHeaderSliverAdaptorState extends State<GridHeaderSliverAdaptor> {Widget build(BuildContext context) {return BlocProvider(create: (context) {- final bloc = getIt<GridHeaderBloc>(param1: widget.gridId, param2: widget.fieldCache);+ final bloc = getIt<GridHeaderBloc>(+ param1: widget.gridId, param2: widget.fieldCache);bloc.add(const GridHeaderEvent.initial());return bloc;},child: BlocBuilder<GridHeaderBloc, GridHeaderState>(- buildWhen: (previous, current) => previous.fields.length != current.fields.length,+ buildWhen: (previous, current) =>+ previous.fields.length != current.fields.length,builder: (context, state) {return SingleChildScrollView(scrollDirection: Axis.horizontal,@@ -76,7 +79,8 @@ class _GridHeaderState extends State<_GridHeader> {builder: (context, state) {final cells = state.fields.where((field) => field.visibility)- .map((field) => GridFieldCellContext(gridId: widget.gridId, field: field))+ .map((field) =>+ GridFieldCellContext(gridId: widget.gridId, field: field)).map((ctx) => GridFieldCell(ctx, key: ValueKey(ctx.field.id))).toList();@@ -99,10 +103,13 @@ class _GridHeaderState extends State<_GridHeader> {);}- void _onReorder(List<GridFieldCell> cells, int oldIndex, BuildContext context, int newIndex) {+ void _onReorder(List<GridFieldCell> cells, int oldIndex, BuildContext context,+ int newIndex) {if (cells.length > oldIndex) {final field = cells[oldIndex].cellContext.field;- context.read<GridHeaderBloc>().add(GridHeaderEvent.moveField(field, oldIndex, newIndex));+ context+ .read<GridHeaderBloc>()+ .add(GridHeaderEvent.moveField(field, oldIndex, newIndex));}}}@@ -158,14 +165,17 @@ class CreateFieldButton extends StatelessWidget {}}-class SliverHeaderDelegateImplementation extends SliverPersistentHeaderDelegate {+class SliverHeaderDelegateImplementation+ extends SliverPersistentHeaderDelegate {final String gridId;final List<GridFieldPB> fields;- SliverHeaderDelegateImplementation({required this.gridId, required this.fields});+ SliverHeaderDelegateImplementation(+ {required this.gridId, required this.fields});@override- Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) {+ Widget build(+ BuildContext context, double shrinkOffset, bool overlapsContent) {return _GridHeader(gridId: gridId);}diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/builder.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dartsimilarity index 92%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/builder.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dartindex 63fa761d98..4471e672a3 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/builder.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dart@@ -1,10 +1,10 @@import 'dart:typed_data';-import 'package:app_flowy/workspace/application/grid/field/type_option/multi_select_type_option.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/type_option/checkbox.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/multi_select_type_option.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter/material.dart';+import 'checkbox.dart';import 'date.dart';import 'multi_select.dart';import 'number.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/checkbox.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/checkbox.dartsimilarity index 74%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/checkbox.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/checkbox.dartindex beca8acd09..fdc5719181 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/checkbox.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/checkbox.dart@@ -1,11 +1,12 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/type_option_service.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_service.dart';import 'package:flowy_sdk/protobuf/flowy-grid/checkbox_type_option.pb.dart';import 'package:flutter/material.dart';import 'builder.dart';typedef CheckboxTypeOptionContext = TypeOptionWidgetContext<CheckboxTypeOption>;-class CheckboxTypeOptionWidgetDataParser extends TypeOptionDataParser<CheckboxTypeOption> {+class CheckboxTypeOptionWidgetDataParser+ extends TypeOptionDataParser<CheckboxTypeOption> {@overrideCheckboxTypeOption fromBuffer(List<int> buffer) {return CheckboxTypeOption.fromBuffer(buffer);diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/date.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/date.dartsimilarity index 88%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/date.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/date.dartindex 39408c9ee3..c162595b88 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/date.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/date.dart@@ -1,6 +1,4 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/date_bloc.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/field_type_option_editor.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/date_bloc.dart';import 'package:easy_localization/easy_localization.dart' hide DateFormat;import 'package:app_flowy/generated/locale_keys.g.dart';import 'package:flowy_infra/image.dart';@@ -12,6 +10,8 @@ import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flowy_sdk/protobuf/flowy-grid/date_type_option_entities.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../layout/sizes.dart';+import '../field_type_option_editor.dart';import 'builder.dart';class DateTypeOptionWidgetBuilder extends TypeOptionWidgetBuilder {@@ -44,9 +44,11 @@ class DateTypeOptionWidget extends TypeOptionWidget {@overrideWidget build(BuildContext context) {return BlocProvider(- create: (context) => DateTypeOptionBloc(typeOptionContext: typeOptionContext),+ create: (context) =>+ DateTypeOptionBloc(typeOptionContext: typeOptionContext),child: BlocConsumer<DateTypeOptionBloc, DateTypeOptionState>(- listener: (context, state) => typeOptionContext.typeOption = state.typeOption,+ listener: (context, state) =>+ typeOptionContext.typeOption = state.typeOption,builder: (context, state) {return Column(children: [_renderDateFormatButton(context, state.typeOption.dateFormat),@@ -63,7 +65,9 @@ class DateTypeOptionWidget extends TypeOptionWidget {final list = DateFormatList(selectedFormat: dataFormat,onSelected: (format) {- context.read<DateTypeOptionBloc>().add(DateTypeOptionEvent.didSelectDateFormat(format));+ context+ .read<DateTypeOptionBloc>()+ .add(DateTypeOptionEvent.didSelectDateFormat(format));},);overlayDelegate.showOverlay(context, list);@@ -77,7 +81,9 @@ class DateTypeOptionWidget extends TypeOptionWidget {final list = TimeFormatList(selectedFormat: timeFormat,onSelected: (format) {- context.read<DateTypeOptionBloc>().add(DateTypeOptionEvent.didSelectTimeFormat(format));+ context+ .read<DateTypeOptionBloc>()+ .add(DateTypeOptionEvent.didSelectTimeFormat(format));});overlayDelegate.showOverlay(context, list);},@@ -95,7 +101,8 @@ class DateFormatButton extends StatelessWidget {return SizedBox(height: GridSize.typeOptionItemHeight,child: FlowyButton(- text: FlowyText.medium(LocaleKeys.grid_field_dateFormat.tr(), fontSize: 12),+ text: FlowyText.medium(LocaleKeys.grid_field_dateFormat.tr(),+ fontSize: 12),margin: GridSize.typeOptionContentInsets,hoverColor: theme.hover,onTap: onTap,@@ -108,7 +115,9 @@ class DateFormatButton extends StatelessWidget {class TimeFormatButton extends StatelessWidget {final TimeFormat timeFormat;final VoidCallback onTap;- const TimeFormatButton({required this.timeFormat, required this.onTap, Key? key}) : super(key: key);+ const TimeFormatButton(+ {required this.timeFormat, required this.onTap, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {@@ -116,7 +125,8 @@ class TimeFormatButton extends StatelessWidget {return SizedBox(height: GridSize.typeOptionItemHeight,child: FlowyButton(- text: FlowyText.medium(LocaleKeys.grid_field_timeFormat.tr(), fontSize: 12),+ text: FlowyText.medium(LocaleKeys.grid_field_timeFormat.tr(),+ fontSize: 12),margin: GridSize.typeOptionContentInsets,hoverColor: theme.hover,onTap: onTap,@@ -140,12 +150,15 @@ class _IncludeTimeButton extends StatelessWidget {padding: GridSize.typeOptionContentInsets,child: Row(children: [- FlowyText.medium(LocaleKeys.grid_field_includeTime.tr(), fontSize: 12),+ FlowyText.medium(LocaleKeys.grid_field_includeTime.tr(),+ fontSize: 12),const Spacer(),Switch(value: includeTime,onChanged: (newValue) {- context.read<DateTypeOptionBloc>().add(DateTypeOptionEvent.includeTime(newValue));+ context+ .read<DateTypeOptionBloc>()+ .add(DateTypeOptionEvent.includeTime(newValue));},),],@@ -160,7 +173,9 @@ class _IncludeTimeButton extends StatelessWidget {class DateFormatList extends StatelessWidget {final DateFormat selectedFormat;final Function(DateFormat format) onSelected;- const DateFormatList({required this.selectedFormat, required this.onSelected, Key? key}) : super(key: key);+ const DateFormatList(+ {required this.selectedFormat, required this.onSelected, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/multi_select.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/multi_select.dartsimilarity index 85%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/multi_select.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/multi_select.dartindex 8c7ab40a6f..e1b97fe087 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/multi_select.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/multi_select.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/multi_select_type_option.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/field_type_option_editor.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/multi_select_type_option.dart';import 'package:flutter/material.dart';+import '../field_type_option_editor.dart';import 'builder.dart';import 'select_option.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/number.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/number.dartsimilarity index 83%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/number.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/number.dartindex e15abb1728..8e4e53b40c 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/number.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/number.dart@@ -1,8 +1,5 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/number_bloc.dart';-import 'package:app_flowy/workspace/application/grid/field/type_option/number_format_bloc.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/common/text_field.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/field_type_option_editor.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/number_bloc.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/number_format_bloc.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -15,6 +12,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';import 'package:easy_localization/easy_localization.dart' hide NumberFormat;import 'package:app_flowy/generated/locale_keys.g.dart';+import '../../../layout/sizes.dart';+import '../../common/text_field.dart';+import '../field_type_option_editor.dart';import 'builder.dart';class NumberTypeOptionWidgetBuilder extends TypeOptionWidgetBuilder {@@ -45,19 +45,23 @@ class NumberTypeOptionWidget extends TypeOptionWidget {Widget build(BuildContext context) {final theme = context.watch<AppTheme>();return BlocProvider(- create: (context) => NumberTypeOptionBloc(typeOptionContext: typeOptionContext),+ create: (context) =>+ NumberTypeOptionBloc(typeOptionContext: typeOptionContext),child: SizedBox(height: GridSize.typeOptionItemHeight,child: BlocConsumer<NumberTypeOptionBloc, NumberTypeOptionState>(- listener: (context, state) => typeOptionContext.typeOption = state.typeOption,+ listener: (context, state) =>+ typeOptionContext.typeOption = state.typeOption,builder: (context, state) {return FlowyButton(text: Row(children: [- FlowyText.medium(LocaleKeys.grid_field_numberFormat.tr(), fontSize: 12),+ FlowyText.medium(LocaleKeys.grid_field_numberFormat.tr(),+ fontSize: 12),// const HSpace(6),const Spacer(),- FlowyText.regular(state.typeOption.format.title(), fontSize: 12),+ FlowyText.regular(state.typeOption.format.title(),+ fontSize: 12),],),margin: GridSize.typeOptionContentInsets,@@ -65,7 +69,9 @@ class NumberTypeOptionWidget extends TypeOptionWidget {onTap: () {final list = NumberFormatList(onSelected: (format) {- context.read<NumberTypeOptionBloc>().add(NumberTypeOptionEvent.didSelectFormat(format));+ context+ .read<NumberTypeOptionBloc>()+ .add(NumberTypeOptionEvent.didSelectFormat(format));},selectedFormat: state.typeOption.format,);@@ -88,7 +94,9 @@ typedef _SelectNumberFormatCallback = Function(NumberFormat format);class NumberFormatList extends StatelessWidget {final _SelectNumberFormatCallback onSelected;final NumberFormat selectedFormat;- const NumberFormatList({required this.selectedFormat, required this.onSelected, Key? key}) : super(key: key);+ const NumberFormatList(+ {required this.selectedFormat, required this.onSelected, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {@@ -108,7 +116,8 @@ class NumberFormatList extends StatelessWidget {format: format,onSelected: (format) {onSelected(format);- FlowyOverlay.of(context).remove(NumberFormatList.identifier());+ FlowyOverlay.of(context)+ .remove(NumberFormatList.identifier());});}).toList();diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/rich_text.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/rich_text.dartsimilarity index 74%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/rich_text.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/rich_text.dartindex 2375918f11..a4291f91ce 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/rich_text.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/rich_text.dart@@ -1,11 +1,12 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/type_option_service.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_service.dart';import 'package:flowy_sdk/protobuf/flowy-grid/text_type_option.pb.dart';import 'package:flutter/material.dart';import 'builder.dart';typedef RichTextTypeOptionContext = TypeOptionWidgetContext<RichTextTypeOption>;-class RichTextTypeOptionWidgetDataParser extends TypeOptionDataParser<RichTextTypeOption> {+class RichTextTypeOptionWidgetDataParser+ extends TypeOptionDataParser<RichTextTypeOption> {@overrideRichTextTypeOption fromBuffer(List<int> buffer) {return RichTextTypeOption.fromBuffer(buffer);diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/select_option.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dartsimilarity index 79%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/select_option.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dartindex c0d54159e8..5d6304ea7a 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/select_option.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dart@@ -1,7 +1,4 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/select_option_type_option_bloc.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/extension.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/common/text_field.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/select_option_type_option_bloc.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -13,6 +10,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:app_flowy/generated/locale_keys.g.dart';+import '../../../layout/sizes.dart';+import '../../cell/select_option_cell/extension.dart';+import '../../common/text_field.dart';import 'builder.dart';import 'select_option_editor.dart';@@ -33,8 +33,10 @@ class SelectOptionTypeOptionWidget extends StatelessWidget {@overrideWidget build(BuildContext context) {return BlocProvider(- create: (context) => SelectOptionTypeOptionBloc(options: options, typeOptionAction: typeOptionAction),- child: BlocBuilder<SelectOptionTypeOptionBloc, SelectOptionTypeOptionState>(+ create: (context) => SelectOptionTypeOptionBloc(+ options: options, typeOptionAction: typeOptionAction),+ child:+ BlocBuilder<SelectOptionTypeOptionBloc, SelectOptionTypeOptionState>(builder: (context, state) {List<Widget> children = [const TypeOptionSeparator(),@@ -44,7 +46,8 @@ class SelectOptionTypeOptionWidget extends StatelessWidget {padding: EdgeInsets.only(bottom: 10),child: _CreateOptionTextField(),),- if (state.options.isEmpty && !state.isEditingOption) const _AddOptionButton(),+ if (state.options.isEmpty && !state.isEditingOption)+ const _AddOptionButton(),_OptionList(overlayDelegate)];@@ -62,7 +65,9 @@ class OptionTitle extends StatelessWidget {Widget build(BuildContext context) {return BlocBuilder<SelectOptionTypeOptionBloc, SelectOptionTypeOptionState>(builder: (context, state) {- List<Widget> children = [FlowyText.medium(LocaleKeys.grid_field_optionTitle.tr(), fontSize: 12)];+ List<Widget> children = [+ FlowyText.medium(LocaleKeys.grid_field_optionTitle.tr(), fontSize: 12)+ ];if (state.options.isNotEmpty) {children.add(const Spacer());children.add(const _OptionTitleButton());@@ -94,7 +99,9 @@ class _OptionTitleButton extends StatelessWidget {),hoverColor: theme.hover,onTap: () {- context.read<SelectOptionTypeOptionBloc>().add(const SelectOptionTypeOptionEvent.addingOption());+ context+ .read<SelectOptionTypeOptionBloc>()+ .add(const SelectOptionTypeOptionEvent.addingOption());},),);@@ -139,11 +146,15 @@ class _OptionList extends StatelessWidget {option: option,onDeleted: () {delegate.hideOverlay(context);- context.read<SelectOptionTypeOptionBloc>().add(SelectOptionTypeOptionEvent.deleteOption(option));+ context+ .read<SelectOptionTypeOptionBloc>()+ .add(SelectOptionTypeOptionEvent.deleteOption(option));},onUpdated: (updatedOption) {delegate.hideOverlay(context);- context.read<SelectOptionTypeOptionBloc>().add(SelectOptionTypeOptionEvent.updateOption(updatedOption));+ context+ .read<SelectOptionTypeOptionBloc>()+ .add(SelectOptionTypeOptionEvent.updateOption(updatedOption));},key: ValueKey(option.id),);@@ -191,10 +202,13 @@ class _AddOptionButton extends StatelessWidget {return SizedBox(height: GridSize.typeOptionItemHeight,child: FlowyButton(- text: FlowyText.medium(LocaleKeys.grid_field_addSelectOption.tr(), fontSize: 12),+ text: FlowyText.medium(LocaleKeys.grid_field_addSelectOption.tr(),+ fontSize: 12),hoverColor: theme.hover,onTap: () {- context.read<SelectOptionTypeOptionBloc>().add(const SelectOptionTypeOptionEvent.addingOption());+ context+ .read<SelectOptionTypeOptionBloc>()+ .add(const SelectOptionTypeOptionEvent.addingOption());},leftIcon: svgWidget("home/add", color: theme.iconColor),),@@ -214,10 +228,14 @@ class _CreateOptionTextField extends StatelessWidget {autoClearWhenDone: true,text: text,onCanceled: () {- context.read<SelectOptionTypeOptionBloc>().add(const SelectOptionTypeOptionEvent.endAddingOption());+ context+ .read<SelectOptionTypeOptionBloc>()+ .add(const SelectOptionTypeOptionEvent.endAddingOption());},onDone: (optionName) {- context.read<SelectOptionTypeOptionBloc>().add(SelectOptionTypeOptionEvent.createOption(optionName));+ context+ .read<SelectOptionTypeOptionBloc>()+ .add(SelectOptionTypeOptionEvent.createOption(optionName));},);},diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/select_option_editor.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option_editor.dartsimilarity index 81%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/select_option_editor.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option_editor.dartindex 5381342d20..fbb42b5784 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/select_option_editor.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option_editor.dart@@ -1,7 +1,5 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/edit_select_option_bloc.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/extension.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/common/text_field.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/edit_select_option_bloc.dart';+import 'package:app_flowy/plugins/grid/presentation/widgets/cell/select_option_cell/extension.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -14,6 +12,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:app_flowy/generated/locale_keys.g.dart';+import '../../../layout/sizes.dart';+import '../../common/text_field.dart';+class SelectOptionTypeOptionEditor extends StatelessWidget {final SelectOptionPB option;final VoidCallback onDeleted;@@ -49,11 +50,14 @@ class SelectOptionTypeOptionEditor extends StatelessWidget {child: BlocBuilder<EditSelectOptionBloc, EditSelectOptionState>(builder: (context, state) {List<Widget> slivers = [- SliverToBoxAdapter(child: _OptionNameTextField(state.option.name)),+ SliverToBoxAdapter(+ child: _OptionNameTextField(state.option.name)),const SliverToBoxAdapter(child: VSpace(10)),const SliverToBoxAdapter(child: _DeleteTag()),const SliverToBoxAdapter(child: TypeOptionSeparator()),- SliverToBoxAdapter(child: SelectOptionColorList(selectedColor: state.option.color)),+ SliverToBoxAdapter(+ child:+ SelectOptionColorList(selectedColor: state.option.color)),];return SizedBox(@@ -80,11 +84,14 @@ class _DeleteTag extends StatelessWidget {return SizedBox(height: GridSize.typeOptionItemHeight,child: FlowyButton(- text: FlowyText.medium(LocaleKeys.grid_selectOption_deleteTag.tr(), fontSize: 12),+ text: FlowyText.medium(LocaleKeys.grid_selectOption_deleteTag.tr(),+ fontSize: 12),hoverColor: theme.hover,leftIcon: svgWidget("grid/delete", color: theme.iconColor),onTap: () {- context.read<EditSelectOptionBloc>().add(const EditSelectOptionEvent.delete());+ context+ .read<EditSelectOptionBloc>()+ .add(const EditSelectOptionEvent.delete());},),);@@ -102,7 +109,9 @@ class _OptionNameTextField extends StatelessWidget {onCanceled: () {},onDone: (optionName) {if (name != optionName) {- context.read<EditSelectOptionBloc>().add(EditSelectOptionEvent.updateName(optionName));+ context+ .read<EditSelectOptionBloc>()+ .add(EditSelectOptionEvent.updateName(optionName));}},);@@ -111,12 +120,14 @@ class _OptionNameTextField extends StatelessWidget {class SelectOptionColorList extends StatelessWidget {final SelectOptionColorPB selectedColor;- const SelectOptionColorList({required this.selectedColor, Key? key}) : super(key: key);+ const SelectOptionColorList({required this.selectedColor, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {final cells = SelectOptionColorPB.values.map((color) {- return _SelectOptionColorCell(color: color, isSelected: selectedColor == color);+ return _SelectOptionColorCell(+ color: color, isSelected: selectedColor == color);}).toList();return Column(@@ -154,7 +165,9 @@ class SelectOptionColorList extends StatelessWidget {class _SelectOptionColorCell extends StatelessWidget {final SelectOptionColorPB color;final bool isSelected;- const _SelectOptionColorCell({required this.color, required this.isSelected, Key? key}) : super(key: key);+ const _SelectOptionColorCell(+ {required this.color, required this.isSelected, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {@@ -182,7 +195,9 @@ class _SelectOptionColorCell extends StatelessWidget {leftIcon: colorIcon,rightIcon: checkmark,onTap: () {- context.read<EditSelectOptionBloc>().add(EditSelectOptionEvent.updateColor(color));+ context+ .read<EditSelectOptionBloc>()+ .add(EditSelectOptionEvent.updateColor(color));},),);diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/single_select.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/single_select.dartsimilarity index 85%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/single_select.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/single_select.dartindex a1ed4e857a..57940ecbee 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/single_select.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/single_select.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/single_select_type_option.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/field_type_option_editor.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/single_select_type_option.dart';import 'package:flutter/material.dart';+import '../field_type_option_editor.dart';import 'builder.dart';import 'select_option.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/url.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/url.dartsimilarity index 74%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/url.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/url.dartindex 97c0db0814..894a1b1e5c 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/url.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/url.dart@@ -1,11 +1,12 @@-import 'package:app_flowy/workspace/application/grid/field/type_option/type_option_service.dart';+import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_service.dart';import 'package:flowy_sdk/protobuf/flowy-grid/url_type_option.pb.dart';import 'package:flutter/material.dart';import 'builder.dart';typedef URLTypeOptionContext = TypeOptionWidgetContext<URLTypeOption>;-class URLTypeOptionWidgetDataParser extends TypeOptionDataParser<URLTypeOption> {+class URLTypeOptionWidgetDataParser+ extends TypeOptionDataParser<URLTypeOption> {@overrideURLTypeOption fromBuffer(List<int> buffer) {return URLTypeOption.fromBuffer(buffer);diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/row/grid_row.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/grid_row.dartsimilarity index 89%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/row/grid_row.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/grid_row.dartindex c3e2e17b7e..effc1b188c 100755--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/row/grid_row.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/grid_row.dart@@ -1,8 +1,4 @@-import 'package:app_flowy/workspace/application/grid/prelude.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/cell/cell_accessory.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/cell/cell_cotainer.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/cell/prelude.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';@@ -11,6 +7,10 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:provider/provider.dart';+import '../../layout/sizes.dart';+import '../cell/cell_accessory.dart';+import '../cell/cell_cotainer.dart';+import '../cell/prelude.dart';import 'row_action_sheet.dart';import 'row_detail.dart';@@ -95,7 +95,9 @@ class _RowLeading extends StatelessWidget {Widget build(BuildContext context) {return Consumer<RegionStateNotifier>(builder: (context, state, _) {- return SizedBox(width: GridSize.leadingHeaderPadding, child: state.onEnter ? _activeWidget() : null);+ return SizedBox(+ width: GridSize.leadingHeaderPadding,+ child: state.onEnter ? _activeWidget() : null);},);}@@ -168,7 +170,8 @@ class _RowCells extends StatelessWidget {@overrideWidget build(BuildContext context) {return BlocBuilder<RowBloc, RowState>(- buildWhen: (previous, current) => !listEquals(previous.snapshots, current.snapshots),+ buildWhen: (previous, current) =>+ !listEquals(previous.snapshots, current.snapshots),builder: (context, state) {return IntrinsicHeight(child: Row(@@ -204,7 +207,8 @@ class _RowCells extends StatelessWidget {return CellContainer(width: cellId.field.width.toDouble(),child: child,- rowStateNotifier: Provider.of<RegionStateNotifier>(context, listen: false),+ rowStateNotifier:+ Provider.of<RegionStateNotifier>(context, listen: false),accessoryBuilder: accessoryBuilder,);},diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/row/row_action_sheet.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_action_sheet.dartsimilarity index 87%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/row/row_action_sheet.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_action_sheet.dartindex 06e9c68d19..67c7b4893b 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/row/row_action_sheet.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_action_sheet.dart@@ -1,6 +1,5 @@-import 'package:app_flowy/workspace/application/grid/row/row_action_sheet_bloc.dart';-import 'package:app_flowy/workspace/application/grid/row/row_service.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';+import 'package:app_flowy/plugins/grid/application/row/row_action_sheet_bloc.dart';+import 'package:app_flowy/plugins/grid/application/row/row_service.dart';import 'package:easy_localization/easy_localization.dart';import 'package:app_flowy/generated/locale_keys.g.dart';import 'package:flowy_infra/image.dart';@@ -13,6 +12,8 @@ import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../layout/sizes.dart';+class GridRowActionSheet extends StatelessWidget {final GridRowInfo rowData;const GridRowActionSheet({required this.rowData, Key? key}) : super(key: key);@@ -76,7 +77,9 @@ class GridRowActionSheet extends StatelessWidget {class _RowActionCell extends StatelessWidget {final _RowAction action;final VoidCallback onDismissed;- const _RowActionCell({required this.action, required this.onDismissed, Key? key}) : super(key: key);+ const _RowActionCell(+ {required this.action, required this.onDismissed, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {@@ -139,10 +142,14 @@ extension _RowActionExtension on _RowAction {void performAction(BuildContext context) {switch (this) {case _RowAction.duplicate:- context.read<RowActionSheetBloc>().add(const RowActionSheetEvent.duplicateRow());+ context+ .read<RowActionSheetBloc>()+ .add(const RowActionSheetEvent.duplicateRow());break;case _RowAction.delete:- context.read<RowActionSheetBloc>().add(const RowActionSheetEvent.deleteRow());+ context+ .read<RowActionSheetBloc>()+ .add(const RowActionSheetEvent.deleteRow());break;}}diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/row/row_detail.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dartsimilarity index 83%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/row/row_detail.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dartindex a01f97b847..e7e00ead68 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/row/row_detail.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dart@@ -1,13 +1,7 @@-import 'package:app_flowy/workspace/application/grid/cell/cell_service/cell_service.dart';-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';-import 'package:app_flowy/workspace/application/grid/row/row_detail_bloc.dart';-import 'package:app_flowy/workspace/application/grid/row/row_service.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/cell/cell_accessory.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/cell/prelude.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/cell/url_cell/url_cell.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/field_cell.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/field_editor.dart';+import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';+import 'package:app_flowy/plugins/grid/application/row/row_detail_bloc.dart';+import 'package:app_flowy/plugins/grid/application/row/row_service.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -20,6 +14,12 @@ import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../layout/sizes.dart';+import '../cell/cell_accessory.dart';+import '../cell/prelude.dart';+import '../header/field_cell.dart';+import '../header/field_editor.dart';+class RowDetailPage extends StatefulWidget with FlowyOverlayDelegate {final GridRowInfo rowInfo;final GridRowCache rowCache;@@ -62,7 +62,8 @@ class _RowDetailPageState extends State<RowDetailPage> {Widget build(BuildContext context) {return BlocProvider(create: (context) {- final bloc = RowDetailBloc(rowInfo: widget.rowInfo, rowCache: widget.rowCache);+ final bloc =+ RowDetailBloc(rowInfo: widget.rowInfo, rowCache: widget.rowCache);bloc.add(const RowDetailEvent.initial());return bloc;},@@ -92,7 +93,8 @@ class _CloseButton extends StatelessWidget {final theme = context.watch<AppTheme>();return FlowyIconButton(width: 24,- onPressed: () => FlowyOverlay.of(context).remove(RowDetailPage.identifier()),+ onPressed: () =>+ FlowyOverlay.of(context).remove(RowDetailPage.identifier()),iconPadding: const EdgeInsets.fromLTRB(2, 2, 2, 2),icon: svgWidget("home/close", color: theme.iconColor),);@@ -156,7 +158,8 @@ class _RowDetailCell extends StatelessWidget {onTap: () => cell.beginFocus.notify(),child: AccessoryHover(child: cell,- contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 12),+ contentPadding:+ const EdgeInsets.symmetric(horizontal: 10, vertical: 12),),);@@ -169,7 +172,8 @@ class _RowDetailCell extends StatelessWidget {children: [SizedBox(width: 150,- child: FieldCellButton(field: cellId.field, onTap: () => _showFieldEditor(context)),+ child: FieldCellButton(+ field: cellId.field, onTap: () => _showFieldEditor(context)),),const HSpace(10),Expanded(child: gesture),diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/shortcuts.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/shortcuts.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/shortcuts.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/shortcuts.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/toolbar/grid_property.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dartsimilarity index 81%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/toolbar/grid_property.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dartindex b34007493b..df4eb2115c 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/toolbar/grid_property.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dart@@ -1,10 +1,8 @@import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/grid/field/field_service.dart';-import 'package:app_flowy/workspace/application/grid/grid_service.dart';-import 'package:app_flowy/workspace/application/grid/setting/property_bloc.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/field_editor.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/widgets/header/field_type_extension.dart';+import 'package:app_flowy/plugins/grid/application/field/field_service.dart';+import 'package:app_flowy/plugins/grid/application/grid_service.dart';+import 'package:app_flowy/plugins/grid/application/setting/property_bloc.dart';+import 'package:app_flowy/plugins/grid/presentation/widgets/header/field_type_extension.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -17,6 +15,9 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:styled_widget/styled_widget.dart';+import '../../layout/sizes.dart';+import '../header/field_editor.dart';+class GridPropertyList extends StatelessWidget with FlowyOverlayDelegate {final String gridId;final GridFieldCache fieldCache;@@ -44,11 +45,13 @@ class GridPropertyList extends StatelessWidget with FlowyOverlayDelegate {Widget build(BuildContext context) {return BlocProvider(create: (context) =>- getIt<GridPropertyBloc>(param1: gridId, param2: fieldCache)..add(const GridPropertyEvent.initial()),+ getIt<GridPropertyBloc>(param1: gridId, param2: fieldCache)+ ..add(const GridPropertyEvent.initial()),child: BlocBuilder<GridPropertyBloc, GridPropertyState>(builder: (context, state) {final cells = state.fields.map((field) {- return _GridPropertyCell(gridId: gridId, field: field, key: ValueKey(field.id));+ return _GridPropertyCell(+ gridId: gridId, field: field, key: ValueKey(field.id));}).toList();return ListView.separated(@@ -77,7 +80,8 @@ class GridPropertyList extends StatelessWidget with FlowyOverlayDelegate {class _GridPropertyCell extends StatelessWidget {final GridFieldPB field;final String gridId;- const _GridPropertyCell({required this.gridId, required this.field, Key? key}) : super(key: key);+ const _GridPropertyCell({required this.gridId, required this.field, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {@@ -99,7 +103,9 @@ class _GridPropertyCell extends StatelessWidget {hoverColor: theme.hover,width: GridSize.typeOptionItemHeight,onPressed: () {- context.read<GridPropertyBloc>().add(GridPropertyEvent.setFieldVisibility(field.id, !field.visibility));+ context.read<GridPropertyBloc>().add(+ GridPropertyEvent.setFieldVisibility(+ field.id, !field.visibility));},icon: checkmark.padding(all: 6),)diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/toolbar/grid_setting.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dartsimilarity index 82%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/toolbar/grid_setting.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dartindex 7e3c14e021..d7c084fe2d 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/toolbar/grid_setting.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/workspace/application/grid/grid_service.dart';-import 'package:app_flowy/workspace/application/grid/setting/setting_bloc.dart';+import 'package:app_flowy/plugins/grid/application/grid_service.dart';+import 'package:app_flowy/plugins/grid/application/setting/setting_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';@@ -12,8 +12,7 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-+import '../../layout/sizes.dart';import 'grid_property.dart';class GridSettingContext {@@ -29,7 +28,9 @@ class GridSettingContext {class GridSettingList extends StatelessWidget {final GridSettingContext settingContext;final Function(GridSettingAction, GridSettingContext) onAction;- const GridSettingList({required this.settingContext, required this.onAction, Key? key}) : super(key: key);+ const GridSettingList(+ {required this.settingContext, required this.onAction, Key? key})+ : super(key: key);static void show(BuildContext context, GridSettingContext settingContext) {final list = GridSettingList(@@ -41,7 +42,10 @@ class GridSettingList extends StatelessWidget {case GridSettingAction.sortBy:break;case GridSettingAction.properties:- GridPropertyList(gridId: settingContext.gridId, fieldCache: settingContext.fieldCache).show(context);+ GridPropertyList(+ gridId: settingContext.gridId,+ fieldCache: settingContext.fieldCache)+ .show(context);break;}},@@ -64,7 +68,8 @@ class GridSettingList extends StatelessWidget {return BlocProvider(create: (context) => GridSettingBloc(gridId: settingContext.gridId),child: BlocListener<GridSettingBloc, GridSettingState>(- listenWhen: (previous, current) => previous.selectedAction != current.selectedAction,+ listenWhen: (previous, current) =>+ previous.selectedAction != current.selectedAction,listener: (context, state) {state.selectedAction.foldLeft(null, (_, action) {FlowyOverlay.of(context).remove(identifier());@@ -85,7 +90,8 @@ class GridSettingList extends StatelessWidget {}Widget _renderList() {- final cells = GridSettingAction.values.where((value) => value.enable()).map((action) {+ final cells =+ GridSettingAction.values.where((value) => value.enable()).map((action) {return _SettingItem(action: action);}).toList();@@ -128,10 +134,13 @@ class _SettingItem extends StatelessWidget {height: GridSize.typeOptionItemHeight,child: FlowyButton(isSelected: isSelected,- text: FlowyText.medium(action.title(), fontSize: 12, color: action.enable() ? null : theme.shader4),+ text: FlowyText.medium(action.title(),+ fontSize: 12, color: action.enable() ? null : theme.shader4),hoverColor: theme.hover,onTap: () {- context.read<GridSettingBloc>().add(GridSettingEvent.performAction(action));+ context+ .read<GridSettingBloc>()+ .add(GridSettingEvent.performAction(action));},leftIcon: svgWidget(action.iconName(), color: theme.iconColor),),diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/toolbar/grid_toolbar.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dartsimilarity index 85%rename from frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/toolbar/grid_toolbar.dartrename to frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dartindex 8d25189163..2f332ffe2f 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/toolbar/grid_toolbar.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/grid/grid_service.dart';+import 'package:app_flowy/plugins/grid/application/grid_service.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/extension.dart';@@ -6,8 +6,7 @@ import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/src/layout/sizes.dart';-+import '../../layout/sizes.dart';import 'grid_setting.dart';class GridToolbarContext {@@ -44,7 +43,8 @@ class GridToolbar extends StatelessWidget {class _SettingButton extends StatelessWidget {final GridSettingContext settingContext;- const _SettingButton({required this.settingContext, Key? key}) : super(key: key);+ const _SettingButton({required this.settingContext, Key? key})+ : super(key: key);@overrideWidget build(BuildContext context) {@@ -53,7 +53,8 @@ class _SettingButton extends StatelessWidget {hoverColor: theme.hover,width: 22,onPressed: () => GridSettingList.show(context, settingContext),- icon: svgWidget("grid/setting/setting").padding(horizontal: 3, vertical: 3),+ icon:+ svgWidget("grid/setting/setting").padding(horizontal: 3, vertical: 3),);}}diff --git a/frontend/app_flowy/lib/workspace/application/trash/prelude.dart b/frontend/app_flowy/lib/plugins/trash/application/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/trash/prelude.dartrename to frontend/app_flowy/lib/plugins/trash/application/prelude.dartdiff --git a/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart b/frontend/app_flowy/lib/plugins/trash/application/trash_bloc.dartsimilarity index 82%rename from frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dartrename to frontend/app_flowy/lib/plugins/trash/application/trash_bloc.dartindex a7bcf0588c..0286747fd5 100644--- a/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart+++ b/frontend/app_flowy/lib/plugins/trash/application/trash_bloc.dart@@ -4,20 +4,23 @@ import 'package:flowy_sdk/protobuf/flowy-folder/trash.pb.dart';import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'package:app_flowy/workspace/application/trash/trash_service.dart';-import 'package:app_flowy/workspace/application/trash/trash_listener.dart';+import 'package:app_flowy/plugins/trash/application/trash_service.dart';+import 'package:app_flowy/plugins/trash/application/trash_listener.dart';+part 'trash_bloc.freezed.dart';class TrashBloc extends Bloc<TrashEvent, TrashState> {final TrashService service;final TrashListener listener;- TrashBloc({required this.service, required this.listener}) : super(TrashState.init()) {+ TrashBloc({required this.service, required this.listener})+ : super(TrashState.init()) {on<TrashEvent>((event, emit) async {await event.map(initial: (e) async {listener.start(trashUpdated: _listenTrashUpdated);final result = await service.readTrash();emit(result.fold(- (object) => state.copyWith(objects: object.items, successOrFailure: left(unit)),+ (object) => state.copyWith(+ objects: object.items, successOrFailure: left(unit)),(error) => state.copyWith(successOrFailure: right(error)),));}, didReceiveTrash: (e) async {@@ -26,7 +29,8 @@ class TrashBloc extends Bloc<TrashEvent, TrashState> {final result = await service.putback(e.trashId);await _handleResult(result, emit);}, delete: (e) async {- final result = await service.deleteViews([Tuple2(e.trash.id, e.trash.ty)]);+ final result =+ await service.deleteViews([Tuple2(e.trash.id, e.trash.ty)]);await _handleResult(result, emit);}, deleteAll: (e) async {final result = await service.deleteAll();@@ -38,7 +42,8 @@ class TrashBloc extends Bloc<TrashEvent, TrashState> {});}- Future<void> _handleResult(Either<dynamic, FlowyError> result, Emitter<TrashState> emit) async {+ Future<void> _handleResult(+ Either<dynamic, FlowyError> result, Emitter<TrashState> emit) async {emit(result.fold((l) => state.copyWith(successOrFailure: left(unit)),(error) => state.copyWith(successOrFailure: right(error)),diff --git a/frontend/app_flowy/lib/workspace/application/trash/trash_listener.dart b/frontend/app_flowy/lib/plugins/trash/application/trash_listener.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/trash/trash_listener.dartrename to frontend/app_flowy/lib/plugins/trash/application/trash_listener.dartdiff --git a/frontend/app_flowy/lib/workspace/application/trash/trash_service.dart b/frontend/app_flowy/lib/plugins/trash/application/trash_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/trash/trash_service.dartrename to frontend/app_flowy/lib/plugins/trash/application/trash_service.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/trash/menu.dart b/frontend/app_flowy/lib/plugins/trash/menu.dartsimilarity index 77%rename from frontend/app_flowy/lib/workspace/presentation/plugins/trash/menu.dartrename to frontend/app_flowy/lib/plugins/trash/menu.dartindex ec782db205..e0a6c5ce49 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/trash/menu.dart+++ b/frontend/app_flowy/lib/plugins/trash/menu.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/startup/startup.dart';import 'package:app_flowy/workspace/application/appearance.dart';import 'package:app_flowy/workspace/presentation/home/home_stack.dart';@@ -22,7 +22,8 @@ class MenuTrash extends StatelessWidget {child: InkWell(onTap: () {getIt<MenuSharedState>().latestOpenView = null;- getIt<HomeStackManager>().setPlugin(makePlugin(pluginType: DefaultPlugin.trash.type()));+ getIt<HomeStackManager>()+ .setPlugin(makePlugin(pluginType: DefaultPlugin.trash.type()));},child: _render(context),),@@ -35,8 +36,10 @@ class MenuTrash extends StatelessWidget {value: Provider.of<AppearanceSettingModel>(context, listen: true),child: Selector<AppearanceSettingModel, AppTheme>(selector: (ctx, notifier) => notifier.theme,- builder: (ctx, theme, child) =>- SizedBox(width: 16, height: 16, child: svgWidget("home/trash", color: theme.iconColor)),+ builder: (ctx, theme, child) => SizedBox(+ width: 16,+ height: 16,+ child: svgWidget("home/trash", color: theme.iconColor)),),),const HSpace(6),@@ -44,7 +47,8 @@ class MenuTrash extends StatelessWidget {value: Provider.of<AppearanceSettingModel>(context, listen: true),child: Selector<AppearanceSettingModel, Locale>(selector: (ctx, notifier) => notifier.locale,- builder: (ctx, _, child) => FlowyText.medium(LocaleKeys.trash_text.tr(), fontSize: 12),+ builder: (ctx, _, child) =>+ FlowyText.medium(LocaleKeys.trash_text.tr(), fontSize: 12),),),]);diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/trash/src/sizes.dart b/frontend/app_flowy/lib/plugins/trash/src/sizes.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/trash/src/sizes.dartrename to frontend/app_flowy/lib/plugins/trash/src/sizes.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/trash/src/trash_cell.dart b/frontend/app_flowy/lib/plugins/trash/src/trash_cell.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/trash/src/trash_cell.dartrename to frontend/app_flowy/lib/plugins/trash/src/trash_cell.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/trash/src/trash_header.dart b/frontend/app_flowy/lib/plugins/trash/src/trash_header.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/trash/src/trash_header.dartrename to frontend/app_flowy/lib/plugins/trash/src/trash_header.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/trash/trash.dart b/frontend/app_flowy/lib/plugins/trash/trash.dartsimilarity index 90%rename from frontend/app_flowy/lib/workspace/presentation/plugins/trash/trash.dartrename to frontend/app_flowy/lib/plugins/trash/trash.dartindex e098eddf96..18a2c4aa8e 100644--- a/frontend/app_flowy/lib/workspace/presentation/plugins/trash/trash.dart+++ b/frontend/app_flowy/lib/plugins/trash/trash.dart@@ -2,9 +2,9 @@ export "./src/sizes.dart";export "./src/trash_cell.dart";export "./src/trash_header.dart";-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/trash/trash_bloc.dart';+import 'package:app_flowy/plugins/trash/application/trash_bloc.dart';import 'package:app_flowy/workspace/presentation/home/home_stack.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';@@ -59,7 +59,8 @@ class TrashPlugin extends Plugin {class TrashPluginDisplay extends PluginDisplay {@override- Widget get leftBarItem => FlowyText.medium(LocaleKeys.trash_text.tr(), fontSize: 12);+ Widget get leftBarItem =>+ FlowyText.medium(LocaleKeys.trash_text.tr(), fontSize: 12);@overrideWidget? get rightBarItem => null;@@ -145,20 +146,24 @@ class _TrashPageState extends State<TrashPage> {SizedBox.fromSize(size: const Size(102, 30),child: FlowyButton(- text: FlowyText.medium(LocaleKeys.trash_restoreAll.tr(), fontSize: 12),+ text: FlowyText.medium(LocaleKeys.trash_restoreAll.tr(),+ fontSize: 12),leftIcon: svgWidget('editor/restore', color: theme.iconColor),hoverColor: theme.hover,- onTap: () => context.read<TrashBloc>().add(const TrashEvent.restoreAll()),+ onTap: () =>+ context.read<TrashBloc>().add(const TrashEvent.restoreAll()),),),const HSpace(6),SizedBox.fromSize(size: const Size(102, 30),child: FlowyButton(- text: FlowyText.medium(LocaleKeys.trash_deleteAll.tr(), fontSize: 12),+ text: FlowyText.medium(LocaleKeys.trash_deleteAll.tr(),+ fontSize: 12),leftIcon: svgWidget('editor/delete', color: theme.iconColor),hoverColor: theme.hover,- onTap: () => context.read<TrashBloc>().add(const TrashEvent.deleteAll()),+ onTap: () =>+ context.read<TrashBloc>().add(const TrashEvent.deleteAll()),),)],@@ -186,7 +191,8 @@ class _TrashPageState extends State<TrashPage> {onRestore: () {context.read<TrashBloc>().add(TrashEvent.putback(object.id));},- onDelete: () => context.read<TrashBloc>().add(TrashEvent.delete(object)),+ onDelete: () =>+ context.read<TrashBloc>().add(TrashEvent.delete(object)),),);},diff --git a/frontend/app_flowy/lib/startup/deps_resolver.dart b/frontend/app_flowy/lib/startup/deps_resolver.dartindex e0ab40eea7..6627546c72 100644--- a/frontend/app_flowy/lib/startup/deps_resolver.dart+++ b/frontend/app_flowy/lib/startup/deps_resolver.dart@@ -2,9 +2,8 @@ import 'package:app_flowy/core/network_monitor.dart';import 'package:app_flowy/user/application/user_listener.dart';import 'package:app_flowy/user/application/user_service.dart';import 'package:app_flowy/workspace/application/app/prelude.dart';-import 'package:app_flowy/workspace/application/doc/prelude.dart';-import 'package:app_flowy/workspace/application/grid/prelude.dart';-import 'package:app_flowy/workspace/application/trash/prelude.dart';+import 'package:app_flowy/plugins/doc/application/prelude.dart';+import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'package:app_flowy/workspace/application/user/prelude.dart';import 'package:app_flowy/workspace/application/workspace/prelude.dart';import 'package:app_flowy/workspace/application/edit_pannel/edit_pannel_bloc.dart';@@ -13,6 +12,7 @@ import 'package:app_flowy/workspace/application/menu/prelude.dart';import 'package:app_flowy/workspace/application/settings/prelude.dart';import 'package:app_flowy/user/application/prelude.dart';import 'package:app_flowy/user/presentation/router.dart';+import 'package:app_flowy/plugins/trash/application/prelude.dart';import 'package:app_flowy/workspace/presentation/home/home_stack.dart';import 'package:app_flowy/workspace/presentation/home/menu/menu.dart';import 'package:flowy_sdk/protobuf/flowy-folder/app.pb.dart';@@ -76,7 +76,8 @@ void _resolveHomeDeps(GetIt getIt) {void _resolveFolderDeps(GetIt getIt) {//workspacegetIt.registerFactoryParam<WorkspaceListener, UserProfilePB, String>(- (user, workspaceId) => WorkspaceListener(user: user, workspaceId: workspaceId));+ (user, workspaceId) =>+ WorkspaceListener(user: user, workspaceId: workspaceId));// ViewPBgetIt.registerFactoryParam<ViewListener, ViewPB, void>(@@ -171,7 +172,8 @@ void _resolveGridDeps(GetIt getIt) {),);- getIt.registerFactoryParam<SelectOptionCellBloc, GridSelectOptionCellController, void>(+ getIt.registerFactoryParam<SelectOptionCellBloc,+ GridSelectOptionCellController, void>((context, _) => SelectOptionCellBloc(cellContext: context,),diff --git a/frontend/app_flowy/lib/plugin/plugin.dart b/frontend/app_flowy/lib/startup/plugin/plugin.dartsimilarity index 93%rename from frontend/app_flowy/lib/plugin/plugin.dartrename to frontend/app_flowy/lib/startup/plugin/plugin.dartindex e05a3ad862..a02a8cfb83 100644--- a/frontend/app_flowy/lib/plugin/plugin.dart+++ b/frontend/app_flowy/lib/startup/plugin/plugin.dart@@ -1,6 +1,6 @@library flowy_plugin;-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/startup/startup.dart';import 'package:app_flowy/workspace/presentation/home/home_stack.dart';import 'package:flowy_infra/notifier.dart';@@ -72,7 +72,8 @@ abstract class PluginDisplay<T> with NavigationItem {}void registerPlugin({required PluginBuilder builder, PluginConfig? config}) {- getIt<PluginSandbox>().registerPlugin(builder.pluginType, builder, config: config);+ getIt<PluginSandbox>()+ .registerPlugin(builder.pluginType, builder, config: config);}Plugin makePlugin({required PluginType pluginType, dynamic data}) {diff --git a/frontend/app_flowy/lib/plugin/src/runner.dart b/frontend/app_flowy/lib/startup/plugin/src/runner.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugin/src/runner.dartrename to frontend/app_flowy/lib/startup/plugin/src/runner.dartdiff --git a/frontend/app_flowy/lib/plugin/src/sandbox.dart b/frontend/app_flowy/lib/startup/plugin/src/sandbox.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugin/src/sandbox.dartrename to frontend/app_flowy/lib/startup/plugin/src/sandbox.dartdiff --git a/frontend/app_flowy/lib/startup/startup.dart b/frontend/app_flowy/lib/startup/startup.dartindex 38243afa56..f71df96f23 100644--- a/frontend/app_flowy/lib/startup/startup.dart+++ b/frontend/app_flowy/lib/startup/startup.dart@@ -1,6 +1,6 @@import 'dart:io';-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/startup/tasks/prelude.dart';import 'package:app_flowy/startup/deps_resolver.dart';import 'package:flutter/foundation.dart';diff --git a/frontend/app_flowy/lib/startup/tasks/load_plugin.dart b/frontend/app_flowy/lib/startup/tasks/load_plugin.dartindex d89bc83b37..5eabc18064 100644--- a/frontend/app_flowy/lib/startup/tasks/load_plugin.dart+++ b/frontend/app_flowy/lib/startup/tasks/load_plugin.dart@@ -1,10 +1,10 @@-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/presentation/plugins/blank/blank.dart';-import 'package:app_flowy/workspace/presentation/plugins/board/board.dart';-import 'package:app_flowy/workspace/presentation/plugins/doc/document.dart';-import 'package:app_flowy/workspace/presentation/plugins/grid/grid.dart';-import 'package:app_flowy/workspace/presentation/plugins/trash/trash.dart';+import 'package:app_flowy/plugins/blank/blank.dart';+import 'package:app_flowy/plugins/board/board.dart';+import 'package:app_flowy/plugins/doc/document.dart';+import 'package:app_flowy/plugins/grid/grid.dart';+import 'package:app_flowy/plugins/trash/trash.dart';class PluginLoadTask extends LaunchTask {@overridediff --git a/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart b/frontend/app_flowy/lib/workspace/application/app/app_bloc.dartindex e8d2335168..f86bb5855b 100644--- a/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart+++ b/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart@@ -1,6 +1,6 @@import 'dart:collection';-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/startup/startup.dart';import 'package:app_flowy/workspace/application/app/app_listener.dart';import 'package:app_flowy/workspace/application/app/app_service.dart';@@ -22,7 +22,9 @@ class AppBloc extends Bloc<AppEvent, AppState> {final AppService appService;final AppListener appListener;- AppBloc({required this.app, required this.appService, required this.appListener}) : super(AppState.initial(app)) {+ AppBloc(+ {required this.app, required this.appService, required this.appListener})+ : super(AppState.initial(app)) {on<AppEvent>((event, emit) async {await event.map(initial: (e) async {_startListening();@@ -103,11 +105,13 @@ class AppBloc extends Bloc<AppEvent, AppState> {return super.close();}- Future<void> _didReceiveViewUpdated(List<ViewPB> views, Emitter<AppState> emit) async {+ Future<void> _didReceiveViewUpdated(+ List<ViewPB> views, Emitter<AppState> emit) async {final latestCreatedView = state.latestCreatedView;AppState newState = state.copyWith(views: views);if (latestCreatedView != null) {- final index = views.indexWhere((element) => element.id == latestCreatedView.id);+ final index =+ views.indexWhere((element) => element.id == latestCreatedView.id);if (index == -1) {newState = newState.copyWith(latestCreatedView: null);}@@ -139,7 +143,8 @@ class AppEvent with _$AppEvent {) = CreateView;const factory AppEvent.delete() = Delete;const factory AppEvent.rename(String newName) = Rename;- const factory AppEvent.didReceiveViewUpdated(List<ViewPB> views) = ReceiveViews;+ const factory AppEvent.didReceiveViewUpdated(List<ViewPB> views) =+ ReceiveViews;const factory AppEvent.appDidUpdate(AppPB app) = AppDidUpdate;}@@ -164,11 +169,13 @@ class AppViewDataContext extends ChangeNotifier {final ValueNotifier<List<ViewPB>> _viewsNotifier = ValueNotifier([]);final ValueNotifier<ViewPB?> _selectedViewNotifier = ValueNotifier(null);VoidCallback? _menuSharedStateListener;- ExpandableController expandController = ExpandableController(initialExpanded: false);+ ExpandableController expandController =+ ExpandableController(initialExpanded: false);AppViewDataContext({required this.appId}) {_setLatestView(getIt<MenuSharedState>().latestOpenView);- _menuSharedStateListener = getIt<MenuSharedState>().addLatestViewListener((view) {+ _menuSharedStateListener =+ getIt<MenuSharedState>().addLatestViewListener((view) {_setLatestView(view);});}@@ -206,9 +213,11 @@ class AppViewDataContext extends ChangeNotifier {}}- UnmodifiableListView<ViewPB> get views => UnmodifiableListView(_viewsNotifier.value);+ UnmodifiableListView<ViewPB> get views =>+ UnmodifiableListView(_viewsNotifier.value);- VoidCallback addViewsChangeListener(void Function(UnmodifiableListView<ViewPB>) callback) {+ VoidCallback addViewsChangeListener(+ void Function(UnmodifiableListView<ViewPB>) callback) {listener() {callback(views);}@@ -241,7 +250,8 @@ class AppViewDataContext extends ChangeNotifier {@overridevoid dispose() {if (_menuSharedStateListener != null) {- getIt<MenuSharedState>().removeLatestViewListener(_menuSharedStateListener!);+ getIt<MenuSharedState>()+ .removeLatestViewListener(_menuSharedStateListener!);}super.dispose();}diff --git a/frontend/app_flowy/lib/workspace/application/app/app_service.dart b/frontend/app_flowy/lib/workspace/application/app/app_service.dartindex cc75751e49..695f2f4b6b 100644--- a/frontend/app_flowy/lib/workspace/application/app/app_service.dart+++ b/frontend/app_flowy/lib/workspace/application/app/app_service.dart@@ -6,7 +6,7 @@ import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';import 'package:flowy_sdk/protobuf/flowy-folder/app.pb.dart';import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';class AppService {final String appId;@@ -53,7 +53,8 @@ class AppService {return FolderEventDeleteApp(request).send();}- Future<Either<Unit, FlowyError>> updateApp({required String appId, String? name}) {+ Future<Either<Unit, FlowyError>> updateApp(+ {required String appId, String? name}) {UpdateAppPayloadPB payload = UpdateAppPayloadPB.create()..appId = appId;if (name != null) {diff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart b/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dartindex 21d51f5a93..4b699570e6 100644--- a/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart+++ b/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart@@ -1,5 +1,5 @@import 'dart:async';-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/workspace/application/workspace/workspace_listener.dart';import 'package:app_flowy/workspace/application/workspace/workspace_service.dart';import 'package:dartz/dartz.dart';@@ -40,7 +40,10 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> {moveApp: (_MoveApp value) {if (state.apps.length > value.fromIndex) {final app = state.apps[value.fromIndex];- _workspaceService.moveApp(appId: app.id, fromIndex: value.fromIndex, toIndex: value.toIndex);+ _workspaceService.moveApp(+ appId: app.id,+ fromIndex: value.fromIndex,+ toIndex: value.toIndex);final apps = List<AppPB>.from(state.apps);apps.insert(value.toIndex, apps.removeAt(value.fromIndex));emit(state.copyWith(apps: apps));@@ -56,8 +59,10 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> {return super.close();}- Future<void> _performActionOnCreateApp(_CreateApp event, Emitter<MenuState> emit) async {- final result = await _workspaceService.createApp(name: event.name, desc: event.desc ?? "");+ Future<void> _performActionOnCreateApp(+ _CreateApp event, Emitter<MenuState> emit) async {+ final result = await _workspaceService.createApp(+ name: event.name, desc: event.desc ?? "");result.fold((app) => {},(error) {@@ -93,7 +98,8 @@ class MenuEvent with _$MenuEvent {const factory MenuEvent.openPage(Plugin plugin) = _OpenPage;const factory MenuEvent.createApp(String name, {String? desc}) = _CreateApp;const factory MenuEvent.moveApp(int fromIndex, int toIndex) = _MoveApp;- const factory MenuEvent.didReceiveApps(Either<List<AppPB>, FlowyError> appsOrFail) = _ReceiveApps;+ const factory MenuEvent.didReceiveApps(+ Either<List<AppPB>, FlowyError> appsOrFail) = _ReceiveApps;}@freezeddiff --git a/frontend/app_flowy/lib/workspace/application/view/view_ext.dart b/frontend/app_flowy/lib/workspace/application/view/view_ext.dartindex a54d5ecf40..79a27b64ce 100644--- a/frontend/app_flowy/lib/workspace/application/view/view_ext.dart+++ b/frontend/app_flowy/lib/workspace/application/view/view_ext.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart b/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dartindex abe89c14cb..3aca4dd9ff 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart+++ b/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/workspace/application/home/home_bloc.dart';import 'package:app_flowy/workspace/presentation/widgets/edit_pannel/pannel_animation.dart';import 'package:app_flowy/workspace/presentation/widgets/float_bubble/question_bubble.dart';@@ -21,7 +21,8 @@ import 'menu/menu.dart';class HomeScreen extends StatefulWidget {final UserProfilePB user;final CurrentWorkspaceSettingPB workspaceSetting;- const HomeScreen(this.user, this.workspaceSetting, {Key? key}) : super(key: key);+ const HomeScreen(this.user, this.workspaceSetting, {Key? key})+ : super(key: key);@overrideState<HomeScreen> createState() => _HomeScreenState();@@ -47,7 +48,8 @@ class _HomeScreenState extends State<HomeScreen> {providers: [BlocProvider<HomeBloc>(create: (context) {- return HomeBloc(widget.user, widget.workspaceSetting)..add(const HomeEvent.initial());+ return HomeBloc(widget.user, widget.workspaceSetting)+ ..add(const HomeEvent.initial());},),],@@ -62,9 +64,12 @@ class _HomeScreenState extends State<HomeScreen> {child: BlocBuilder<HomeBloc, HomeState>(buildWhen: (previous, current) => previous != current,builder: (context, state) {- final collapasedNotifier = getIt<HomeStackManager>().collapsedNotifier;+ final collapasedNotifier =+ getIt<HomeStackManager>().collapsedNotifier;collapasedNotifier.addPublishListener((isCollapsed) {- context.read<HomeBloc>().add(HomeEvent.forceCollapse(isCollapsed));+ context+ .read<HomeBloc>()+ .add(HomeEvent.forceCollapse(isCollapsed));});return FlowyContainer(Theme.of(context).colorScheme.surface,@@ -107,7 +112,10 @@ class _HomeScreenState extends State<HomeScreen> {);}- Widget _buildHomeMenu({required HomeLayout layout, required BuildContext context, required HomeState state}) {+ Widget _buildHomeMenu(+ {required HomeLayout layout,+ required BuildContext context,+ required HomeState state}) {final workspaceSetting = state.workspaceSetting;if (initialView == null && workspaceSetting.hasLatestView()) {initialView = workspaceSetting.latestView;@@ -124,7 +132,8 @@ class _HomeScreenState extends State<HomeScreen> {collapsedNotifier: getIt<HomeStackManager>().collapsedNotifier,);- final latestView = workspaceSetting.hasLatestView() ? workspaceSetting.latestView : null;+ final latestView =+ workspaceSetting.hasLatestView() ? workspaceSetting.latestView : null;if (getIt<MenuSharedState>().latestOpenView == null) {/// AppFlowy will open the view that the last time the user opened it. The _buildHomeMenu will get called when AppFlowy's screen resizes. So we only set the latestOpenView when it's null.getIt<MenuSharedState>().latestOpenView = latestView;@@ -133,10 +142,14 @@ class _HomeScreenState extends State<HomeScreen> {return FocusTraversalGroup(child: RepaintBoundary(child: homeMenu));}- Widget _buildEditPannel({required HomeState homeState, required BuildContext context, required HomeLayout layout}) {+ Widget _buildEditPannel(+ {required HomeState homeState,+ required BuildContext context,+ required HomeLayout layout}) {final homeBloc = context.read<HomeBloc>();return BlocBuilder<HomeBloc, HomeState>(- buildWhen: (previous, current) => previous.pannelContext != current.pannelContext,+ buildWhen: (previous, current) =>+ previous.pannelContext != current.pannelContext,builder: (context, state) {return state.pannelContext.fold(() => const SizedBox(),@@ -144,7 +157,8 @@ class _HomeScreenState extends State<HomeScreen> {child: RepaintBoundary(child: EditPannel(pannelContext: pannelContext,- onEndEdit: () => homeBloc.add(const HomeEvent.dismissEditPannel()),+ onEndEdit: () =>+ homeBloc.add(const HomeEvent.dismissEditPannel()),),),),@@ -161,7 +175,9 @@ class _HomeScreenState extends State<HomeScreen> {child: GestureDetector(dragStartBehavior: DragStartBehavior.down,onPanUpdate: ((details) {- context.read<HomeBloc>().add(HomeEvent.editPannelResized(details.delta.dx));+ context+ .read<HomeBloc>()+ .add(HomeEvent.editPannelResized(details.delta.dx));}),behavior: HitTestBehavior.translucent,child: SizedBox(@@ -186,11 +202,21 @@ class _HomeScreenState extends State<HomeScreen> {closeX: -layout.menuWidth,isClosed: !layout.showMenu,)- .positioned(left: 0, top: 0, width: layout.menuWidth, bottom: 0, animate: true)+ .positioned(+ left: 0,+ top: 0,+ width: layout.menuWidth,+ bottom: 0,+ animate: true).animate(layout.animDuration, Curves.easeOut),homeStack.constrained(minWidth: 500)- .positioned(left: layout.homePageLOffset, right: layout.homePageROffset, bottom: 0, top: 0, animate: true)+ .positioned(+ left: layout.homePageLOffset,+ right: layout.homePageROffset,+ bottom: 0,+ top: 0,+ animate: true).animate(layout.animDuration, Curves.easeOut),homeMenuResizer.positioned(left: layout.homePageLOffset - 5),bubble@@ -206,7 +232,8 @@ class _HomeScreenState extends State<HomeScreen> {closeX: layout.editPannelWidth,isClosed: !layout.showEditPannel,)- .positioned(right: 0, top: 0, bottom: 0, width: layout.editPannelWidth),+ .positioned(+ right: 0, top: 0, bottom: 0, width: layout.editPannelWidth),],);}diff --git a/frontend/app_flowy/lib/workspace/presentation/home/home_stack.dart b/frontend/app_flowy/lib/workspace/presentation/home/home_stack.dartindex 07bd99deb1..d58f849cd7 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/home_stack.dart+++ b/frontend/app_flowy/lib/workspace/presentation/home/home_stack.dart@@ -2,6 +2,7 @@ import 'dart:io' show Platform;import 'package:app_flowy/startup/startup.dart';import 'package:app_flowy/workspace/application/home/home_bloc.dart';+import 'package:app_flowy/plugins/blank/blank.dart';import 'package:app_flowy/workspace/presentation/home/toast.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_sdk/log.dart';@@ -9,8 +10,7 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:provider/provider.dart';import 'package:time/time.dart';-import 'package:app_flowy/plugin/plugin.dart';-import 'package:app_flowy/workspace/presentation/plugins/blank/blank.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:app_flowy/workspace/presentation/home/home_sizes.dart';import 'package:app_flowy/workspace/presentation/home/navigation.dart';import 'package:app_flowy/core/frameless_window.dart';@@ -107,7 +107,8 @@ class HomeStackNotifier extends ChangeNotifier {Widget get titleWidget => _plugin.display.leftBarItem;- HomeStackNotifier({Plugin? plugin}) : _plugin = plugin ?? makePlugin(pluginType: DefaultPlugin.blank.type());+ HomeStackNotifier({Plugin? plugin})+ : _plugin = plugin ?? makePlugin(pluginType: DefaultPlugin.blank.type());set plugin(Plugin newPlugin) {if (newPlugin.id == _plugin.id) {@@ -166,7 +167,9 @@ class HomeStackManager {index: getIt<PluginSandbox>().indexOf(notifier.plugin.ty),children: getIt<PluginSandbox>().supportPluginTypes.map((pluginType) {if (pluginType == notifier.plugin.ty) {- return notifier.plugin.display.buildWidget().padding(horizontal: 40, vertical: 28);+ return notifier.plugin.display+ .buildWidget()+ .padding(horizontal: 40, vertical: 28);} else {return const BlankPage();}@@ -190,7 +193,8 @@ class HomeTopBar extends StatelessWidget {crossAxisAlignment: CrossAxisAlignment.center,children: [BlocBuilder<HomeBloc, HomeState>(- buildWhen: ((previous, current) => previous.isMenuCollapsed != current.isMenuCollapsed),+ buildWhen: ((previous, current) =>+ previous.isMenuCollapsed != current.isMenuCollapsed),builder: (context, state) {if (state.isMenuCollapsed && Platform.isMacOS) {return const HSpace(80);@@ -202,7 +206,8 @@ class HomeTopBar extends StatelessWidget {ChangeNotifierProvider.value(value: Provider.of<HomeStackNotifier>(context, listen: false),child: Consumer(- builder: (BuildContext context, HomeStackNotifier notifier, Widget? child) {+ builder: (BuildContext context, HomeStackNotifier notifier,+ Widget? child) {return notifier.plugin.display.rightBarItem ?? const SizedBox();},),diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/add_button.dart b/frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/add_button.dartindex 5b15fecc52..5b06d2c3a2 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/add_button.dart+++ b/frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/add_button.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugin/plugin.dart';+import 'package:app_flowy/startup/plugin/plugin.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -28,7 +28,8 @@ class AddButton extends StatelessWidget {onSelected: onSelected,).show(context);},- icon: svgWidget("home/add", color: theme.iconColor).padding(horizontal: 3, vertical: 3),+ icon: svgWidget("home/add", color: theme.iconColor)+ .padding(horizontal: 3, vertical: 3),);}}diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dart b/frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dartindex 3976598b7b..6732d88925 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dart+++ b/frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dart@@ -2,9 +2,9 @@ export './app/header/header.dart';export './app/menu_app.dart';import 'dart:io' show Platform;+import 'package:app_flowy/plugins/trash/menu.dart';import 'package:app_flowy/workspace/presentation/home/home_sizes.dart';import 'package:app_flowy/workspace/presentation/home/home_stack.dart';-import 'package:app_flowy/workspace/presentation/plugins/trash/menu.dart';import 'package:flowy_infra/notifier.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra/theme.dart';@@ -49,7 +49,8 @@ class HomeMenu extends StatelessWidget {providers: [BlocProvider<MenuBloc>(create: (context) {- final menuBloc = getIt<MenuBloc>(param1: user, param2: workspaceSetting.workspace.id);+ final menuBloc = getIt<MenuBloc>(+ param1: user, param2: workspaceSetting.workspace.id);menuBloc.add(const MenuEvent.initial());return menuBloc;},@@ -106,18 +107,22 @@ class HomeMenu extends StatelessWidget {Widget _renderApps(BuildContext context) {return ExpandableTheme(- data: ExpandableThemeData(useInkWell: true, animationDuration: Durations.medium),+ data: ExpandableThemeData(+ useInkWell: true, animationDuration: Durations.medium),child: Expanded(child: ScrollConfiguration(behavior: const ScrollBehavior().copyWith(scrollbars: false),child: BlocSelector<MenuBloc, MenuState, List<Widget>>(- selector: (state) => state.apps.map((app) => MenuApp(app, key: ValueKey(app.id))).toList(),+ selector: (state) => state.apps+ .map((app) => MenuApp(app, key: ValueKey(app.id)))+ .toList(),builder: (context, menuItems) {return ReorderableListView.builder(itemCount: menuItems.length,buildDefaultDragHandles: false,header: Padding(- padding: EdgeInsets.only(bottom: 20.0 - MenuAppSizes.appVPadding),+ padding:+ EdgeInsets.only(bottom: 20.0 - MenuAppSizes.appVPadding),child: MenuUser(user),),onReorder: (oldIndex, newIndex) {@@ -126,7 +131,9 @@ class HomeMenu extends StatelessWidget {// receive: oldIndex: 0, newIndex: 2// Workaround: if newIndex > oldIndex, we just minus oneint index = newIndex > oldIndex ? newIndex - 1 : newIndex;- context.read<MenuBloc>().add(MenuEvent.moveApp(oldIndex, index));+ context+ .read<MenuBloc>()+ .add(MenuEvent.moveApp(oldIndex, index));},physics: StyledScrollPhysics(),itemBuilder: (BuildContext context, int index) {@@ -134,7 +141,8 @@ class HomeMenu extends StatelessWidget {key: ValueKey(menuItems[index].key),index: index,child: Padding(- padding: EdgeInsets.symmetric(vertical: MenuAppSizes.appVPadding / 2),+ padding: EdgeInsets.symmetric(+ vertical: MenuAppSizes.appVPadding / 2),child: menuItems[index],),);@@ -149,7 +157,8 @@ class HomeMenu extends StatelessWidget {Widget _renderNewAppButton(BuildContext context) {return NewAppButton(- press: (appName) => context.read<MenuBloc>().add(MenuEvent.createApp(appName, desc: "")),+ press: (appName) =>+ context.read<MenuBloc>().add(MenuEvent.createApp(appName, desc: "")),);}}@@ -210,7 +219,9 @@ class MenuTopBar extends StatelessWidget {const Spacer(),FlowyIconButton(width: 28,- onPressed: () => context.read<HomeBloc>().add(const HomeEvent.collapseMenu()),+ onPressed: () => context+ .read<HomeBloc>()+ .add(const HomeEvent.collapseMenu()),iconPadding: const EdgeInsets.fromLTRB(4, 4, 4, 4),icon: svgWidget("home/hide_menu", color: theme.iconColor),)diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_button.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_button.dartindex de8434a1dd..37ce933618 100644--- a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_button.dart+++ b/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_button.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/presentation/plugins/doc/document.dart';+import 'package:app_flowy/plugins/doc/presentation/toolbar/toolbar_icon_button.dart';import 'package:flutter/material.dart';import 'package:flutter_quill/flutter_quill.dart';import 'package:app_flowy/workspace/presentation/widgets/emoji_picker/emoji_picker.dart';@@ -88,7 +88,8 @@ class _EmojiStyleButtonState extends State<FlowyEmojiStyleButton> {_entry = null;setState(() => _isToggled = false);} else {- RenderBox box = emojiButtonKey.currentContext?.findRenderObject() as RenderBox;+ RenderBox box =+ emojiButtonKey.currentContext?.findRenderObject() as RenderBox;Offset position = box.localToGlobal(Offset.zero);// final window = await getWindowInfo();@@ -118,7 +119,8 @@ class _EmojiStyleButtonState extends State<FlowyEmojiStyleButton> {}class BuildEmojiPickerView extends StatefulWidget {- const BuildEmojiPickerView({Key? key, required this.controller, this.offset}) : super(key: key);+ const BuildEmojiPickerView({Key? key, required this.controller, this.offset})+ : super(key: key);final QuillController controller;final Offset? offset;@@ -134,8 +136,11 @@ class _BuildEmojiPickerViewState extends State<BuildEmojiPickerView> {children: [Positioned(//TODO @gaganyadav80: Not sure about the calculated position.- top: widget.offset!.dy - MediaQuery.of(context).size.height / 2.83 - 30,- left: widget.offset!.dx - MediaQuery.of(context).size.width / 3.92 + 40,+ top: widget.offset!.dy -+ MediaQuery.of(context).size.height / 2.83 -+ 30,+ left:+ widget.offset!.dx - MediaQuery.of(context).size.width / 3.92 + 40,child: Material(borderRadius: BorderRadius.circular(8.0),child: SizedBox(@@ -175,6 +180,7 @@ class _BuildEmojiPickerViewState extends State<BuildEmojiPickerView> {extentOffset: baseOffset + emoji.emoji.length,);- widget.controller.replaceText(baseOffset, replaceLen, emoji.emoji, selection);+ widget.controller+ .replaceText(baseOffset, replaceLen, emoji.emoji, selection);}}diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/widgets/left_bar_item.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/left_bar_item.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/plugins/widgets/left_bar_item.dartrename to frontend/app_flowy/lib/workspace/presentation/widgets/left_bar_item.dartdiff --git a/frontend/app_flowy/pubspec.lock b/frontend/app_flowy/pubspec.lockindex 1c8bdf6211..c8ef9fe47a 100644--- a/frontend/app_flowy/pubspec.lock+++ b/frontend/app_flowy/pubspec.lock@@ -22,6 +22,13 @@ packages:url: "https://pub.dartlang.org"source: hostedversion: "2.0.3"+ appflowy_board:+ dependency: "direct main"+ description:+ path: "packages/appflowy_board"+ relative: true+ source: path+ version: "0.0.4"args:dependency: transitivedescription: