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: some code organization and date picker ui improv (#4148)
Richard Shiue781fbf1b30c4
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/date_picker/mobile_date_picker_screen.dartindex 5efdf70bd9..e5c1cf206d 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart@@ -72,23 +72,23 @@ class _MobileDateCellEditScreenState extends State<MobileDateCellEditScreen> {return DraggableScrollableSheet(expand: false,snap: true,- initialChildSize: 0.6,- minChildSize: 0.6,+ initialChildSize: 0.7,+ minChildSize: 0.4,+ snapSizes: const [0.4, 0.7, 1.0],builder: (_, controller) => Material(- child: ColoredBox(- color: Theme.of(context).colorScheme.surface,- child: Column(- children: [- const DragHandler(),- _buildHeader(),- Expanded(- child: SingleChildScrollView(- controller: controller,- child: _buildBody(),- ),- ),- ],- ),+ color: Theme.of(context).colorScheme.secondaryContainer,+ child: ListView(+ controller: controller,+ children: [+ ColoredBox(+ color: Theme.of(context).colorScheme.surface,+ child: const Center(child: DragHandler()),+ ),+ _buildHeader(),+ Expanded(+ child: _buildBody(),+ ),+ ],),),);@@ -127,7 +127,8 @@ class _MobileDateCellEditScreenState extends State<MobileDateCellEditScreen> {Widget _buildHeader() {const iconWidth = 30.0;const height = 44.0;- return Padding(+ return Container(+ color: Theme.of(context).colorScheme.surface,padding: const EdgeInsets.symmetric(horizontal: 8.0),child: Stack(children: [@@ -200,10 +201,7 @@ class _ColoredDivider extends StatelessWidget {@overrideWidget build(BuildContext context) {- return VSpace(- 20.0,- color: Theme.of(context).colorScheme.secondaryContainer,- );+ return const VSpace(20.0);}}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/bottom_sheet_create_field.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/bottom_sheet_create_field.dartindex c4de614318..33b43d4dc4 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/bottom_sheet_create_field.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/bottom_sheet_create_field.dart@@ -1,14 +1,15 @@import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/mobile_create_field_screen.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/mobile_edit_field_screen.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/widgets/_field_options.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/widgets/_field_options_eidtor.dart';+import 'package:appflowy/mobile/presentation/database/field/mobile_field_type_grid.dart';+import 'package:appflowy/mobile/presentation/database/field/mobile_field_type_option_editor.dart';import 'package:appflowy/mobile/presentation/database/field/quick_edit_field_bottom_sheet.dart';import 'package:appflowy/plugins/database_view/application/field/field_info.dart';import 'package:appflowy/plugins/database_view/application/field/field_service.dart';import 'package:flutter/material.dart';import 'package:go_router/go_router.dart';+import 'mobile_create_field_screen.dart';+import 'mobile_edit_field_screen.dart';+void showCreateFieldBottomSheet(BuildContext context, String viewId) {showMobileBottomSheet(context,diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/edit_select_field.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/edit_select_field.dartdeleted file mode 100644index 33e6b05301..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/edit_select_field.dart+++ /dev/null@@ -1,49 +0,0 @@-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flutter/material.dart';--// include single select and multiple select-class EditSelectField extends StatefulWidget {- const EditSelectField({super.key});-- @override- State<EditSelectField> createState() => _EditSelectFieldState();-}--class _EditSelectFieldState extends State<EditSelectField> {- @override- Widget build(BuildContext context) {- return Column(- children: [- _SearchField(- hintText: LocaleKeys.grid_selectOption_searchOrCreateOption.tr(),- ),- ],- );- }-}--class _SearchField extends StatelessWidget {- const _SearchField({- required this.hintText,- });-- final String hintText;-- @override- Widget build(BuildContext context) {- return Padding(- padding: const EdgeInsets.symmetric(- horizontal: 16,- vertical: 12,- ),- child: SizedBox(- height: 44, // the height is fixed.- child: FlowyTextField(- hintText: hintText,- ),- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_create_field_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_create_field_screen.dartsimilarity index 95%rename from frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_create_field_screen.dartrename to frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_create_field_screen.dartindex bf174d51c0..ee6bc35865 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_create_field_screen.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_create_field_screen.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/base/app_bar_actions.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/widgets/_field_options_eidtor.dart';+import 'package:appflowy/mobile/presentation/database/field/mobile_field_type_option_editor.dart';import 'package:appflowy/util/field_type_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';import 'package:easy_localization/easy_localization.dart';diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_edit_field_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dartsimilarity index 97%rename from frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_edit_field_screen.dartrename to frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dartindex c35cea161d..4be609bea7 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_edit_field_screen.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/base/app_bar_actions.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/widgets/_field_options_eidtor.dart';+import 'package:appflowy/mobile/presentation/database/field/mobile_field_type_option_editor.dart';import 'package:appflowy/plugins/database_view/application/field/field_backend_service.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:easy_localization/easy_localization.dart';diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_grid.dartsimilarity index 100%rename from frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options.dartrename to frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_grid.dartdiff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options_eidtor.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_option_editor.dartsimilarity index 99%rename from frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options_eidtor.dartrename to frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_option_editor.dartindex 23c8cea91a..f0329baf82 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options_eidtor.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_option_editor.dart@@ -5,7 +5,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/base/option_color_list.dart';import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/widgets/_field_options.dart';import 'package:appflowy/mobile/presentation/database/card/card_detail/widgets/widgets.dart';import 'package:appflowy/mobile/presentation/widgets/widgets.dart';import 'package:appflowy/plugins/database_view/application/field/field_service.dart';@@ -23,6 +22,8 @@ import 'package:flutter/material.dart';import 'package:go_router/go_router.dart';import 'package:protobuf/protobuf.dart';+import 'mobile_field_type_grid.dart';+enum FieldOptionMode {add,edit,diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dartindex 757810d74c..99925c9fc9 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dart@@ -12,10 +12,10 @@ import 'package:appflowy/plugins/database_view/board/presentation/widgets/board_import 'package:appflowy/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dart';import 'package:appflowy/plugins/database_view/tab_bar/tab_bar_view.dart';import 'package:appflowy/plugins/database_view/widgets/row/row_detail.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_board/appflowy_board.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/hover.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dartindex 51a907ecbd..aa15aac471 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dart@@ -2,7 +2,7 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/database/mobile_calendar_events_screen.dart';import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';-import 'package:appflowy/util/platform_extension.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:calendar_view/calendar_view.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/size.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_event_card.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_event_card.dartindex 271d89baca..aa3b534dbb 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_event_card.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_event_card.dart@@ -10,8 +10,8 @@ import 'package:appflowy/plugins/database_view/widgets/card/cells/number_card_ceimport 'package:appflowy/plugins/database_view/widgets/card/cells/url_card_cell.dart';import 'package:appflowy/plugins/database_view/widgets/row/cells/select_option_cell/extension.dart';import 'package:appflowy/plugins/database_view/widgets/row/cells/text_cell/text_cell_bloc.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/size.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dartindex b0481abe57..fcbbe1a1c6 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart@@ -10,9 +10,9 @@ import 'package:appflowy/plugins/database_view/calendar/application/calendar_bloimport 'package:appflowy/plugins/database_view/calendar/application/unschedule_event_bloc.dart';import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database_view/tab_bar/tab_bar_view.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/calendar_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:calendar_view/calendar_view.dart';import 'package:easy_localization/easy_localization.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/tab_bar/tab_bar_view.dart b/frontend/appflowy_flutter/lib/plugins/database_view/tab_bar/tab_bar_view.dartindex 97fbb5df28..0ca6fc64cf 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/tab_bar/tab_bar_view.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/tab_bar/tab_bar_view.dart@@ -5,11 +5,11 @@ import 'package:appflowy/plugins/database_view/tab_bar/mobile/mobile_tab_bar_heaimport 'package:appflowy/plugins/database_view/widgets/share_button.dart';import 'package:appflowy/plugins/util.dart';import 'package:appflowy/startup/plugin/plugin.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:appflowy/workspace/presentation/widgets/tab_bar_item.dart';import 'package:appflowy/workspace/presentation/widgets/view_title_bar.dart';import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/card.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/card.dartindex 99fce5c349..7162ffe0b5 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/card.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/card.dart@@ -3,8 +3,8 @@ import 'package:appflowy/mobile/presentation/database/card/card.dart';import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';import 'package:appflowy/plugins/database_view/grid/presentation/widgets/row/action.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/hover.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/card_cell_builder.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/card_cell_builder.dartindex 5f42e8abb7..f2c6c1c21d 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/card_cell_builder.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/card_cell_builder.dart@@ -1,8 +1,8 @@import 'package:appflowy/mobile/presentation/database/card/card_content/card_cells/card_cells.dart';import 'package:appflowy/plugins/database_view/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database_view/widgets/card/cells/timestamp_card_cell.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';import '../../application/cell/cell_service.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cell_builder.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cell_builder.dartindex c00f5578e0..0da4af1b0a 100755--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cell_builder.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cell_builder.dart@@ -5,8 +5,8 @@ import 'package:appflowy/mobile/presentation/database/card/card_detail/cells/urlimport 'package:appflowy/mobile/presentation/database/card/row/cells/cells.dart';import 'package:appflowy/mobile/presentation/database/card/row/cells/mobile_checklist_cell.dart';import 'package:appflowy/plugins/database_view/application/cell/cell_controller_builder.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';import 'package:flutter/widgets.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_layout_selector.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_layout_selector.dartindex bf555dbe31..a1a2811104 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_layout_selector.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_layout_selector.dart@@ -2,8 +2,8 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/mobile/presentation/setting/widgets/mobile_setting_item_widget.dart';import 'package:appflowy/plugins/database_view/application/layout/layout_bloc.dart';import 'package:appflowy/plugins/database_view/widgets/database_layout_ext.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/setting_entities.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_setting_action.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_setting_action.dartindex e8578fbc92..7281283fc0 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_setting_action.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_setting_action.dart@@ -10,8 +10,8 @@ import 'package:appflowy/plugins/database_view/widgets/group/database_group.dartimport 'package:appflowy/plugins/database_view/widgets/setting/mobile_calendar_settings.dart';import 'package:appflowy/plugins/database_view/widgets/setting/setting_button.dart';import 'package:appflowy/plugins/database_view/widgets/setting/setting_property_list.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/setting_entities.pbenum.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_settings_list.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_settings_list.dartindex 01638b531b..51752a277b 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_settings_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_settings_list.dart@@ -1,8 +1,8 @@import 'package:appflowy/plugins/database_view/application/database_controller.dart';import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database_view/widgets/setting/database_setting_action.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/setting_entities.pbenum.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';import 'package:flowy_infra_ui/widget/spacing.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_property_list.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_property_list.dartindex b9937fd85b..8c96377f78 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_property_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_property_list.dart@@ -9,10 +9,10 @@ import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.daimport 'package:appflowy/plugins/database_view/grid/presentation/widgets/header/field_editor.dart';import 'package:appflowy/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dart';import 'package:appflowy/plugins/database_view/widgets/setting/field_visibility_extension.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';import 'package:appflowy/workspace/presentation/widgets/toggle/toggle_style.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:collection/collection.dart';import 'package:flowy_infra/theme_extension.dart';diff --git a/frontend/appflowy_flutter/lib/startup/deps_resolver.dart b/frontend/appflowy_flutter/lib/startup/deps_resolver.dartindex 7f72902be9..773d024298 100644--- a/frontend/appflowy_flutter/lib/startup/deps_resolver.dart+++ b/frontend/appflowy_flutter/lib/startup/deps_resolver.dart@@ -16,7 +16,6 @@ import 'package:appflowy/user/application/reminder/reminder_bloc.dart';import 'package:appflowy/user/application/user_listener.dart';import 'package:appflowy/user/application/user_service.dart';import 'package:appflowy/user/presentation/router.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy/workspace/application/edit_panel/edit_panel_bloc.dart';import 'package:appflowy/workspace/application/favorite/favorite_bloc.dart';import 'package:appflowy/workspace/application/notifications/notification_action_bloc.dart';@@ -31,6 +30,7 @@ import 'package:appflowy/workspace/application/workspace/prelude.dart';import 'package:appflowy/workspace/presentation/home/menu/menu_shared_state.dart';import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra/file_picker/file_picker_impl.dart';import 'package:flowy_infra/file_picker/file_picker_service.dart';import 'package:fluttertoast/fluttertoast.dart';diff --git a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dartindex 291e7e2902..66df5123c1 100644--- a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart@@ -1,7 +1,7 @@import 'package:appflowy/mobile/presentation/database/board/mobile_board_screen.dart';import 'package:appflowy/mobile/presentation/database/card/card.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/mobile_create_field_screen.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/mobile_edit_field_screen.dart';+import 'package:appflowy/mobile/presentation/database/field/mobile_create_field_screen.dart';+import 'package:appflowy/mobile/presentation/database/field/mobile_edit_field_screen.dart';import 'package:appflowy/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart';import 'package:appflowy/mobile/presentation/database/mobile_calendar_events_screen.dart';import 'package:appflowy/mobile/presentation/database/mobile_calendar_screen.dart';@@ -21,9 +21,9 @@ import 'package:appflowy/startup/startup.dart';import 'package:appflowy/startup/tasks/app_widget.dart';import 'package:appflowy/user/application/auth/auth_service.dart';import 'package:appflowy/user/presentation/presentation.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy/workspace/presentation/home/desktop_home_screen.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra/time/duration.dart';import 'package:flutter/material.dart';import 'package:go_router/go_router.dart';diff --git a/frontend/appflowy_flutter/lib/user/presentation/router.dart b/frontend/appflowy_flutter/lib/user/presentation/router.dartindex e3e27aa952..0d07ba678d 100644--- a/frontend/appflowy_flutter/lib/user/presentation/router.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/router.dart@@ -7,8 +7,8 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'show UserProfilePB;import 'package:appflowy_backend/protobuf/flowy-folder2/protobuf.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:go_router/go_router.dart';class AuthRouter {diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/sign_in_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/sign_in_screen.dartindex 6914bd2447..5692149bd1 100644--- a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/sign_in_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/sign_in_screen.dart@@ -1,9 +1,9 @@import 'package:appflowy/startup/startup.dart';import 'package:appflowy/user/application/sign_in_bloc.dart';import 'package:appflowy/user/presentation/router.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy/user/presentation/screens/sign_in_screen/desktop_sign_in_screen.dart';import 'package:appflowy/user/presentation/screens/sign_in_screen/mobile_sign_in_screen.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_anonymous_button.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_anonymous_button.dartindex d6c79ce390..7c3f289581 100644--- a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_anonymous_button.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_anonymous_button.dart@@ -2,7 +2,7 @@ import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/startup/startup.dart';import 'package:appflowy/user/application/historical_user_bloc.dart';import 'package:appflowy/user/application/sign_in_bloc.dart';-import 'package:appflowy/util/platform_extension.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/third_party_sign_in_buttons.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/third_party_sign_in_buttons.dartindex 4269b5a7ab..002f43bf8d 100644--- a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/third_party_sign_in_buttons.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/third_party_sign_in_buttons.dart@@ -2,8 +2,8 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/user/application/sign_in_bloc.dart';import 'package:appflowy/user/presentation/presentation.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy/workspace/application/settings/appearance/appearance_cubit.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/skip_log_in_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/skip_log_in_screen.dartindex 078b38581c..7bc847e289 100644--- a/frontend/appflowy_flutter/lib/user/presentation/screens/skip_log_in_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/skip_log_in_screen.dart@@ -7,9 +7,9 @@ import 'package:appflowy/user/application/auth/auth_service.dart';import 'package:appflowy/user/application/historical_user_bloc.dart';import 'package:appflowy/user/presentation/router.dart';import 'package:appflowy/user/presentation/widgets/widgets.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy/workspace/application/settings/appearance/appearance_cubit.dart';import 'package:appflowy/workspace/presentation/settings/widgets/settings_language_view.dart';+import 'package:appflowy_editor/appflowy_editor.dart' hide Log;import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/language.dart';diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/splash_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/splash_screen.dartindex b5b496cdfd..b304739f85 100644--- a/frontend/appflowy_flutter/lib/user/presentation/screens/splash_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/splash_screen.dart@@ -7,9 +7,9 @@ import 'package:appflowy/user/domain/auth_state.dart';import 'package:appflowy/user/presentation/helpers/helpers.dart';import 'package:appflowy/user/presentation/router.dart';import 'package:appflowy/user/presentation/screens/screens.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/log.dart';+import 'package:appflowy_editor/appflowy_editor.dart' hide Log;import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:go_router/go_router.dart';diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/workspace_start_screen/workspace_start_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/workspace_start_screen/workspace_start_screen.dartindex c573bcb025..8bc8c9f275 100644--- a/frontend/appflowy_flutter/lib/user/presentation/screens/workspace_start_screen/workspace_start_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/workspace_start_screen/workspace_start_screen.dart@@ -1,9 +1,9 @@import 'package:appflowy/startup/startup.dart';import 'package:appflowy/user/presentation/screens/workspace_start_screen/desktop_workspace_start_screen.dart';import 'package:appflowy/user/presentation/screens/workspace_start_screen/mobile_workspace_start_screen.dart';-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy/workspace/application/workspace/workspace_bloc.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/util/platform_extension.dart b/frontend/appflowy_flutter/lib/util/platform_extension.dartdeleted file mode 100644index de0c22d98b..0000000000--- a/frontend/appflowy_flutter/lib/util/platform_extension.dart+++ /dev/null@@ -1,11 +0,0 @@-import 'dart:io';-import 'package:flutter/foundation.dart';--extension PlatformExtension on Platform {- static bool get isMobile {- if (kIsWeb) {- return false;- }- return Platform.isAndroid || Platform.isIOS;- }-}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/draggable_view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/draggable_view_item.dartindex a053a4458d..22a176a528 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/draggable_view_item.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/draggable_view_item.dart@@ -1,9 +1,9 @@-import 'package:appflowy/util/platform_extension.dart';import 'package:appflowy/workspace/application/view/view_bloc.dart';import 'package:appflowy/workspace/application/view/view_ext.dart';import 'package:appflowy/workspace/presentation/widgets/draggable_item/draggable_item.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart' hide Log;import 'package:flutter/material.dart';import 'package:flutter/services.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/flowy_tab.dart b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/flowy_tab.dartindex 4d70a6f693..9d2b09fb83 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/flowy_tab.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/flowy_tab.dart@@ -1,4 +1,4 @@-import 'package:appflowy/util/platform_extension.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/draggable_item/draggable_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/draggable_item/draggable_item.dartindex 3935cb5378..c3831f4950 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/draggable_item/draggable_item.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/draggable_item/draggable_item.dart@@ -1,4 +1,4 @@-import 'package:appflowy/util/platform_extension.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';class DraggableItem<T extends Object> extends StatefulWidget {