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
Feat/view map database (#1885)
Nathan.fooo61fd608200e0
diff --git a/.dockerignore b/.dockerignoreindex 18f578ca48..6e95d35269 100644--- a/.dockerignore+++ b/.dockerignore@@ -1,4 +1,4 @@-frontend/app_flowy/+frontend/appflowy_flutter/frontend/scripts/frontend/rust-lib/targetshared-lib/target/\ No newline at end of filediff --git a/.github/workflows/appflowy_editor_test.yml b/.github/workflows/appflowy_editor_test.ymlindex d298140594..7bddb948e7 100644--- a/.github/workflows/appflowy_editor_test.yml+++ b/.github/workflows/appflowy_editor_test.yml@@ -11,7 +11,7 @@ on:- "main"- "release/*"paths:- - "frontend/app_flowy/packages/appflowy_editor/**"+ - "frontend/appflowy_flutter/packages/appflowy_editor/**"env:CARGO_TERM_COLOR: always@@ -35,7 +35,7 @@ jobs:cache: true- name: Run FlowyEditor tests- working-directory: frontend/app_flowy/packages/appflowy_editor+ working-directory: frontend/appflowy_flutter/packages/appflowy_editorrun: |flutter pub getflutter format --set-exit-if-changed .diff --git a/.github/workflows/flutter_ci.yaml b/.github/workflows/flutter_ci.yamlindex cb49720cee..fafb78558e 100644--- a/.github/workflows/flutter_ci.yaml+++ b/.github/workflows/flutter_ci.yaml@@ -98,7 +98,7 @@ jobs:cargo make --profile ${{ matrix.flutter_profile }} appflowy-dev- name: Flutter Analyzer- working-directory: frontend/app_flowy+ working-directory: frontend/appflowy_flutterrun: flutter analyze- name: Run Flutter unit testsdiff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.ymlindex b56081db20..e3217c56c4 100644--- a/.github/workflows/integration_test.yml+++ b/.github/workflows/integration_test.yml@@ -6,14 +6,14 @@ on:- "main"- "release/*"paths:- - "frontend/app_flowy/**"+ - "frontend/appflowy_flutter/**"pull_request:branches:- "main"- "release/*"paths:- - "frontend/app_flowy/**"+ - "frontend/appflowy_flutter/**"env:CARGO_TERM_COLOR: always@@ -100,14 +100,14 @@ jobs:shell: bash- name: Flutter Code Generation- working-directory: frontend/app_flowy+ working-directory: frontend/appflowy_flutterrun: |flutter packages pub getflutter packages pub run easy_localization:generate -f keys -o locale_keys.g.dart -S assets/translations -s en.jsonflutter packages pub run build_runner build --delete-conflicting-outputs- name: Run AppFlowy tests- working-directory: frontend/app_flowy+ working-directory: frontend/appflowy_flutterrun: |if [ "$RUNNER_OS" == "Linux" ]; thenflutter test integration_test -d Linux --coveragediff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex 54ffe1e198..2ecf0dab86 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -39,7 +39,7 @@ jobs:name: ${{ matrix.job.target }} (${{ matrix.job.os }})needs: create-releaseenv:- WINDOWS_APP_RELEASE_PATH: frontend\app_flowy\product\${{ github.ref_name }}\windows+ WINDOWS_APP_RELEASE_PATH: frontend\appflowy_flutter\product\${{ github.ref_name }}\windowsWINDOWS_ZIP_NAME: AppFlowy_${{ github.ref_name }}_windows-x86_64.zipWINDOWS_INSTALLER_NAME: AppFlowy_${{ github.ref_name }}_windows-x86_64runs-on: ${{ matrix.job.os }}@@ -129,7 +129,7 @@ jobs:runs-on: ${{ matrix.job.os }}needs: create-releaseenv:- MACOS_APP_RELEASE_PATH: frontend/app_flowy/product/${{ github.ref_name }}/macos/Release+ MACOS_APP_RELEASE_PATH: frontend/appflowy_flutter/product/${{ github.ref_name }}/macos/ReleaseMACOS_X86_ZIP_NAME: AppFlowy_${{ github.ref_name }}_macos-x86_64.zipMACOS_DMG_NAME: AppFlowy_${{ github.ref_name }}_macos-x86_64strategy:@@ -217,7 +217,7 @@ jobs:runs-on: ${{ matrix.job.os }}needs: create-releaseenv:- LINUX_APP_RELEASE_PATH: frontend/app_flowy/product/${{ github.ref_name }}/linux/Release+ LINUX_APP_RELEASE_PATH: frontend/appflowy_flutter/product/${{ github.ref_name }}/linux/ReleaseLINUX_ZIP_NAME: AppFlowy_${{ matrix.job.target }}_${{ matrix.job.os }}.tar.gzLINUX_PACKAGE_NAME: AppFlowy_${{ github.ref_name }}_${{ matrix.job.os }}.deb# PKG_CONFIG_SYSROOT_DIR: /diff --git a/.github/workflows/translation_notify.yml b/.github/workflows/translation_notify.ymlindex 00f1576b6f..f5a53c8f55 100644--- a/.github/workflows/translation_notify.yml+++ b/.github/workflows/translation_notify.yml@@ -3,7 +3,7 @@ on:push:branches: [ main ]paths:- - "frontend/app_flowy/assets/translations/en.json"+ - "frontend/appflowy_flutter/assets/translations/en.json"jobs:Discord-Notify:diff --git a/.gitignore b/.gitignoreindex 4c4b010a7c..5eeae980bc 100644--- a/.gitignore+++ b/.gitignore@@ -29,7 +29,7 @@ node_modules# Commit the highest level pubspec.lock, but ignore the otherspubspec.lock-!frontend/app_flowy/pubspec.lock+!frontend/appflowy_flutter/pubspec.lock# ignore tool used for commit linting.githooks/gitlintdiff --git a/.run/ProtoBuf_Gen.run.xml b/.run/ProtoBuf_Gen.run.xmlindex ab3331fd3e..13d9202183 100644--- a/.run/ProtoBuf_Gen.run.xml+++ b/.run/ProtoBuf_Gen.run.xml@@ -10,7 +10,7 @@<env name="flowy_tool" value="${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/scripts/flowy-tool/Cargo.toml" /><env name="rust_lib" value="${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/rust-lib/" /><env name="shared_lib" value="${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/../shared_lib" />- <env name="flutter_lib" value="${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/packages" />+ <env name="flutter_lib" value="${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/packages" /><env name="derive_meta" value="${shared_lib}/flowy-derive/src/derive_cache/derive_cache.rs" /><env name="flutter_package_lib" value="${flutter_lib}/flowy_sdk/lib" /></envs>diff --git a/.run/dart-event.run.xml b/.run/dart-event.run.xmlindex 911316db88..c64ee9bf57 100644--- a/.run/dart-event.run.xml+++ b/.run/dart-event.run.xml@@ -1,6 +1,6 @@<component name="ProjectRunConfigurationManager"><configuration default="false" name="dart-event" type="CargoCommandRunConfiguration" factoryName="Cargo Command">- <option name="command" value="run --manifest-path $PROJECT_DIR$/scripts/flowy-tool/Cargo.toml -- dart-event --rust_source=$PROJECT_DIR$/rust-lib/ --output=$PROJECT_DIR$/app_flowy/packages/flowy_sdk/lib/dispatch/dart_event.dart" />+ <option name="command" value="run --manifest-path $PROJECT_DIR$/scripts/flowy-tool/Cargo.toml -- dart-event --rust_source=$PROJECT_DIR$/rust-lib/ --output=$PROJECT_DIR$/appflowy_flutter/packages/flowy_sdk/lib/dispatch/dart_event.dart" /><option name="workingDirectory" value="file://$PROJECT_DIR$" /><option name="channel" value="DEFAULT" /><option name="allFeatures" value="false" />diff --git a/frontend/.vscode/launch.json b/frontend/.vscode/launch.jsonindex 8abfd479b2..0501207968 100644--- a/frontend/.vscode/launch.json+++ b/frontend/.vscode/launch.json@@ -15,7 +15,7 @@"RUST_LOG": "trace",// "RUST_LOG": "debug"},- "cwd": "${workspaceRoot}/app_flowy"+ "cwd": "${workspaceRoot}/appflowy_flutter"},{// This task only builds the Dart code of AppFlowy.@@ -26,7 +26,7 @@"env": {"RUST_LOG": "debug"},- "cwd": "${workspaceRoot}/app_flowy"+ "cwd": "${workspaceRoot}/appflowy_flutter"},{// This task builds will:@@ -41,7 +41,7 @@"env": {"RUST_LOG": "trace"},- "cwd": "${workspaceRoot}/app_flowy"+ "cwd": "${workspaceRoot}/appflowy_flutter"},{"name": "AF-desktop: Debug Rust",@@ -55,7 +55,7 @@// "program": "./lib/main.dart",// "type": "dart",// "flutterMode": "profile",- // "cwd": "${workspaceRoot}/app_flowy"+ // "cwd": "${workspaceRoot}/appflowy_flutter"// },{// This task builds the Rust and Dart code of AppFlowy for android.@@ -67,7 +67,7 @@"env": {"RUST_LOG": "info"},- "cwd": "${workspaceRoot}/app_flowy"+ "cwd": "${workspaceRoot}/appflowy_flutter"},{// This task builds will:@@ -82,7 +82,7 @@"env": {"RUST_LOG": "info"},- "cwd": "${workspaceRoot}/app_flowy"+ "cwd": "${workspaceRoot}/appflowy_flutter"},{// https://tauri.app/v1/guides/debugging/vs-codediff --git a/frontend/.vscode/tasks.json b/frontend/.vscode/tasks.jsonindex e69ebd96c2..5e241241f1 100644--- a/frontend/.vscode/tasks.json+++ b/frontend/.vscode/tasks.json@@ -96,7 +96,7 @@"type": "shell","command": "flutter clean","options": {- "cwd": "${workspaceFolder}/app_flowy"+ "cwd": "${workspaceFolder}/appflowy_flutter"}},{@@ -104,7 +104,7 @@"type": "shell","command": "flutter pub get","options": {- "cwd": "${workspaceFolder}/app_flowy"+ "cwd": "${workspaceFolder}/appflowy_flutter"}},{@@ -112,7 +112,7 @@"type": "shell","command": "flutter packages pub get","options": {- "cwd": "${workspaceFolder}/app_flowy"+ "cwd": "${workspaceFolder}/appflowy_flutter"}},{@@ -120,7 +120,7 @@"type": "shell","command": "flutter pub run build_runner build --delete-conflicting-outputs","options": {- "cwd": "${workspaceFolder}/app_flowy"+ "cwd": "${workspaceFolder}/appflowy_flutter"}},{@@ -163,7 +163,7 @@],"group": "build","problemMatcher": [],- "detail": "app_flowy"+ "detail": "appflowy_flutter"},{"label": "AF: Tauri UI Dev",diff --git a/frontend/Makefile.toml b/frontend/Makefile.tomlindex 09d8bc86ba..94ec0b3648 100644--- a/frontend/Makefile.toml+++ b/frontend/Makefile.toml@@ -43,7 +43,7 @@ PRODUCT_NAME = "AppFlowy"CRATE_TYPE = "staticlib"LIB_EXT = "a"APP_ENVIRONMENT = "local"-FLUTTER_FLOWY_SDK_PATH = "app_flowy/packages/appflowy_backend"+FLUTTER_FLOWY_SDK_PATH = "appflowy_flutter/packages/appflowy_backend"TAURI_BACKEND_SERVICE_PATH = "appflowy_tauri/src/services/backend"# Test default configTEST_CRATE_TYPE = "cdylib"diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/grid_header_listener.dart b/frontend/app_flowy/lib/plugins/grid/application/field/grid_header_listener.dartdeleted file mode 100644index e69de29bb2..0000000000diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/grid_listener.dart b/frontend/app_flowy/lib/plugins/grid/application/field/grid_listener.dartdeleted file mode 100644index 6384af8d5e..0000000000--- a/frontend/app_flowy/lib/plugins/grid/application/field/grid_listener.dart+++ /dev/null@@ -1,47 +0,0 @@-import 'package:app_flowy/core/grid_notification.dart';-import 'package:dartz/dartz.dart';-import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database/notification.pb.dart';-import 'package:flowy_infra/notifier.dart';-import 'dart:async';-import 'dart:typed_data';-import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';--typedef UpdateFieldNotifiedValue = Either<DatabaseFieldChangesetPB, FlowyError>;--class DatabaseFieldsListener {- final String databaseId;- PublishNotifier<UpdateFieldNotifiedValue>? updateFieldsNotifier =- PublishNotifier();- DatabaseNotificationListener? _listener;- DatabaseFieldsListener({required this.databaseId});-- void start(- {required void Function(UpdateFieldNotifiedValue) onFieldsChanged}) {- updateFieldsNotifier?.addPublishListener(onFieldsChanged);- _listener = DatabaseNotificationListener(- objectId: databaseId,- handler: _handler,- );- }-- void _handler(DatabaseNotification ty, Either<Uint8List, FlowyError> result) {- switch (ty) {- case DatabaseNotification.DidUpdateFields:- result.fold(- (payload) => updateFieldsNotifier?.value =- left(DatabaseFieldChangesetPB.fromBuffer(payload)),- (error) => updateFieldsNotifier?.value = right(error),- );- break;- default:- break;- }- }-- Future<void> stop() async {- await _listener?.stop();- updateFieldsNotifier?.dispose();- updateFieldsNotifier = null;- }-}diff --git a/frontend/app_flowy/lib/plugins/grid/application/prelude.dart b/frontend/app_flowy/lib/plugins/grid/application/prelude.dartdeleted file mode 100644index 3affd4f7ff..0000000000--- a/frontend/app_flowy/lib/plugins/grid/application/prelude.dart+++ /dev/null@@ -1,28 +0,0 @@-export 'grid_bloc.dart';-export 'row/row_bloc.dart';-export 'row/row_service.dart';-export 'grid_service.dart';-export 'grid_header_bloc.dart';--// FieldPB-export 'field/field_service.dart';-export 'field/field_action_sheet_bloc.dart';-export 'field/field_editor_bloc.dart';-export 'field/field_type_option_edit_bloc.dart';--// FieldPB Type Option-export 'field/type_option/date_bloc.dart';-export 'field/type_option/number_bloc.dart';-export 'field/type_option/single_select_type_option.dart';--// CellPB-export 'cell/text_cell_bloc.dart';-export 'cell/number_cell_bloc.dart';-export 'cell/select_option_cell_bloc.dart';-export 'cell/date_cell_bloc.dart';-export 'cell/checkbox_cell_bloc.dart';-export 'cell/cell_service/cell_service.dart';--// Setting-export 'setting/setting_bloc.dart';-export 'setting/property_bloc.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/setting/setting_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/setting/setting_bloc.dartdeleted file mode 100644index bb66f927a5..0000000000--- a/frontend/app_flowy/lib/plugins/grid/application/setting/setting_bloc.dart+++ /dev/null@@ -1,48 +0,0 @@-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';-import 'dart:async';-import 'package:dartz/dartz.dart';--part 'setting_bloc.freezed.dart';--class GridSettingBloc extends Bloc<GridSettingEvent, GridSettingState> {- final String databaseId;- GridSettingBloc({required this.databaseId})- : super(GridSettingState.initial()) {- on<GridSettingEvent>(- (event, emit) async {- event.map(performAction: (_PerformAction value) {- emit(state.copyWith(selectedAction: Some(value.action)));- });- },- );- }-- @override- Future<void> close() async {- return super.close();- }-}--@freezed-class GridSettingEvent with _$GridSettingEvent {- const factory GridSettingEvent.performAction(GridSettingAction action) =- _PerformAction;-}--@freezed-class GridSettingState with _$GridSettingState {- const factory GridSettingState({- required Option<GridSettingAction> selectedAction,- }) = _GridSettingState;-- factory GridSettingState.initial() => GridSettingState(- selectedAction: none(),- );-}--enum GridSettingAction {- showFilters,- sortBy,- showProperties,-}diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/controller/flowy_table_selection.dart b/frontend/app_flowy/lib/plugins/grid/presentation/controller/flowy_table_selection.dartdeleted file mode 100755index 7f01b7dcf0..0000000000--- a/frontend/app_flowy/lib/plugins/grid/presentation/controller/flowy_table_selection.dart+++ /dev/null@@ -1,73 +0,0 @@-/// The data structor representing each selection of flowy table.-enum FlowyTableSelectionType {- item,- row,- col,-}--class FlowyTableSelectionItem {- final FlowyTableSelectionType type;- final int? row;- final int? column;-- const FlowyTableSelectionItem({- required this.type,- this.row,- this.column,- });-- @override- String toString() {- return '$type($row, $column)';- }-- @override- bool operator ==(Object other) {- if (identical(this, other)) {- return true;- }- return other is FlowyTableSelectionItem &&- type == other.type &&- row == other.row &&- column == other.column;- }-- @override- int get hashCode => type.hashCode ^ row.hashCode ^ column.hashCode;-}--class FlowyTableSelection {- Set<FlowyTableSelectionItem> _items = {};-- Set<FlowyTableSelectionItem> get items => _items;-- FlowyTableSelection(- this._items,- );-- FlowyTableSelection.combine(- FlowyTableSelection lhs, FlowyTableSelection rhs) {- this..combine(lhs)..combine(rhs);- }-- FlowyTableSelection operator +(FlowyTableSelection other) {- return this..combine(other);- }-- void combine(FlowyTableSelection other) {- var totalItems = items..union(other.items);- final rows = totalItems- .where((ele) => ele.type == FlowyTableSelectionType.row)- .map((e) => e.row)- .toSet();- final cols = totalItems- .where((ele) => ele.type == FlowyTableSelectionType.col)- .map((e) => e.column)- .toSet();- totalItems.removeWhere((ele) {- return ele.type == FlowyTableSelectionType.item &&- (rows.contains(ele.row) || cols.contains(ele.column));- });- _items = totalItems;- }-}diff --git a/frontend/app_flowy/packages/flowy_infra/pubspec.lock b/frontend/app_flowy/packages/flowy_infra/pubspec.lockdeleted file mode 100644index 53f54db884..0000000000--- a/frontend/app_flowy/packages/flowy_infra/pubspec.lock+++ /dev/null@@ -1,224 +0,0 @@-# Generated by pub-# See https://dart.dev/tools/pub/glossary#lockfile-packages:- async:- dependency: transitive- description:- name: async- url: "https://pub.dartlang.org"- source: hosted- version: "2.9.0"- boolean_selector:- dependency: transitive- description:- name: boolean_selector- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.0"- characters:- dependency: transitive- description:- name: characters- url: "https://pub.dartlang.org"- source: hosted- version: "1.2.1"- clock:- dependency: transitive- description:- name: clock- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.1"- collection:- dependency: transitive- description:- name: collection- url: "https://pub.dartlang.org"- source: hosted- version: "1.16.0"- crypto:- dependency: transitive- description:- name: crypto- url: "https://pub.dartlang.org"- source: hosted- version: "3.0.2"- fake_async:- dependency: transitive- description:- name: fake_async- url: "https://pub.dartlang.org"- source: hosted- version: "1.3.1"- flutter:- dependency: "direct main"- description: flutter- source: sdk- version: "0.0.0"- flutter_lints:- dependency: "direct dev"- description:- name: flutter_lints- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.1"- flutter_svg:- dependency: "direct main"- description:- name: flutter_svg- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.6"- flutter_test:- dependency: "direct dev"- description: flutter- source: sdk- version: "0.0.0"- lints:- dependency: transitive- description:- name: lints- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.1"- matcher:- dependency: transitive- description:- name: matcher- url: "https://pub.dartlang.org"- source: hosted- version: "0.12.12"- material_color_utilities:- dependency: transitive- description:- name: material_color_utilities- url: "https://pub.dartlang.org"- source: hosted- version: "0.1.5"- meta:- dependency: transitive- description:- name: meta- url: "https://pub.dartlang.org"- source: hosted- version: "1.8.0"- path:- dependency: transitive- description:- name: path- url: "https://pub.dartlang.org"- source: hosted- version: "1.8.2"- path_drawing:- dependency: transitive- description:- name: path_drawing- url: "https://pub.dartlang.org"- source: hosted- version: "1.0.1"- path_parsing:- dependency: transitive- description:- name: path_parsing- url: "https://pub.dartlang.org"- source: hosted- version: "1.0.1"- petitparser:- dependency: transitive- description:- name: petitparser- url: "https://pub.dartlang.org"- source: hosted- version: "5.1.0"- sky_engine:- dependency: transitive- description: flutter- source: sdk- version: "0.0.99"- source_span:- dependency: transitive- description:- name: source_span- url: "https://pub.dartlang.org"- source: hosted- version: "1.9.0"- stack_trace:- dependency: transitive- description:- name: stack_trace- url: "https://pub.dartlang.org"- source: hosted- version: "1.10.0"- stream_channel:- dependency: transitive- description:- name: stream_channel- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.0"- string_scanner:- dependency: transitive- description:- name: string_scanner- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.1"- term_glyph:- dependency: transitive- description:- name: term_glyph- url: "https://pub.dartlang.org"- source: hosted- version: "1.2.1"- test_api:- dependency: transitive- description:- name: test_api- url: "https://pub.dartlang.org"- source: hosted- version: "0.4.12"- textstyle_extensions:- dependency: "direct main"- description:- name: textstyle_extensions- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.0-nullsafety"- time:- dependency: "direct main"- description:- name: time- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.3"- typed_data:- dependency: transitive- description:- name: typed_data- url: "https://pub.dartlang.org"- source: hosted- version: "1.3.1"- uuid:- dependency: "direct main"- description:- name: uuid- url: "https://pub.dartlang.org"- source: hosted- version: "3.0.7"- vector_math:- dependency: transitive- description:- name: vector_math- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.2"- xml:- dependency: transitive- description:- name: xml- url: "https://pub.dartlang.org"- source: hosted- version: "6.1.0"-sdks:- dart: ">=2.18.0 <3.0.0"- flutter: ">=3.3.0"diff --git a/frontend/app_flowy/packages/flowy_infra_ui/.vscode/launch.json b/frontend/app_flowy/packages/flowy_infra_ui/.vscode/launch.jsondeleted file mode 100644index ba345105b4..0000000000--- a/frontend/app_flowy/packages/flowy_infra_ui/.vscode/launch.json+++ /dev/null@@ -1,11 +0,0 @@-{- "version": "0.2.0",- "configurations": [- {- "name": "Infra UI Example",- "type": "dart",- "request": "launch",- "program": "example/lib/main.dart"- },- ]-}\ No newline at end of filediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/pubspec.lock b/frontend/app_flowy/packages/flowy_infra_ui/example/pubspec.lockdeleted file mode 100644index 7336bfb846..0000000000--- a/frontend/app_flowy/packages/flowy_infra_ui/example/pubspec.lock+++ /dev/null@@ -1,341 +0,0 @@-# Generated by pub-# See https://dart.dev/tools/pub/glossary#lockfile-packages:- animations:- dependency: transitive- description:- name: animations- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.7"- appflowy_popover:- dependency: transitive- description:- path: "../../appflowy_popover"- relative: true- source: path- version: "0.0.1"- async:- dependency: transitive- description:- name: async- url: "https://pub.dartlang.org"- source: hosted- version: "2.9.0"- boolean_selector:- dependency: transitive- description:- name: boolean_selector- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.0"- characters:- dependency: transitive- description:- name: characters- url: "https://pub.dartlang.org"- source: hosted- version: "1.2.1"- clock:- dependency: transitive- description:- name: clock- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.1"- collection:- dependency: transitive- description:- name: collection- url: "https://pub.dartlang.org"- source: hosted- version: "1.16.0"- crypto:- dependency: transitive- description:- name: crypto- url: "https://pub.dartlang.org"- source: hosted- version: "3.0.2"- cupertino_icons:- dependency: "direct main"- description:- name: cupertino_icons- url: "https://pub.dartlang.org"- source: hosted- version: "1.0.5"- dartz:- dependency: transitive- description:- name: dartz- url: "https://pub.dartlang.org"- source: hosted- version: "0.10.1"- equatable:- dependency: transitive- description:- name: equatable- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.5"- fake_async:- dependency: transitive- description:- name: fake_async- url: "https://pub.dartlang.org"- source: hosted- version: "1.3.1"- flowy_infra:- dependency: transitive- description:- path: "../../flowy_infra"- relative: true- source: path- version: "0.0.1"- flowy_infra_ui:- dependency: "direct main"- description:- path: ".."- relative: true- source: path- version: "0.0.1"- flowy_infra_ui_platform_interface:- dependency: transitive- description:- path: "../flowy_infra_ui_platform_interface"- relative: true- source: path- version: "0.0.1"- flowy_infra_ui_web:- dependency: transitive- description:- path: "../flowy_infra_ui_web"- relative: true- source: path- version: "0.0.1"- flutter:- dependency: "direct main"- description: flutter- source: sdk- version: "0.0.0"- flutter_lints:- dependency: "direct dev"- description:- name: flutter_lints- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.1"- flutter_svg:- dependency: transitive- description:- name: flutter_svg- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.6"- flutter_test:- dependency: "direct dev"- description: flutter- source: sdk- version: "0.0.0"- flutter_web_plugins:- dependency: transitive- description: flutter- source: sdk- version: "0.0.0"- js:- dependency: transitive- description:- name: js- url: "https://pub.dartlang.org"- source: hosted- version: "0.6.4"- lint:- dependency: transitive- description:- name: lint- url: "https://pub.dartlang.org"- source: hosted- version: "1.10.0"- lints:- dependency: transitive- description:- name: lints- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.1"- loading_indicator:- dependency: transitive- description:- name: loading_indicator- url: "https://pub.dartlang.org"- source: hosted- version: "3.1.0"- matcher:- dependency: transitive- description:- name: matcher- url: "https://pub.dartlang.org"- source: hosted- version: "0.12.12"- material_color_utilities:- dependency: transitive- description:- name: material_color_utilities- url: "https://pub.dartlang.org"- source: hosted- version: "0.1.5"- meta:- dependency: transitive- description:- name: meta- url: "https://pub.dartlang.org"- source: hosted- version: "1.8.0"- nested:- dependency: transitive- description:- name: nested- url: "https://pub.dartlang.org"- source: hosted- version: "1.0.0"- path:- dependency: transitive- description:- name: path- url: "https://pub.dartlang.org"- source: hosted- version: "1.8.2"- path_drawing:- dependency: transitive- description:- name: path_drawing- url: "https://pub.dartlang.org"- source: hosted- version: "1.0.1"- path_parsing:- dependency: transitive- description:- name: path_parsing- url: "https://pub.dartlang.org"- source: hosted- version: "1.0.1"- petitparser:- dependency: transitive- description:- name: petitparser- url: "https://pub.dartlang.org"- source: hosted- version: "5.1.0"- plugin_platform_interface:- dependency: transitive- description:- name: plugin_platform_interface- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.3"- provider:- dependency: "direct main"- description:- name: provider- url: "https://pub.dartlang.org"- source: hosted- version: "6.0.5"- sky_engine:- dependency: transitive- description: flutter- source: sdk- version: "0.0.99"- source_span:- dependency: transitive- description:- name: source_span- url: "https://pub.dartlang.org"- source: hosted- version: "1.9.0"- stack_trace:- dependency: transitive- description:- name: stack_trace- url: "https://pub.dartlang.org"- source: hosted- version: "1.10.0"- stream_channel:- dependency: transitive- description:- name: stream_channel- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.0"- string_scanner:- dependency: transitive- description:- name: string_scanner- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.1"- styled_widget:- dependency: transitive- description:- name: styled_widget- url: "https://pub.dartlang.org"- source: hosted- version: "0.3.1+2"- term_glyph:- dependency: transitive- description:- name: term_glyph- url: "https://pub.dartlang.org"- source: hosted- version: "1.2.1"- test_api:- dependency: transitive- description:- name: test_api- url: "https://pub.dartlang.org"- source: hosted- version: "0.4.12"- textstyle_extensions:- dependency: transitive- description:- name: textstyle_extensions- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.0-nullsafety"- time:- dependency: transitive- description:- name: time- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.3"- typed_data:- dependency: transitive- description:- name: typed_data- url: "https://pub.dartlang.org"- source: hosted- version: "1.3.1"- uuid:- dependency: transitive- description:- name: uuid- url: "https://pub.dartlang.org"- source: hosted- version: "3.0.7"- vector_math:- dependency: transitive- description:- name: vector_math- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.2"- xml:- dependency: transitive- description:- name: xml- url: "https://pub.dartlang.org"- source: hosted- version: "6.1.0"-sdks:- dart: ">=2.18.0 <3.0.0"- flutter: ">=3.3.0"diff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/pubspec.lock b/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/pubspec.lockdeleted file mode 100644index 825e6fbbfb..0000000000--- a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/pubspec.lock+++ /dev/null@@ -1,161 +0,0 @@-# Generated by pub-# See https://dart.dev/tools/pub/glossary#lockfile-packages:- async:- dependency: transitive- description:- name: async- url: "https://pub.dartlang.org"- source: hosted- version: "2.9.0"- boolean_selector:- dependency: transitive- description:- name: boolean_selector- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.0"- characters:- dependency: transitive- description:- name: characters- url: "https://pub.dartlang.org"- source: hosted- version: "1.2.1"- clock:- dependency: transitive- description:- name: clock- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.1"- collection:- dependency: transitive- description:- name: collection- url: "https://pub.dartlang.org"- source: hosted- version: "1.16.0"- fake_async:- dependency: transitive- description:- name: fake_async- url: "https://pub.dartlang.org"- source: hosted- version: "1.3.1"- flutter:- dependency: "direct main"- description: flutter- source: sdk- version: "0.0.0"- flutter_lints:- dependency: "direct dev"- description:- name: flutter_lints- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.1"- flutter_test:- dependency: "direct dev"- description: flutter- source: sdk- version: "0.0.0"- lints:- dependency: transitive- description:- name: lints- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.1"- matcher:- dependency: transitive- description:- name: matcher- url: "https://pub.dartlang.org"- source: hosted- version: "0.12.12"- material_color_utilities:- dependency: transitive- description:- name: material_color_utilities- url: "https://pub.dartlang.org"- source: hosted- version: "0.1.5"- meta:- dependency: transitive- description:- name: meta- url: "https://pub.dartlang.org"- source: hosted- version: "1.8.0"- path:- dependency: transitive- description:- name: path- url: "https://pub.dartlang.org"- source: hosted- version: "1.8.2"- plugin_platform_interface:- dependency: "direct main"- description:- name: plugin_platform_interface- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.3"- sky_engine:- dependency: transitive- description: flutter- source: sdk- version: "0.0.99"- source_span:- dependency: transitive- description:- name: source_span- url: "https://pub.dartlang.org"- source: hosted- version: "1.9.0"- stack_trace:- dependency: transitive- description:- name: stack_trace- url: "https://pub.dartlang.org"- source: hosted- version: "1.10.0"- stream_channel:- dependency: transitive- description:- name: stream_channel- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.0"- string_scanner:- dependency: transitive- description:- name: string_scanner- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.1"- term_glyph:- dependency: transitive- description:- name: term_glyph- url: "https://pub.dartlang.org"- source: hosted- version: "1.2.1"- test_api:- dependency: transitive- description:- name: test_api- url: "https://pub.dartlang.org"- source: hosted- version: "0.4.12"- vector_math:- dependency: transitive- description:- name: vector_math- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.2"-sdks:- dart: ">=2.17.0 <3.0.0"- flutter: ">=1.17.0"diff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/pubspec.lock b/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/pubspec.lockdeleted file mode 100644index cfed8a47b4..0000000000--- a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/pubspec.lock+++ /dev/null@@ -1,180 +0,0 @@-# Generated by pub-# See https://dart.dev/tools/pub/glossary#lockfile-packages:- async:- dependency: transitive- description:- name: async- url: "https://pub.dartlang.org"- source: hosted- version: "2.9.0"- boolean_selector:- dependency: transitive- description:- name: boolean_selector- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.0"- characters:- dependency: transitive- description:- name: characters- url: "https://pub.dartlang.org"- source: hosted- version: "1.2.1"- clock:- dependency: transitive- description:- name: clock- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.1"- collection:- dependency: transitive- description:- name: collection- url: "https://pub.dartlang.org"- source: hosted- version: "1.16.0"- fake_async:- dependency: transitive- description:- name: fake_async- url: "https://pub.dartlang.org"- source: hosted- version: "1.3.1"- flowy_infra_ui_platform_interface:- dependency: "direct main"- description:- path: "../flowy_infra_ui_platform_interface"- relative: true- source: path- version: "0.0.1"- flutter:- dependency: transitive- description: flutter- source: sdk- version: "0.0.0"- flutter_lints:- dependency: "direct dev"- description:- name: flutter_lints- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.1"- flutter_test:- dependency: "direct dev"- description: flutter- source: sdk- version: "0.0.0"- flutter_web_plugins:- dependency: "direct main"- description: flutter- source: sdk- version: "0.0.0"- js:- dependency: transitive- description:- name: js- url: "https://pub.dartlang.org"- source: hosted- version: "0.6.4"- lints:- dependency: transitive- description:- name: lints- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.1"- matcher:- dependency: transitive- description:- name: matcher- url: "https://pub.dartlang.org"- source: hosted- version: "0.12.12"- material_color_utilities:- dependency: transitive- description:- name: material_color_utilities- url: "https://pub.dartlang.org"- source: hosted- version: "0.1.5"- meta:- dependency: transitive- description:- name: meta- url: "https://pub.dartlang.org"- source: hosted- version: "1.8.0"- path:- dependency: transitive- description:- name: path- url: "https://pub.dartlang.org"- source: hosted- version: "1.8.2"- plugin_platform_interface:- dependency: transitive- description:- name: plugin_platform_interface- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.3"- sky_engine:- dependency: transitive- description: flutter- source: sdk- version: "0.0.99"- source_span:- dependency: transitive- description:- name: source_span- url: "https://pub.dartlang.org"- source: hosted- version: "1.9.0"- stack_trace:- dependency: transitive- description:- name: stack_trace- url: "https://pub.dartlang.org"- source: hosted- version: "1.10.0"- stream_channel:- dependency: transitive- description:- name: stream_channel- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.0"- string_scanner:- dependency: transitive- description:- name: string_scanner- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.1"- term_glyph:- dependency: transitive- description:- name: term_glyph- url: "https://pub.dartlang.org"- source: hosted- version: "1.2.1"- test_api:- dependency: transitive- description:- name: test_api- url: "https://pub.dartlang.org"- source: hosted- version: "0.4.12"- vector_math:- dependency: transitive- description:- name: vector_math- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.2"-sdks:- dart: ">=2.17.0 <3.0.0"- flutter: ">=1.17.0"diff --git a/frontend/app_flowy/packages/flowy_infra_ui/pubspec.lock b/frontend/app_flowy/packages/flowy_infra_ui/pubspec.lockdeleted file mode 100644index a8b950ef24..0000000000--- a/frontend/app_flowy/packages/flowy_infra_ui/pubspec.lock+++ /dev/null@@ -1,327 +0,0 @@-# Generated by pub-# See https://dart.dev/tools/pub/glossary#lockfile-packages:- animations:- dependency: "direct main"- description:- name: animations- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.7"- appflowy_popover:- dependency: "direct main"- description:- path: "../appflowy_popover"- relative: true- source: path- version: "0.0.1"- async:- dependency: "direct main"- description:- name: async- url: "https://pub.dartlang.org"- source: hosted- version: "2.9.0"- boolean_selector:- dependency: transitive- description:- name: boolean_selector- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.0"- characters:- dependency: transitive- description:- name: characters- url: "https://pub.dartlang.org"- source: hosted- version: "1.2.1"- clock:- dependency: transitive- description:- name: clock- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.1"- collection:- dependency: transitive- description:- name: collection- url: "https://pub.dartlang.org"- source: hosted- version: "1.16.0"- crypto:- dependency: transitive- description:- name: crypto- url: "https://pub.dartlang.org"- source: hosted- version: "3.0.2"- dartz:- dependency: "direct main"- description:- name: dartz- url: "https://pub.dartlang.org"- source: hosted- version: "0.10.1"- equatable:- dependency: "direct main"- description:- name: equatable- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.5"- fake_async:- dependency: transitive- description:- name: fake_async- url: "https://pub.dartlang.org"- source: hosted- version: "1.3.1"- flowy_infra:- dependency: "direct main"- description:- path: "../flowy_infra"- relative: true- source: path- version: "0.0.1"- flowy_infra_ui_platform_interface:- dependency: "direct main"- description:- path: flowy_infra_ui_platform_interface- relative: true- source: path- version: "0.0.1"- flowy_infra_ui_web:- dependency: "direct main"- description:- path: flowy_infra_ui_web- relative: true- source: path- version: "0.0.1"- flutter:- dependency: "direct main"- description: flutter- source: sdk- version: "0.0.0"- flutter_lints:- dependency: "direct dev"- description:- name: flutter_lints- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.1"- flutter_svg:- dependency: transitive- description:- name: flutter_svg- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.6"- flutter_test:- dependency: "direct dev"- description: flutter- source: sdk- version: "0.0.0"- flutter_web_plugins:- dependency: transitive- description: flutter- source: sdk- version: "0.0.0"- js:- dependency: transitive- description:- name: js- url: "https://pub.dartlang.org"- source: hosted- version: "0.6.4"- lint:- dependency: transitive- description:- name: lint- url: "https://pub.dartlang.org"- source: hosted- version: "1.10.0"- lints:- dependency: transitive- description:- name: lints- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.1"- loading_indicator:- dependency: "direct main"- description:- name: loading_indicator- url: "https://pub.dartlang.org"- source: hosted- version: "3.1.0"- matcher:- dependency: transitive- description:- name: matcher- url: "https://pub.dartlang.org"- source: hosted- version: "0.12.12"- material_color_utilities:- dependency: transitive- description:- name: material_color_utilities- url: "https://pub.dartlang.org"- source: hosted- version: "0.1.5"- meta:- dependency: transitive- description:- name: meta- url: "https://pub.dartlang.org"- source: hosted- version: "1.8.0"- nested:- dependency: transitive- description:- name: nested- url: "https://pub.dartlang.org"- source: hosted- version: "1.0.0"- path:- dependency: transitive- description:- name: path- url: "https://pub.dartlang.org"- source: hosted- version: "1.8.2"- path_drawing:- dependency: transitive- description:- name: path_drawing- url: "https://pub.dartlang.org"- source: hosted- version: "1.0.1"- path_parsing:- dependency: transitive- description:- name: path_parsing- url: "https://pub.dartlang.org"- source: hosted- version: "1.0.1"- petitparser:- dependency: transitive- description:- name: petitparser- url: "https://pub.dartlang.org"- source: hosted- version: "5.1.0"- plugin_platform_interface:- dependency: transitive- description:- name: plugin_platform_interface- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.3"- provider:- dependency: "direct main"- description:- name: provider- url: "https://pub.dartlang.org"- source: hosted- version: "6.0.5"- sky_engine:- dependency: transitive- description: flutter- source: sdk- version: "0.0.99"- source_span:- dependency: transitive- description:- name: source_span- url: "https://pub.dartlang.org"- source: hosted- version: "1.9.0"- stack_trace:- dependency: transitive- description:- name: stack_trace- url: "https://pub.dartlang.org"- source: hosted- version: "1.10.0"- stream_channel:- dependency: transitive- description:- name: stream_channel- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.0"- string_scanner:- dependency: transitive- description:- name: string_scanner- url: "https://pub.dartlang.org"- source: hosted- version: "1.1.1"- styled_widget:- dependency: "direct main"- description:- name: styled_widget- url: "https://pub.dartlang.org"- source: hosted- version: "0.3.1+2"- term_glyph:- dependency: transitive- description:- name: term_glyph- url: "https://pub.dartlang.org"- source: hosted- version: "1.2.1"- test_api:- dependency: transitive- description:- name: test_api- url: "https://pub.dartlang.org"- source: hosted- version: "0.4.12"- textstyle_extensions:- dependency: "direct main"- description:- name: textstyle_extensions- url: "https://pub.dartlang.org"- source: hosted- version: "2.0.0-nullsafety"- time:- dependency: transitive- description:- name: time- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.3"- typed_data:- dependency: transitive- description:- name: typed_data- url: "https://pub.dartlang.org"- source: hosted- version: "1.3.1"- uuid:- dependency: transitive- description:- name: uuid- url: "https://pub.dartlang.org"- source: hosted- version: "3.0.7"- vector_math:- dependency: transitive- description:- name: vector_math- url: "https://pub.dartlang.org"- source: hosted- version: "2.1.2"- xml:- dependency: transitive- description:- name: xml- url: "https://pub.dartlang.org"- source: hosted- version: "6.1.0"-sdks:- dart: ">=2.18.0 <3.0.0"- flutter: ">=3.3.0"diff --git a/frontend/app_flowy/.gitignore b/frontend/appflowy_flutter/.gitignoresimilarity index 100%rename from frontend/app_flowy/.gitignorerename to frontend/appflowy_flutter/.gitignorediff --git a/frontend/app_flowy/.metadata b/frontend/appflowy_flutter/.metadatasimilarity index 100%rename from frontend/app_flowy/.metadatarename to frontend/appflowy_flutter/.metadatadiff --git a/frontend/app_flowy/Makefile b/frontend/appflowy_flutter/Makefilesimilarity index 100%rename from frontend/app_flowy/Makefilerename to frontend/appflowy_flutter/Makefilediff --git a/frontend/app_flowy/README.md b/frontend/appflowy_flutter/README.mdsimilarity index 93%rename from frontend/app_flowy/README.mdrename to frontend/appflowy_flutter/README.mdindex 1b037500e1..a589d60ea4 100644--- a/frontend/app_flowy/README.md+++ b/frontend/appflowy_flutter/README.md@@ -1,4 +1,4 @@-# app_flowy+# appflowy_flutterA new Flutter project.diff --git a/frontend/app_flowy/analysis_options.yaml b/frontend/appflowy_flutter/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/analysis_options.yamlrename to frontend/appflowy_flutter/analysis_options.yamldiff --git a/frontend/app_flowy/android/.gitignore b/frontend/appflowy_flutter/android/.gitignoresimilarity index 100%rename from frontend/app_flowy/android/.gitignorerename to frontend/appflowy_flutter/android/.gitignorediff --git a/frontend/app_flowy/android/README.md b/frontend/appflowy_flutter/android/README.mdsimilarity index 100%rename from frontend/app_flowy/android/README.mdrename to frontend/appflowy_flutter/android/README.mddiff --git a/frontend/app_flowy/android/app/build.gradle b/frontend/appflowy_flutter/android/app/build.gradlesimilarity index 97%rename from frontend/app_flowy/android/app/build.gradlerename to frontend/appflowy_flutter/android/app/build.gradleindex 2fc26c2fb5..216ec0c1fb 100644--- a/frontend/app_flowy/android/app/build.gradle+++ b/frontend/appflowy_flutter/android/app/build.gradle@@ -45,7 +45,7 @@ android {defaultConfig {// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).- applicationId "com.example.app_flowy"+ applicationId "com.example.appflowy_flutter"minSdkVersion 19targetSdkVersion 31versionCode flutterVersionCode.toInteger()diff --git a/frontend/app_flowy/android/app/src/profile/AndroidManifest.xml b/frontend/appflowy_flutter/android/app/src/debug/AndroidManifest.xmlsimilarity index 86%rename from frontend/app_flowy/android/app/src/profile/AndroidManifest.xmlrename to frontend/appflowy_flutter/android/app/src/debug/AndroidManifest.xmlindex bbcce3827b..49c97148ad 100644--- a/frontend/app_flowy/android/app/src/profile/AndroidManifest.xml+++ b/frontend/appflowy_flutter/android/app/src/debug/AndroidManifest.xml@@ -1,5 +1,5 @@<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.example.app_flowy">+ package="com.example.appflowy_flutter"><!-- Flutter needs it to communicate with the running applicationto allow setting breakpoints, to provide hot reload, etc.-->diff --git a/frontend/app_flowy/android/app/src/main/AndroidManifest.xml b/frontend/appflowy_flutter/android/app/src/main/AndroidManifest.xmlsimilarity index 96%rename from frontend/app_flowy/android/app/src/main/AndroidManifest.xmlrename to frontend/appflowy_flutter/android/app/src/main/AndroidManifest.xmlindex a34dc98587..96e75259ad 100644--- a/frontend/app_flowy/android/app/src/main/AndroidManifest.xml+++ b/frontend/appflowy_flutter/android/app/src/main/AndroidManifest.xml@@ -1,7 +1,7 @@<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.example.app_flowy">+ package="com.example.appflowy_flutter"><application- android:label="app_flowy"+ android:label="appflowy_flutter"android:icon="@mipmap/ic_launcher"android:name="${applicationName}"><activitydiff --git a/frontend/app_flowy/android/app/src/main/kotlin/com/example/app_flowy/MainActivity.kt b/frontend/appflowy_flutter/android/app/src/main/kotlin/com/example/app_flowy/MainActivity.ktsimilarity index 72%rename from frontend/app_flowy/android/app/src/main/kotlin/com/example/app_flowy/MainActivity.ktrename to frontend/appflowy_flutter/android/app/src/main/kotlin/com/example/app_flowy/MainActivity.ktindex cd02c5ed92..3010d5fb03 100644--- a/frontend/app_flowy/android/app/src/main/kotlin/com/example/app_flowy/MainActivity.kt+++ b/frontend/appflowy_flutter/android/app/src/main/kotlin/com/example/app_flowy/MainActivity.kt@@ -1,4 +1,4 @@-package com.example.app_flowy+package com.example.appflowy_flutterimport io.flutter.embedding.android.FlutterActivitydiff --git a/frontend/app_flowy/android/app/src/main/res/drawable-v21/launch_background.xml b/frontend/appflowy_flutter/android/app/src/main/res/drawable-v21/launch_background.xmlsimilarity index 100%rename from frontend/app_flowy/android/app/src/main/res/drawable-v21/launch_background.xmlrename to frontend/appflowy_flutter/android/app/src/main/res/drawable-v21/launch_background.xmldiff --git a/frontend/app_flowy/android/app/src/main/res/drawable/launch_background.xml b/frontend/appflowy_flutter/android/app/src/main/res/drawable/launch_background.xmlsimilarity index 100%rename from frontend/app_flowy/android/app/src/main/res/drawable/launch_background.xmlrename to frontend/appflowy_flutter/android/app/src/main/res/drawable/launch_background.xmldiff --git a/frontend/app_flowy/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngrename to frontend/appflowy_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngrename to frontend/appflowy_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/android/app/src/main/res/values-night/styles.xml b/frontend/appflowy_flutter/android/app/src/main/res/values-night/styles.xmlsimilarity index 100%rename from frontend/app_flowy/android/app/src/main/res/values-night/styles.xmlrename to frontend/appflowy_flutter/android/app/src/main/res/values-night/styles.xmldiff --git a/frontend/app_flowy/android/app/src/main/res/values/styles.xml b/frontend/appflowy_flutter/android/app/src/main/res/values/styles.xmlsimilarity index 100%rename from frontend/app_flowy/android/app/src/main/res/values/styles.xmlrename to frontend/appflowy_flutter/android/app/src/main/res/values/styles.xmldiff --git a/frontend/app_flowy/android/app/src/debug/AndroidManifest.xml b/frontend/appflowy_flutter/android/app/src/profile/AndroidManifest.xmlsimilarity index 86%rename from frontend/app_flowy/android/app/src/debug/AndroidManifest.xmlrename to frontend/appflowy_flutter/android/app/src/profile/AndroidManifest.xmlindex bbcce3827b..49c97148ad 100644--- a/frontend/app_flowy/android/app/src/debug/AndroidManifest.xml+++ b/frontend/appflowy_flutter/android/app/src/profile/AndroidManifest.xml@@ -1,5 +1,5 @@<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.example.app_flowy">+ package="com.example.appflowy_flutter"><!-- Flutter needs it to communicate with the running applicationto allow setting breakpoints, to provide hot reload, etc.-->diff --git a/frontend/app_flowy/android/build.gradle b/frontend/appflowy_flutter/android/build.gradlesimilarity index 100%rename from frontend/app_flowy/android/build.gradlerename to frontend/appflowy_flutter/android/build.gradlediff --git a/frontend/app_flowy/android/gradle.properties b/frontend/appflowy_flutter/android/gradle.propertiessimilarity index 100%rename from frontend/app_flowy/android/gradle.propertiesrename to frontend/appflowy_flutter/android/gradle.propertiesdiff --git a/frontend/app_flowy/android/gradle/wrapper/gradle-wrapper.properties b/frontend/appflowy_flutter/android/gradle/wrapper/gradle-wrapper.propertiessimilarity index 100%rename from frontend/app_flowy/android/gradle/wrapper/gradle-wrapper.propertiesrename to frontend/appflowy_flutter/android/gradle/wrapper/gradle-wrapper.propertiesdiff --git a/frontend/app_flowy/android/settings.gradle b/frontend/appflowy_flutter/android/settings.gradlesimilarity index 100%rename from frontend/app_flowy/android/settings.gradlerename to frontend/appflowy_flutter/android/settings.gradlediff --git a/frontend/app_flowy/assets/fonts/FlowyIconData.ttf b/frontend/appflowy_flutter/assets/fonts/FlowyIconData.ttfsimilarity index 100%rename from frontend/app_flowy/assets/fonts/FlowyIconData.ttfrename to frontend/appflowy_flutter/assets/fonts/FlowyIconData.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/OFL.txt b/frontend/appflowy_flutter/assets/google_fonts/Poppins/OFL.txtsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/OFL.txtrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/OFL.txtdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Black.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Black.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Black.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Black.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-BlackItalic.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-BlackItalic.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-BlackItalic.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-BlackItalic.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Bold.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Bold.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Bold.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Bold.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-BoldItalic.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-BoldItalic.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-BoldItalic.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-BoldItalic.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-ExtraBold.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-ExtraBold.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-ExtraBold.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-ExtraBold.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-ExtraBoldItalic.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-ExtraBoldItalic.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-ExtraBoldItalic.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-ExtraBoldItalic.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-ExtraLight.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-ExtraLight.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-ExtraLight.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-ExtraLight.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-ExtraLightItalic.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-ExtraLightItalic.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-ExtraLightItalic.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-ExtraLightItalic.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Italic.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Italic.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Italic.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Italic.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Light.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Light.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Light.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Light.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-LightItalic.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-LightItalic.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-LightItalic.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-LightItalic.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Medium.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Medium.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Medium.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Medium.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-MediumItalic.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-MediumItalic.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-MediumItalic.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-MediumItalic.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Regular.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Regular.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Regular.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Regular.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-SemiBold.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-SemiBold.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-SemiBold.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-SemiBold.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-SemiBoldItalic.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-SemiBoldItalic.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-SemiBoldItalic.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-SemiBoldItalic.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Thin.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Thin.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-Thin.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-Thin.ttfdiff --git a/frontend/app_flowy/assets/google_fonts/Poppins/Poppins-ThinItalic.ttf b/frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-ThinItalic.ttfsimilarity index 100%rename from frontend/app_flowy/assets/google_fonts/Poppins/Poppins-ThinItalic.ttfrename to frontend/appflowy_flutter/assets/google_fonts/Poppins/Poppins-ThinItalic.ttfdiff --git a/frontend/app_flowy/assets/images/app_flowy_logo.jpg b/frontend/appflowy_flutter/assets/images/app_flowy_logo.jpgsimilarity index 100%rename from frontend/app_flowy/assets/images/app_flowy_logo.jpgrename to frontend/appflowy_flutter/assets/images/app_flowy_logo.jpgdiff --git a/frontend/app_flowy/assets/images/appflowy_launch_splash.jpg b/frontend/appflowy_flutter/assets/images/appflowy_launch_splash.jpgsimilarity index 100%rename from frontend/app_flowy/assets/images/appflowy_launch_splash.jpgrename to frontend/appflowy_flutter/assets/images/appflowy_launch_splash.jpgdiff --git a/frontend/app_flowy/assets/images/common/information.svg b/frontend/appflowy_flutter/assets/images/common/information.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/common/information.svgrename to frontend/appflowy_flutter/assets/images/common/information.svgdiff --git a/frontend/app_flowy/assets/images/common/settings.svg b/frontend/appflowy_flutter/assets/images/common/settings.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/common/settings.svgrename to frontend/appflowy_flutter/assets/images/common/settings.svgdiff --git a/frontend/app_flowy/assets/images/editor/Align/center.svg b/frontend/appflowy_flutter/assets/images/editor/Align/center.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Align/center.svgrename to frontend/appflowy_flutter/assets/images/editor/Align/center.svgdiff --git a/frontend/app_flowy/assets/images/editor/Align/left.svg b/frontend/appflowy_flutter/assets/images/editor/Align/left.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Align/left.svgrename to frontend/appflowy_flutter/assets/images/editor/Align/left.svgdiff --git a/frontend/app_flowy/assets/images/editor/Align/right.svg b/frontend/appflowy_flutter/assets/images/editor/Align/right.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Align/right.svgrename to frontend/appflowy_flutter/assets/images/editor/Align/right.svgdiff --git a/frontend/app_flowy/assets/images/editor/Arrow/left.svg b/frontend/appflowy_flutter/assets/images/editor/Arrow/left.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Arrow/left.svgrename to frontend/appflowy_flutter/assets/images/editor/Arrow/left.svgdiff --git a/frontend/app_flowy/assets/images/editor/Arrow/right.svg b/frontend/appflowy_flutter/assets/images/editor/Arrow/right.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Arrow/right.svgrename to frontend/appflowy_flutter/assets/images/editor/Arrow/right.svgdiff --git a/frontend/app_flowy/assets/images/editor/Color/default.svg b/frontend/appflowy_flutter/assets/images/editor/Color/default.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Color/default.svgrename to frontend/appflowy_flutter/assets/images/editor/Color/default.svgdiff --git a/frontend/app_flowy/assets/images/editor/Color/select.svg b/frontend/appflowy_flutter/assets/images/editor/Color/select.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Color/select.svgrename to frontend/appflowy_flutter/assets/images/editor/Color/select.svgdiff --git a/frontend/app_flowy/assets/images/editor/Favorite/active.svg b/frontend/appflowy_flutter/assets/images/editor/Favorite/active.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Favorite/active.svgrename to frontend/appflowy_flutter/assets/images/editor/Favorite/active.svgdiff --git a/frontend/app_flowy/assets/images/editor/Favorite/default.svg b/frontend/appflowy_flutter/assets/images/editor/Favorite/default.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Favorite/default.svgrename to frontend/appflowy_flutter/assets/images/editor/Favorite/default.svgdiff --git a/frontend/app_flowy/assets/images/editor/H1.svg b/frontend/appflowy_flutter/assets/images/editor/H1.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/H1.svgrename to frontend/appflowy_flutter/assets/images/editor/H1.svgdiff --git a/frontend/app_flowy/assets/images/editor/H2.svg b/frontend/appflowy_flutter/assets/images/editor/H2.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/H2.svgrename to frontend/appflowy_flutter/assets/images/editor/H2.svgdiff --git a/frontend/app_flowy/assets/images/editor/H3.svg b/frontend/appflowy_flutter/assets/images/editor/H3.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/H3.svgrename to frontend/appflowy_flutter/assets/images/editor/H3.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Information.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Information.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Information.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Information.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Lira.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Lira.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Lira.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Lira.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Real.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Real.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Real.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Real.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Relation.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Relation.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Relation.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Relation.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Reload.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Reload.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Reload.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Reload.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Ruble.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Ruble.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Ruble.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Ruble.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Rupee.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Rupee.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Rupee.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Rupee.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Rupiah.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Rupiah.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Rupiah.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Rupiah.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Sort/High.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Sort/High.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Sort/High.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Sort/High.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Sort/Low.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Sort/Low.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Sort/Low.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Sort/Low.svgdiff --git a/frontend/app_flowy/assets/images/editor/Icons 16/Won.svg b/frontend/appflowy_flutter/assets/images/editor/Icons 16/Won.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Icons 16/Won.svgrename to frontend/appflowy_flutter/assets/images/editor/Icons 16/Won.svgdiff --git a/frontend/app_flowy/assets/images/editor/Status/done.svg b/frontend/appflowy_flutter/assets/images/editor/Status/done.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Status/done.svgrename to frontend/appflowy_flutter/assets/images/editor/Status/done.svgdiff --git a/frontend/app_flowy/assets/images/editor/Status/inprogress.svg b/frontend/appflowy_flutter/assets/images/editor/Status/inprogress.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Status/inprogress.svgrename to frontend/appflowy_flutter/assets/images/editor/Status/inprogress.svgdiff --git a/frontend/app_flowy/assets/images/editor/Status/todo.svg b/frontend/appflowy_flutter/assets/images/editor/Status/todo.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/Status/todo.svgrename to frontend/appflowy_flutter/assets/images/editor/Status/todo.svgdiff --git a/frontend/app_flowy/assets/images/editor/USD.svg b/frontend/appflowy_flutter/assets/images/editor/USD.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/USD.svgrename to frontend/appflowy_flutter/assets/images/editor/USD.svgdiff --git a/frontend/app_flowy/assets/images/editor/add.svg b/frontend/appflowy_flutter/assets/images/editor/add.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/add.svgrename to frontend/appflowy_flutter/assets/images/editor/add.svgdiff --git a/frontend/app_flowy/assets/images/editor/attach.svg b/frontend/appflowy_flutter/assets/images/editor/attach.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/attach.svgrename to frontend/appflowy_flutter/assets/images/editor/attach.svgdiff --git a/frontend/app_flowy/assets/images/editor/board.svg b/frontend/appflowy_flutter/assets/images/editor/board.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/board.svgrename to frontend/appflowy_flutter/assets/images/editor/board.svgdiff --git a/frontend/app_flowy/assets/images/editor/bold.svg b/frontend/appflowy_flutter/assets/images/editor/bold.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/bold.svgrename to frontend/appflowy_flutter/assets/images/editor/bold.svgdiff --git a/frontend/app_flowy/assets/images/editor/bullet_list.svg b/frontend/appflowy_flutter/assets/images/editor/bullet_list.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/bullet_list.svgrename to frontend/appflowy_flutter/assets/images/editor/bullet_list.svgdiff --git a/frontend/app_flowy/assets/images/editor/check.svg b/frontend/appflowy_flutter/assets/images/editor/check.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/check.svgrename to frontend/appflowy_flutter/assets/images/editor/check.svgdiff --git a/frontend/app_flowy/assets/images/editor/checkbox.svg b/frontend/appflowy_flutter/assets/images/editor/checkbox.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/checkbox.svgrename to frontend/appflowy_flutter/assets/images/editor/checkbox.svgdiff --git a/frontend/app_flowy/assets/images/editor/checklist.svg b/frontend/appflowy_flutter/assets/images/editor/checklist.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/checklist.svgrename to frontend/appflowy_flutter/assets/images/editor/checklist.svgdiff --git a/frontend/app_flowy/assets/images/editor/clear.svg b/frontend/appflowy_flutter/assets/images/editor/clear.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/clear.svgrename to frontend/appflowy_flutter/assets/images/editor/clear.svgdiff --git a/frontend/app_flowy/assets/images/editor/close.svg b/frontend/appflowy_flutter/assets/images/editor/close.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/close.svgrename to frontend/appflowy_flutter/assets/images/editor/close.svgdiff --git a/frontend/app_flowy/assets/images/editor/comment.svg b/frontend/appflowy_flutter/assets/images/editor/comment.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/comment.svgrename to frontend/appflowy_flutter/assets/images/editor/comment.svgdiff --git a/frontend/app_flowy/assets/images/editor/comments.svg b/frontend/appflowy_flutter/assets/images/editor/comments.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/comments.svgrename to frontend/appflowy_flutter/assets/images/editor/comments.svgdiff --git a/frontend/app_flowy/assets/images/editor/copy.svg b/frontend/appflowy_flutter/assets/images/editor/copy.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/copy.svgrename to frontend/appflowy_flutter/assets/images/editor/copy.svgdiff --git a/frontend/app_flowy/assets/images/editor/dashboard.svg b/frontend/appflowy_flutter/assets/images/editor/dashboard.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/dashboard.svgrename to frontend/appflowy_flutter/assets/images/editor/dashboard.svgdiff --git a/frontend/app_flowy/assets/images/editor/date.svg b/frontend/appflowy_flutter/assets/images/editor/date.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/date.svgrename to frontend/appflowy_flutter/assets/images/editor/date.svgdiff --git a/frontend/app_flowy/assets/images/editor/delete.svg b/frontend/appflowy_flutter/assets/images/editor/delete.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/delete.svgrename to frontend/appflowy_flutter/assets/images/editor/delete.svgdiff --git a/frontend/app_flowy/assets/images/editor/details.svg b/frontend/appflowy_flutter/assets/images/editor/details.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/details.svgrename to frontend/appflowy_flutter/assets/images/editor/details.svgdiff --git a/frontend/app_flowy/assets/images/editor/documents.svg b/frontend/appflowy_flutter/assets/images/editor/documents.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/documents.svgrename to frontend/appflowy_flutter/assets/images/editor/documents.svgdiff --git a/frontend/app_flowy/assets/images/editor/drag_element.svg b/frontend/appflowy_flutter/assets/images/editor/drag_element.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/drag_element.svgrename to frontend/appflowy_flutter/assets/images/editor/drag_element.svgdiff --git a/frontend/app_flowy/assets/images/editor/drop_menu/hide.svg b/frontend/appflowy_flutter/assets/images/editor/drop_menu/hide.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/drop_menu/hide.svgrename to frontend/appflowy_flutter/assets/images/editor/drop_menu/hide.svgdiff --git a/frontend/app_flowy/assets/images/editor/drop_menu/show.svg b/frontend/appflowy_flutter/assets/images/editor/drop_menu/show.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/drop_menu/show.svgrename to frontend/appflowy_flutter/assets/images/editor/drop_menu/show.svgdiff --git a/frontend/app_flowy/assets/images/editor/edit.svg b/frontend/appflowy_flutter/assets/images/editor/edit.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/edit.svgrename to frontend/appflowy_flutter/assets/images/editor/edit.svgdiff --git a/frontend/app_flowy/assets/images/editor/editor_check.svg b/frontend/appflowy_flutter/assets/images/editor/editor_check.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/editor_check.svgrename to frontend/appflowy_flutter/assets/images/editor/editor_check.svgdiff --git a/frontend/app_flowy/assets/images/editor/editor_uncheck.svg b/frontend/appflowy_flutter/assets/images/editor/editor_uncheck.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/editor_uncheck.svgrename to frontend/appflowy_flutter/assets/images/editor/editor_uncheck.svgdiff --git a/frontend/app_flowy/assets/images/editor/euro.svg b/frontend/appflowy_flutter/assets/images/editor/euro.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/euro.svgrename to frontend/appflowy_flutter/assets/images/editor/euro.svgdiff --git a/frontend/app_flowy/assets/images/editor/full_view.svg b/frontend/appflowy_flutter/assets/images/editor/full_view.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/full_view.svgrename to frontend/appflowy_flutter/assets/images/editor/full_view.svgdiff --git a/frontend/app_flowy/assets/images/editor/grid.svg b/frontend/appflowy_flutter/assets/images/editor/grid.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/grid.svgrename to frontend/appflowy_flutter/assets/images/editor/grid.svgdiff --git a/frontend/app_flowy/assets/images/editor/group.svg b/frontend/appflowy_flutter/assets/images/editor/group.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/group.svgrename to frontend/appflowy_flutter/assets/images/editor/group.svgdiff --git a/frontend/app_flowy/assets/images/editor/hide.svg b/frontend/appflowy_flutter/assets/images/editor/hide.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/hide.svgrename to frontend/appflowy_flutter/assets/images/editor/hide.svgdiff --git a/frontend/app_flowy/assets/images/editor/highlight.svg b/frontend/appflowy_flutter/assets/images/editor/highlight.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/highlight.svgrename to frontend/appflowy_flutter/assets/images/editor/highlight.svgdiff --git a/frontend/app_flowy/assets/images/editor/image.svg b/frontend/appflowy_flutter/assets/images/editor/image.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/image.svgrename to frontend/appflowy_flutter/assets/images/editor/image.svgdiff --git a/frontend/app_flowy/assets/images/editor/import.svg b/frontend/appflowy_flutter/assets/images/editor/import.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/import.svgrename to frontend/appflowy_flutter/assets/images/editor/import.svgdiff --git a/frontend/app_flowy/assets/images/editor/inline_block.svg b/frontend/appflowy_flutter/assets/images/editor/inline_block.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/inline_block.svgrename to frontend/appflowy_flutter/assets/images/editor/inline_block.svgdiff --git a/frontend/app_flowy/assets/images/editor/insert_emoticon.svg b/frontend/appflowy_flutter/assets/images/editor/insert_emoticon.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/insert_emoticon.svgrename to frontend/appflowy_flutter/assets/images/editor/insert_emoticon.svgdiff --git a/frontend/app_flowy/assets/images/editor/insert_emoticon_2.svg b/frontend/appflowy_flutter/assets/images/editor/insert_emoticon_2.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/insert_emoticon_2.svgrename to frontend/appflowy_flutter/assets/images/editor/insert_emoticon_2.svgdiff --git a/frontend/app_flowy/assets/images/editor/italic.svg b/frontend/appflowy_flutter/assets/images/editor/italic.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/italic.svgrename to frontend/appflowy_flutter/assets/images/editor/italic.svgdiff --git a/frontend/app_flowy/assets/images/editor/left.svg b/frontend/appflowy_flutter/assets/images/editor/left.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/left.svgrename to frontend/appflowy_flutter/assets/images/editor/left.svgdiff --git a/frontend/app_flowy/assets/images/editor/level.svg b/frontend/appflowy_flutter/assets/images/editor/level.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/level.svgrename to frontend/appflowy_flutter/assets/images/editor/level.svgdiff --git a/frontend/app_flowy/assets/images/editor/list_dropdown.svg b/frontend/appflowy_flutter/assets/images/editor/list_dropdown.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/list_dropdown.svgrename to frontend/appflowy_flutter/assets/images/editor/list_dropdown.svgdiff --git a/frontend/app_flowy/assets/images/editor/logout.svg b/frontend/appflowy_flutter/assets/images/editor/logout.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/logout.svgrename to frontend/appflowy_flutter/assets/images/editor/logout.svgdiff --git a/frontend/app_flowy/assets/images/editor/messages.svg b/frontend/appflowy_flutter/assets/images/editor/messages.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/messages.svgrename to frontend/appflowy_flutter/assets/images/editor/messages.svgdiff --git a/frontend/app_flowy/assets/images/editor/more.svg b/frontend/appflowy_flutter/assets/images/editor/more.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/more.svgrename to frontend/appflowy_flutter/assets/images/editor/more.svgdiff --git a/frontend/app_flowy/assets/images/editor/numbers.svg b/frontend/appflowy_flutter/assets/images/editor/numbers.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/numbers.svgrename to frontend/appflowy_flutter/assets/images/editor/numbers.svgdiff --git a/frontend/app_flowy/assets/images/editor/page.svg b/frontend/appflowy_flutter/assets/images/editor/page.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/page.svgrename to frontend/appflowy_flutter/assets/images/editor/page.svgdiff --git a/frontend/app_flowy/assets/images/editor/percent.svg b/frontend/appflowy_flutter/assets/images/editor/percent.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/percent.svgrename to frontend/appflowy_flutter/assets/images/editor/percent.svgdiff --git a/frontend/app_flowy/assets/images/editor/persoin_1.svg b/frontend/appflowy_flutter/assets/images/editor/persoin_1.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/persoin_1.svgrename to frontend/appflowy_flutter/assets/images/editor/persoin_1.svgdiff --git a/frontend/app_flowy/assets/images/editor/person.svg b/frontend/appflowy_flutter/assets/images/editor/person.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/person.svgrename to frontend/appflowy_flutter/assets/images/editor/person.svgdiff --git a/frontend/app_flowy/assets/images/editor/pound.svg b/frontend/appflowy_flutter/assets/images/editor/pound.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/pound.svgrename to frontend/appflowy_flutter/assets/images/editor/pound.svgdiff --git a/frontend/app_flowy/assets/images/editor/quote.svg b/frontend/appflowy_flutter/assets/images/editor/quote.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/quote.svgrename to frontend/appflowy_flutter/assets/images/editor/quote.svgdiff --git a/frontend/app_flowy/assets/images/editor/report.svg b/frontend/appflowy_flutter/assets/images/editor/report.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/report.svgrename to frontend/appflowy_flutter/assets/images/editor/report.svgdiff --git a/frontend/app_flowy/assets/images/editor/resize.svg b/frontend/appflowy_flutter/assets/images/editor/resize.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/resize.svgrename to frontend/appflowy_flutter/assets/images/editor/resize.svgdiff --git a/frontend/app_flowy/assets/images/editor/restore.svg b/frontend/appflowy_flutter/assets/images/editor/restore.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/restore.svgrename to frontend/appflowy_flutter/assets/images/editor/restore.svgdiff --git a/frontend/app_flowy/assets/images/editor/right.svg b/frontend/appflowy_flutter/assets/images/editor/right.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/right.svgrename to frontend/appflowy_flutter/assets/images/editor/right.svgdiff --git a/frontend/app_flowy/assets/images/editor/search.svg b/frontend/appflowy_flutter/assets/images/editor/search.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/search.svgrename to frontend/appflowy_flutter/assets/images/editor/search.svgdiff --git a/frontend/app_flowy/assets/images/editor/send.svg b/frontend/appflowy_flutter/assets/images/editor/send.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/send.svgrename to frontend/appflowy_flutter/assets/images/editor/send.svgdiff --git a/frontend/app_flowy/assets/images/editor/settings.svg b/frontend/appflowy_flutter/assets/images/editor/settings.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/settings.svgrename to frontend/appflowy_flutter/assets/images/editor/settings.svgdiff --git a/frontend/app_flowy/assets/images/editor/share.svg b/frontend/appflowy_flutter/assets/images/editor/share.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/share.svgrename to frontend/appflowy_flutter/assets/images/editor/share.svgdiff --git a/frontend/app_flowy/assets/images/editor/show_menu.svg b/frontend/appflowy_flutter/assets/images/editor/show_menu.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/show_menu.svgrename to frontend/appflowy_flutter/assets/images/editor/show_menu.svgdiff --git a/frontend/app_flowy/assets/images/editor/slash.svg b/frontend/appflowy_flutter/assets/images/editor/slash.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/slash.svgrename to frontend/appflowy_flutter/assets/images/editor/slash.svgdiff --git a/frontend/app_flowy/assets/images/editor/status.svg b/frontend/appflowy_flutter/assets/images/editor/status.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/status.svgrename to frontend/appflowy_flutter/assets/images/editor/status.svgdiff --git a/frontend/app_flowy/assets/images/editor/strikethrough.svg b/frontend/appflowy_flutter/assets/images/editor/strikethrough.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/strikethrough.svgrename to frontend/appflowy_flutter/assets/images/editor/strikethrough.svgdiff --git a/frontend/app_flowy/assets/images/editor/tag.svg b/frontend/appflowy_flutter/assets/images/editor/tag.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/tag.svgrename to frontend/appflowy_flutter/assets/images/editor/tag.svgdiff --git a/frontend/app_flowy/assets/images/editor/tag_block.svg b/frontend/appflowy_flutter/assets/images/editor/tag_block.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/tag_block.svgrename to frontend/appflowy_flutter/assets/images/editor/tag_block.svgdiff --git a/frontend/app_flowy/assets/images/editor/template.svg b/frontend/appflowy_flutter/assets/images/editor/template.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/template.svgrename to frontend/appflowy_flutter/assets/images/editor/template.svgdiff --git a/frontend/app_flowy/assets/images/editor/text.svg b/frontend/appflowy_flutter/assets/images/editor/text.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/text.svgrename to frontend/appflowy_flutter/assets/images/editor/text.svgdiff --git a/frontend/app_flowy/assets/images/editor/time.svg b/frontend/appflowy_flutter/assets/images/editor/time.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/time.svgrename to frontend/appflowy_flutter/assets/images/editor/time.svgdiff --git a/frontend/app_flowy/assets/images/editor/timer_finish.svg b/frontend/appflowy_flutter/assets/images/editor/timer_finish.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/timer_finish.svgrename to frontend/appflowy_flutter/assets/images/editor/timer_finish.svgdiff --git a/frontend/app_flowy/assets/images/editor/timer_start.svg b/frontend/appflowy_flutter/assets/images/editor/timer_start.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/timer_start.svgrename to frontend/appflowy_flutter/assets/images/editor/timer_start.svgdiff --git a/frontend/app_flowy/assets/images/editor/toggle_list.svg b/frontend/appflowy_flutter/assets/images/editor/toggle_list.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/toggle_list.svgrename to frontend/appflowy_flutter/assets/images/editor/toggle_list.svgdiff --git a/frontend/app_flowy/assets/images/editor/underline.svg b/frontend/appflowy_flutter/assets/images/editor/underline.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/editor/underline.svgrename to frontend/appflowy_flutter/assets/images/editor/underline.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F42F.svg b/frontend/appflowy_flutter/assets/images/emoji/1F42F.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F42F.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F42F.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F431.svg b/frontend/appflowy_flutter/assets/images/emoji/1F431.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F431.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F431.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F435.svg b/frontend/appflowy_flutter/assets/images/emoji/1F435.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F435.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F435.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F43A.svg b/frontend/appflowy_flutter/assets/images/emoji/1F43A.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F43A.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F43A.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F600.svg b/frontend/appflowy_flutter/assets/images/emoji/1F600.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F600.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F600.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F984.svg b/frontend/appflowy_flutter/assets/images/emoji/1F984.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F984.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F984.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F9CC.svg b/frontend/appflowy_flutter/assets/images/emoji/1F9CC.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F9CC.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F9CC.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F9DB.svg b/frontend/appflowy_flutter/assets/images/emoji/1F9DB.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F9DB.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F9DB.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F9DD-200D-2642-FE0F.svg b/frontend/appflowy_flutter/assets/images/emoji/1F9DD-200D-2642-FE0F.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F9DD-200D-2642-FE0F.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F9DD-200D-2642-FE0F.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F9DE-200D-2642-FE0F.svg b/frontend/appflowy_flutter/assets/images/emoji/1F9DE-200D-2642-FE0F.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F9DE-200D-2642-FE0F.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F9DE-200D-2642-FE0F.svgdiff --git a/frontend/app_flowy/assets/images/emoji/1F9DF.svg b/frontend/appflowy_flutter/assets/images/emoji/1F9DF.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/emoji/1F9DF.svgrename to frontend/appflowy_flutter/assets/images/emoji/1F9DF.svgdiff --git a/frontend/app_flowy/assets/images/file_icon.jpg b/frontend/appflowy_flutter/assets/images/file_icon.jpgsimilarity index 100%rename from frontend/app_flowy/assets/images/file_icon.jpgrename to frontend/appflowy_flutter/assets/images/file_icon.jpgdiff --git a/frontend/app_flowy/assets/images/file_icon.svg b/frontend/appflowy_flutter/assets/images/file_icon.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/file_icon.svgrename to frontend/appflowy_flutter/assets/images/file_icon.svgdiff --git a/frontend/app_flowy/assets/images/flowy_logo.svg b/frontend/appflowy_flutter/assets/images/flowy_logo.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/flowy_logo.svgrename to frontend/appflowy_flutter/assets/images/flowy_logo.svgdiff --git a/frontend/app_flowy/assets/images/flowy_logo_dark_mode.svg b/frontend/appflowy_flutter/assets/images/flowy_logo_dark_mode.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/flowy_logo_dark_mode.svgrename to frontend/appflowy_flutter/assets/images/flowy_logo_dark_mode.svgdiff --git a/frontend/app_flowy/assets/images/flowy_logo_with_text.svg b/frontend/appflowy_flutter/assets/images/flowy_logo_with_text.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/flowy_logo_with_text.svgrename to frontend/appflowy_flutter/assets/images/flowy_logo_with_text.svgdiff --git a/frontend/app_flowy/assets/images/grid/checkmark.svg b/frontend/appflowy_flutter/assets/images/grid/checkmark.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/checkmark.svgrename to frontend/appflowy_flutter/assets/images/grid/checkmark.svgdiff --git a/frontend/app_flowy/assets/images/grid/clock.svg b/frontend/appflowy_flutter/assets/images/grid/clock.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/clock.svgrename to frontend/appflowy_flutter/assets/images/grid/clock.svgdiff --git a/frontend/app_flowy/assets/images/grid/delete.svg b/frontend/appflowy_flutter/assets/images/grid/delete.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/delete.svgrename to frontend/appflowy_flutter/assets/images/grid/delete.svgdiff --git a/frontend/app_flowy/assets/images/grid/details.svg b/frontend/appflowy_flutter/assets/images/grid/details.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/details.svgrename to frontend/appflowy_flutter/assets/images/grid/details.svgdiff --git a/frontend/app_flowy/assets/images/grid/duplicate.svg b/frontend/appflowy_flutter/assets/images/grid/duplicate.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/duplicate.svgrename to frontend/appflowy_flutter/assets/images/grid/duplicate.svgdiff --git a/frontend/app_flowy/assets/images/grid/expander.svg b/frontend/appflowy_flutter/assets/images/grid/expander.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/expander.svgrename to frontend/appflowy_flutter/assets/images/grid/expander.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/checkbox.svg b/frontend/appflowy_flutter/assets/images/grid/field/checkbox.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/checkbox.svgrename to frontend/appflowy_flutter/assets/images/grid/field/checkbox.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/checklist.svg b/frontend/appflowy_flutter/assets/images/grid/field/checklist.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/checklist.svgrename to frontend/appflowy_flutter/assets/images/grid/field/checklist.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/date.svg b/frontend/appflowy_flutter/assets/images/grid/field/date.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/date.svgrename to frontend/appflowy_flutter/assets/images/grid/field/date.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/euro.svg b/frontend/appflowy_flutter/assets/images/grid/field/euro.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/euro.svgrename to frontend/appflowy_flutter/assets/images/grid/field/euro.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/multi_select.svg b/frontend/appflowy_flutter/assets/images/grid/field/multi_select.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/multi_select.svgrename to frontend/appflowy_flutter/assets/images/grid/field/multi_select.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/number.svg b/frontend/appflowy_flutter/assets/images/grid/field/number.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/number.svgrename to frontend/appflowy_flutter/assets/images/grid/field/number.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/numbers.svg b/frontend/appflowy_flutter/assets/images/grid/field/numbers.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/numbers.svgrename to frontend/appflowy_flutter/assets/images/grid/field/numbers.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/single_select.svg b/frontend/appflowy_flutter/assets/images/grid/field/single_select.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/single_select.svgrename to frontend/appflowy_flutter/assets/images/grid/field/single_select.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/text.svg b/frontend/appflowy_flutter/assets/images/grid/field/text.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/text.svgrename to frontend/appflowy_flutter/assets/images/grid/field/text.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/url.svg b/frontend/appflowy_flutter/assets/images/grid/field/url.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/url.svgrename to frontend/appflowy_flutter/assets/images/grid/field/url.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/us_dollar.svg b/frontend/appflowy_flutter/assets/images/grid/field/us_dollar.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/us_dollar.svgrename to frontend/appflowy_flutter/assets/images/grid/field/us_dollar.svgdiff --git a/frontend/app_flowy/assets/images/grid/field/yen.svg b/frontend/appflowy_flutter/assets/images/grid/field/yen.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/field/yen.svgrename to frontend/appflowy_flutter/assets/images/grid/field/yen.svgdiff --git a/frontend/app_flowy/assets/images/grid/hide.svg b/frontend/appflowy_flutter/assets/images/grid/hide.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/hide.svgrename to frontend/appflowy_flutter/assets/images/grid/hide.svgdiff --git a/frontend/app_flowy/assets/images/grid/left.svg b/frontend/appflowy_flutter/assets/images/grid/left.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/left.svgrename to frontend/appflowy_flutter/assets/images/grid/left.svgdiff --git a/frontend/app_flowy/assets/images/grid/more.svg b/frontend/appflowy_flutter/assets/images/grid/more.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/more.svgrename to frontend/appflowy_flutter/assets/images/grid/more.svgdiff --git a/frontend/app_flowy/assets/images/grid/right.svg b/frontend/appflowy_flutter/assets/images/grid/right.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/right.svgrename to frontend/appflowy_flutter/assets/images/grid/right.svgdiff --git a/frontend/app_flowy/assets/images/grid/setting/ascending.svg b/frontend/appflowy_flutter/assets/images/grid/setting/ascending.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/setting/ascending.svgrename to frontend/appflowy_flutter/assets/images/grid/setting/ascending.svgdiff --git a/frontend/app_flowy/assets/images/grid/setting/descending.svg b/frontend/appflowy_flutter/assets/images/grid/setting/descending.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/setting/descending.svgrename to frontend/appflowy_flutter/assets/images/grid/setting/descending.svgdiff --git a/frontend/app_flowy/assets/images/grid/setting/filter.svg b/frontend/appflowy_flutter/assets/images/grid/setting/filter.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/setting/filter.svgrename to frontend/appflowy_flutter/assets/images/grid/setting/filter.svgdiff --git a/frontend/app_flowy/assets/images/grid/setting/group.svg b/frontend/appflowy_flutter/assets/images/grid/setting/group.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/setting/group.svgrename to frontend/appflowy_flutter/assets/images/grid/setting/group.svgdiff --git a/frontend/app_flowy/assets/images/grid/setting/properties.svg b/frontend/appflowy_flutter/assets/images/grid/setting/properties.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/setting/properties.svgrename to frontend/appflowy_flutter/assets/images/grid/setting/properties.svgdiff --git a/frontend/app_flowy/assets/images/grid/setting/setting.svg b/frontend/appflowy_flutter/assets/images/grid/setting/setting.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/setting/setting.svgrename to frontend/appflowy_flutter/assets/images/grid/setting/setting.svgdiff --git a/frontend/app_flowy/assets/images/grid/setting/sort.svg b/frontend/appflowy_flutter/assets/images/grid/setting/sort.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/grid/setting/sort.svgrename to frontend/appflowy_flutter/assets/images/grid/setting/sort.svgdiff --git a/frontend/app_flowy/assets/images/home/Favorite/active.svg b/frontend/appflowy_flutter/assets/images/home/Favorite/active.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/Favorite/active.svgrename to frontend/appflowy_flutter/assets/images/home/Favorite/active.svgdiff --git a/frontend/app_flowy/assets/images/home/Favorite/inactive.svg b/frontend/appflowy_flutter/assets/images/home/Favorite/inactive.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/Favorite/inactive.svgrename to frontend/appflowy_flutter/assets/images/home/Favorite/inactive.svgdiff --git a/frontend/app_flowy/assets/images/home/Sort/high.svg b/frontend/appflowy_flutter/assets/images/home/Sort/high.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/Sort/high.svgrename to frontend/appflowy_flutter/assets/images/home/Sort/high.svgdiff --git a/frontend/app_flowy/assets/images/home/Sort/low.svg b/frontend/appflowy_flutter/assets/images/home/Sort/low.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/Sort/low.svgrename to frontend/appflowy_flutter/assets/images/home/Sort/low.svgdiff --git a/frontend/app_flowy/assets/images/home/add.svg b/frontend/appflowy_flutter/assets/images/home/add.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/add.svgrename to frontend/appflowy_flutter/assets/images/home/add.svgdiff --git a/frontend/app_flowy/assets/images/home/arrow_left.svg b/frontend/appflowy_flutter/assets/images/home/arrow_left.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/arrow_left.svgrename to frontend/appflowy_flutter/assets/images/home/arrow_left.svgdiff --git a/frontend/app_flowy/assets/images/home/arrow_right.svg b/frontend/appflowy_flutter/assets/images/home/arrow_right.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/arrow_right.svgrename to frontend/appflowy_flutter/assets/images/home/arrow_right.svgdiff --git a/frontend/app_flowy/assets/images/home/close.svg b/frontend/appflowy_flutter/assets/images/home/close.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/close.svgrename to frontend/appflowy_flutter/assets/images/home/close.svgdiff --git a/frontend/app_flowy/assets/images/home/dashboard.svg b/frontend/appflowy_flutter/assets/images/home/dashboard.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/dashboard.svgrename to frontend/appflowy_flutter/assets/images/home/dashboard.svgdiff --git a/frontend/app_flowy/assets/images/home/details.svg b/frontend/appflowy_flutter/assets/images/home/details.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/details.svgrename to frontend/appflowy_flutter/assets/images/home/details.svgdiff --git a/frontend/app_flowy/assets/images/home/drop_down_hide.svg b/frontend/appflowy_flutter/assets/images/home/drop_down_hide.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/drop_down_hide.svgrename to frontend/appflowy_flutter/assets/images/home/drop_down_hide.svgdiff --git a/frontend/app_flowy/assets/images/home/drop_down_show.svg b/frontend/appflowy_flutter/assets/images/home/drop_down_show.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/drop_down_show.svgrename to frontend/appflowy_flutter/assets/images/home/drop_down_show.svgdiff --git a/frontend/app_flowy/assets/images/home/eathernet.svg b/frontend/appflowy_flutter/assets/images/home/eathernet.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/eathernet.svgrename to frontend/appflowy_flutter/assets/images/home/eathernet.svgdiff --git a/frontend/app_flowy/assets/images/home/favorite.svg b/frontend/appflowy_flutter/assets/images/home/favorite.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/favorite.svgrename to frontend/appflowy_flutter/assets/images/home/favorite.svgdiff --git a/frontend/app_flowy/assets/images/home/hide.svg b/frontend/appflowy_flutter/assets/images/home/hide.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/hide.svgrename to frontend/appflowy_flutter/assets/images/home/hide.svgdiff --git a/frontend/app_flowy/assets/images/home/hide_menu.svg b/frontend/appflowy_flutter/assets/images/home/hide_menu.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/hide_menu.svgrename to frontend/appflowy_flutter/assets/images/home/hide_menu.svgdiff --git a/frontend/app_flowy/assets/images/home/image.svg b/frontend/appflowy_flutter/assets/images/home/image.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/image.svgrename to frontend/appflowy_flutter/assets/images/home/image.svgdiff --git a/frontend/app_flowy/assets/images/home/level.svg b/frontend/appflowy_flutter/assets/images/home/level.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/level.svgrename to frontend/appflowy_flutter/assets/images/home/level.svgdiff --git a/frontend/app_flowy/assets/images/home/messages.svg b/frontend/appflowy_flutter/assets/images/home/messages.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/messages.svgrename to frontend/appflowy_flutter/assets/images/home/messages.svgdiff --git a/frontend/app_flowy/assets/images/home/new_app.svg b/frontend/appflowy_flutter/assets/images/home/new_app.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/new_app.svgrename to frontend/appflowy_flutter/assets/images/home/new_app.svgdiff --git a/frontend/app_flowy/assets/images/home/page.svg b/frontend/appflowy_flutter/assets/images/home/page.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/page.svgrename to frontend/appflowy_flutter/assets/images/home/page.svgdiff --git a/frontend/app_flowy/assets/images/home/person.svg b/frontend/appflowy_flutter/assets/images/home/person.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/person.svgrename to frontend/appflowy_flutter/assets/images/home/person.svgdiff --git a/frontend/app_flowy/assets/images/home/search.svg b/frontend/appflowy_flutter/assets/images/home/search.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/search.svgrename to frontend/appflowy_flutter/assets/images/home/search.svgdiff --git a/frontend/app_flowy/assets/images/home/settings.svg b/frontend/appflowy_flutter/assets/images/home/settings.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/settings.svgrename to frontend/appflowy_flutter/assets/images/home/settings.svgdiff --git a/frontend/app_flowy/assets/images/home/share.svg b/frontend/appflowy_flutter/assets/images/home/share.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/share.svgrename to frontend/appflowy_flutter/assets/images/home/share.svgdiff --git a/frontend/app_flowy/assets/images/home/show.svg b/frontend/appflowy_flutter/assets/images/home/show.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/show.svgrename to frontend/appflowy_flutter/assets/images/home/show.svgdiff --git a/frontend/app_flowy/assets/images/home/trash.svg b/frontend/appflowy_flutter/assets/images/home/trash.svgsimilarity index 100%rename from frontend/app_flowy/assets/images/home/trash.svgrename to frontend/appflowy_flutter/assets/images/home/trash.svgdiff --git a/frontend/app_flowy/assets/translations/ca-ES.json b/frontend/appflowy_flutter/assets/translations/ca-ES.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/ca-ES.jsonrename to frontend/appflowy_flutter/assets/translations/ca-ES.jsondiff --git a/frontend/app_flowy/assets/translations/de-DE.json b/frontend/appflowy_flutter/assets/translations/de-DE.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/de-DE.jsonrename to frontend/appflowy_flutter/assets/translations/de-DE.jsondiff --git a/frontend/app_flowy/assets/translations/en.json b/frontend/appflowy_flutter/assets/translations/en.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/en.jsonrename to frontend/appflowy_flutter/assets/translations/en.jsondiff --git a/frontend/app_flowy/assets/translations/es-VE.json b/frontend/appflowy_flutter/assets/translations/es-VE.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/es-VE.jsonrename to frontend/appflowy_flutter/assets/translations/es-VE.jsondiff --git a/frontend/app_flowy/assets/translations/eu-ES.json b/frontend/appflowy_flutter/assets/translations/eu-ES.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/eu-ES.jsonrename to frontend/appflowy_flutter/assets/translations/eu-ES.jsondiff --git a/frontend/app_flowy/assets/translations/fr-CA.json b/frontend/appflowy_flutter/assets/translations/fr-CA.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/fr-CA.jsonrename to frontend/appflowy_flutter/assets/translations/fr-CA.jsondiff --git a/frontend/app_flowy/assets/translations/fr-FR.json b/frontend/appflowy_flutter/assets/translations/fr-FR.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/fr-FR.jsonrename to frontend/appflowy_flutter/assets/translations/fr-FR.jsondiff --git a/frontend/app_flowy/assets/translations/hu-HU.json b/frontend/appflowy_flutter/assets/translations/hu-HU.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/hu-HU.jsonrename to frontend/appflowy_flutter/assets/translations/hu-HU.jsondiff --git a/frontend/app_flowy/assets/translations/id-ID.json b/frontend/appflowy_flutter/assets/translations/id-ID.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/id-ID.jsonrename to frontend/appflowy_flutter/assets/translations/id-ID.jsondiff --git a/frontend/app_flowy/assets/translations/it-IT.json b/frontend/appflowy_flutter/assets/translations/it-IT.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/it-IT.jsonrename to frontend/appflowy_flutter/assets/translations/it-IT.jsondiff --git a/frontend/app_flowy/assets/translations/ja-JP.json b/frontend/appflowy_flutter/assets/translations/ja-JP.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/ja-JP.jsonrename to frontend/appflowy_flutter/assets/translations/ja-JP.jsondiff --git a/frontend/app_flowy/assets/translations/ko-KR.json b/frontend/appflowy_flutter/assets/translations/ko-KR.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/ko-KR.jsonrename to frontend/appflowy_flutter/assets/translations/ko-KR.jsondiff --git a/frontend/app_flowy/assets/translations/pl-PL.json b/frontend/appflowy_flutter/assets/translations/pl-PL.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/pl-PL.jsonrename to frontend/appflowy_flutter/assets/translations/pl-PL.jsondiff --git a/frontend/app_flowy/assets/translations/pt-BR.json b/frontend/appflowy_flutter/assets/translations/pt-BR.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/pt-BR.jsonrename to frontend/appflowy_flutter/assets/translations/pt-BR.jsondiff --git a/frontend/app_flowy/assets/translations/pt-PT.json b/frontend/appflowy_flutter/assets/translations/pt-PT.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/pt-PT.jsonrename to frontend/appflowy_flutter/assets/translations/pt-PT.jsondiff --git a/frontend/app_flowy/assets/translations/ru-RU.json b/frontend/appflowy_flutter/assets/translations/ru-RU.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/ru-RU.jsonrename to frontend/appflowy_flutter/assets/translations/ru-RU.jsondiff --git a/frontend/app_flowy/assets/translations/sv.json b/frontend/appflowy_flutter/assets/translations/sv.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/sv.jsonrename to frontend/appflowy_flutter/assets/translations/sv.jsondiff --git a/frontend/app_flowy/assets/translations/tr-TR.json b/frontend/appflowy_flutter/assets/translations/tr-TR.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/tr-TR.jsonrename to frontend/appflowy_flutter/assets/translations/tr-TR.jsondiff --git a/frontend/app_flowy/assets/translations/zh-CN.json b/frontend/appflowy_flutter/assets/translations/zh-CN.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/zh-CN.jsonrename to frontend/appflowy_flutter/assets/translations/zh-CN.jsondiff --git a/frontend/app_flowy/assets/translations/zh-TW.json b/frontend/appflowy_flutter/assets/translations/zh-TW.jsonsimilarity index 100%rename from frontend/app_flowy/assets/translations/zh-TW.jsonrename to frontend/appflowy_flutter/assets/translations/zh-TW.jsondiff --git a/frontend/app_flowy/integration_test/switch_folder_test.dart b/frontend/appflowy_flutter/integration_test/switch_folder_test.dartsimilarity index 98%rename from frontend/app_flowy/integration_test/switch_folder_test.dartrename to frontend/appflowy_flutter/integration_test/switch_folder_test.dartindex b8382ce5ed..ad372e32a8 100644--- a/frontend/app_flowy/integration_test/switch_folder_test.dart+++ b/frontend/appflowy_flutter/integration_test/switch_folder_test.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/user/presentation/folder/folder_widget.dart';+import 'package:appflowy/user/presentation/folder/folder_widget.dart';import 'package:flowy_infra_ui/style_widget/text_field.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';diff --git a/frontend/app_flowy/integration_test/util/base.dart b/frontend/appflowy_flutter/integration_test/util/base.dartsimilarity index 93%rename from frontend/app_flowy/integration_test/util/base.dartrename to frontend/appflowy_flutter/integration_test/util/base.dartindex 12d13d17d8..3525fc5871 100644--- a/frontend/app_flowy/integration_test/util/base.dart+++ b/frontend/appflowy_flutter/integration_test/util/base.dart@@ -1,8 +1,8 @@import 'dart:io';-import 'package:app_flowy/main.dart' as app;-import 'package:app_flowy/startup/tasks/prelude.dart';-import 'package:app_flowy/workspace/application/settings/settings_location_cubit.dart';+import 'package:appflowy/main.dart' as app;+import 'package:appflowy/startup/tasks/prelude.dart';+import 'package:appflowy/workspace/application/settings/settings_location_cubit.dart';import 'package:flutter/gestures.dart';import 'package:flutter/services.dart';import 'package:flutter_test/flutter_test.dart';diff --git a/frontend/app_flowy/integration_test/util/launch.dart b/frontend/appflowy_flutter/integration_test/util/launch.dartsimilarity index 81%rename from frontend/app_flowy/integration_test/util/launch.dartrename to frontend/appflowy_flutter/integration_test/util/launch.dartindex 91ad77a435..5f2cc6ba09 100644--- a/frontend/app_flowy/integration_test/util/launch.dart+++ b/frontend/appflowy_flutter/integration_test/util/launch.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter_test/flutter_test.dart';diff --git a/frontend/app_flowy/integration_test/util/mock/mock_file_picker.dart b/frontend/appflowy_flutter/integration_test/util/mock/mock_file_picker.dartsimilarity index 73%rename from frontend/app_flowy/integration_test/util/mock/mock_file_picker.dartrename to frontend/appflowy_flutter/integration_test/util/mock/mock_file_picker.dartindex 7aa9ba5528..240b3ac58e 100644--- a/frontend/app_flowy/integration_test/util/mock/mock_file_picker.dart+++ b/frontend/appflowy_flutter/integration_test/util/mock/mock_file_picker.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/util/file_picker/file_picker_impl.dart';-import 'package:app_flowy/util/file_picker/file_picker_service.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/util/file_picker/file_picker_impl.dart';+import 'package:appflowy/util/file_picker/file_picker_service.dart';import '../util.dart';diff --git a/frontend/app_flowy/integration_test/util/settings.dart b/frontend/appflowy_flutter/integration_test/util/settings.dartsimilarity index 90%rename from frontend/app_flowy/integration_test/util/settings.dartrename to frontend/appflowy_flutter/integration_test/util/settings.dartindex 5633cca6ec..76da12966c 100644--- a/frontend/app_flowy/integration_test/util/settings.dart+++ b/frontend/appflowy_flutter/integration_test/util/settings.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/presentation/settings/settings_dialog.dart';-import 'package:app_flowy/workspace/presentation/settings/widgets/settings_user_view.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/presentation/settings/settings_dialog.dart';+import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter_test/flutter_test.dart';diff --git a/frontend/app_flowy/integration_test/util/util.dart b/frontend/appflowy_flutter/integration_test/util/util.dartsimilarity index 100%rename from frontend/app_flowy/integration_test/util/util.dartrename to frontend/appflowy_flutter/integration_test/util/util.dartdiff --git a/frontend/app_flowy/ios/.gitignore b/frontend/appflowy_flutter/ios/.gitignoresimilarity index 100%rename from frontend/app_flowy/ios/.gitignorerename to frontend/appflowy_flutter/ios/.gitignorediff --git a/frontend/app_flowy/ios/Flutter/AppFrameworkInfo.plist b/frontend/appflowy_flutter/ios/Flutter/AppFrameworkInfo.plistsimilarity index 100%rename from frontend/app_flowy/ios/Flutter/AppFrameworkInfo.plistrename to frontend/appflowy_flutter/ios/Flutter/AppFrameworkInfo.plistdiff --git a/frontend/app_flowy/ios/Flutter/Debug.xcconfig b/frontend/appflowy_flutter/ios/Flutter/Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/ios/Flutter/Debug.xcconfigrename to frontend/appflowy_flutter/ios/Flutter/Debug.xcconfigdiff --git a/frontend/app_flowy/ios/Flutter/Release.xcconfig b/frontend/appflowy_flutter/ios/Flutter/Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/ios/Flutter/Release.xcconfigrename to frontend/appflowy_flutter/ios/Flutter/Release.xcconfigdiff --git a/frontend/app_flowy/ios/Podfile b/frontend/appflowy_flutter/ios/Podfilesimilarity index 100%rename from frontend/app_flowy/ios/Podfilerename to frontend/appflowy_flutter/ios/Podfilediff --git a/frontend/app_flowy/ios/Podfile.lock b/frontend/appflowy_flutter/ios/Podfile.locksimilarity index 100%rename from frontend/app_flowy/ios/Podfile.lockrename to frontend/appflowy_flutter/ios/Podfile.lockdiff --git a/frontend/app_flowy/ios/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/ios/Runner.xcodeproj/project.pbxprojsimilarity index 100%rename from frontend/app_flowy/ios/Runner.xcodeproj/project.pbxprojrename to frontend/appflowy_flutter/ios/Runner.xcodeproj/project.pbxprojdiff --git a/frontend/app_flowy/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/frontend/appflowy_flutter/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingssimilarity index 100%rename from frontend/app_flowy/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsrename to frontend/appflowy_flutter/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsdiff --git a/frontend/app_flowy/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/appflowy_flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemesimilarity index 100%rename from frontend/app_flowy/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemerename to frontend/appflowy_flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemediff --git a/frontend/app_flowy/ios/Runner.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/ios/Runner.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/ios/Runner.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/ios/Runner.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/frontend/appflowy_flutter/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingssimilarity index 100%rename from frontend/app_flowy/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsrename to frontend/appflowy_flutter/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsdiff --git a/frontend/app_flowy/ios/Runner/AppDelegate.swift b/frontend/appflowy_flutter/ios/Runner/AppDelegate.swiftsimilarity index 100%rename from frontend/app_flowy/ios/Runner/AppDelegate.swiftrename to frontend/appflowy_flutter/ios/Runner/AppDelegate.swiftdiff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonrename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsondiff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonrename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsondiff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngsimilarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngrename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngdiff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]similarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]rename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]diff --git a/frontend/app_flowy/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mdsimilarity index 100%rename from frontend/app_flowy/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mdrename to frontend/appflowy_flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mddiff --git a/frontend/app_flowy/ios/Runner/Base.lproj/LaunchScreen.storyboard b/frontend/appflowy_flutter/ios/Runner/Base.lproj/LaunchScreen.storyboardsimilarity index 100%rename from frontend/app_flowy/ios/Runner/Base.lproj/LaunchScreen.storyboardrename to frontend/appflowy_flutter/ios/Runner/Base.lproj/LaunchScreen.storyboarddiff --git a/frontend/app_flowy/ios/Runner/Base.lproj/Main.storyboard b/frontend/appflowy_flutter/ios/Runner/Base.lproj/Main.storyboardsimilarity index 100%rename from frontend/app_flowy/ios/Runner/Base.lproj/Main.storyboardrename to frontend/appflowy_flutter/ios/Runner/Base.lproj/Main.storyboarddiff --git a/frontend/app_flowy/ios/Runner/Info.plist b/frontend/appflowy_flutter/ios/Runner/Info.plistsimilarity index 97%rename from frontend/app_flowy/ios/Runner/Info.plistrename to frontend/appflowy_flutter/ios/Runner/Info.plistindex 122f6a8cd7..30ff8f9df7 100644--- a/frontend/app_flowy/ios/Runner/Info.plist+++ b/frontend/appflowy_flutter/ios/Runner/Info.plist@@ -11,7 +11,7 @@<key>CFBundleInfoDictionaryVersion</key><string>6.0</string><key>CFBundleName</key>- <string>app_flowy</string>+ <string>appflowy_flutter</string><key>CFBundlePackageType</key><string>APPL</string><key>CFBundleShortVersionString</key>diff --git a/frontend/app_flowy/ios/Runner/Runner-Bridging-Header.h b/frontend/appflowy_flutter/ios/Runner/Runner-Bridging-Header.hsimilarity index 100%rename from frontend/app_flowy/ios/Runner/Runner-Bridging-Header.hrename to frontend/appflowy_flutter/ios/Runner/Runner-Bridging-Header.hdiff --git a/frontend/app_flowy/lib/core/folder_notification.dart b/frontend/appflowy_flutter/lib/core/folder_notification.dartsimilarity index 100%rename from frontend/app_flowy/lib/core/folder_notification.dartrename to frontend/appflowy_flutter/lib/core/folder_notification.dartdiff --git a/frontend/app_flowy/lib/core/frameless_window.dart b/frontend/appflowy_flutter/lib/core/frameless_window.dartsimilarity index 100%rename from frontend/app_flowy/lib/core/frameless_window.dartrename to frontend/appflowy_flutter/lib/core/frameless_window.dartdiff --git a/frontend/app_flowy/lib/core/grid_notification.dart b/frontend/appflowy_flutter/lib/core/grid_notification.dartsimilarity index 100%rename from frontend/app_flowy/lib/core/grid_notification.dartrename to frontend/appflowy_flutter/lib/core/grid_notification.dartdiff --git a/frontend/app_flowy/lib/core/helpers/helpers.dart b/frontend/appflowy_flutter/lib/core/helpers/helpers.dartsimilarity index 100%rename from frontend/app_flowy/lib/core/helpers/helpers.dartrename to frontend/appflowy_flutter/lib/core/helpers/helpers.dartdiff --git a/frontend/app_flowy/lib/core/helpers/target_platform.dart b/frontend/appflowy_flutter/lib/core/helpers/target_platform.dartsimilarity index 100%rename from frontend/app_flowy/lib/core/helpers/target_platform.dartrename to frontend/appflowy_flutter/lib/core/helpers/target_platform.dartdiff --git a/frontend/app_flowy/lib/core/network_monitor.dart b/frontend/appflowy_flutter/lib/core/network_monitor.dartsimilarity index 100%rename from frontend/app_flowy/lib/core/network_monitor.dartrename to frontend/appflowy_flutter/lib/core/network_monitor.dartdiff --git a/frontend/app_flowy/lib/core/notification_helper.dart b/frontend/appflowy_flutter/lib/core/notification_helper.dartsimilarity index 100%rename from frontend/app_flowy/lib/core/notification_helper.dartrename to frontend/appflowy_flutter/lib/core/notification_helper.dartdiff --git a/frontend/app_flowy/lib/core/user_notification.dart b/frontend/appflowy_flutter/lib/core/user_notification.dartsimilarity index 100%rename from frontend/app_flowy/lib/core/user_notification.dartrename to frontend/appflowy_flutter/lib/core/user_notification.dartdiff --git a/frontend/app_flowy/lib/main.dart b/frontend/appflowy_flutter/lib/main.dartsimilarity index 100%rename from frontend/app_flowy/lib/main.dartrename to frontend/appflowy_flutter/lib/main.dartdiff --git a/frontend/app_flowy/lib/plugins/blank/blank.dart b/frontend/appflowy_flutter/lib/plugins/blank/blank.dartsimilarity index 89%rename from frontend/app_flowy/lib/plugins/blank/blank.dartrename to frontend/appflowy_flutter/lib/plugins/blank/blank.dartindex ce3f8356d7..ff3c081403 100644--- a/frontend/app_flowy/lib/plugins/blank/blank.dart+++ b/frontend/appflowy_flutter/lib/plugins/blank/blank.dart@@ -1,9 +1,9 @@-import 'package:app_flowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:easy_localization/easy_localization.dart';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/startup/plugin/plugin.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/startup/plugin/plugin.dart';class BlankPluginBuilder extends PluginBuilder {@overridediff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_cache.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_cache.dartsimilarity index 79%rename from frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_cache.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_cache.dartindex cd29ab3b9e..d62a9ca858 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_cache.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_cache.dart@@ -1,20 +1,20 @@part of 'cell_service.dart';-typedef GridCellMap = LinkedHashMap<String, GridCellIdentifier>;+typedef CellByFieldId = LinkedHashMap<String, CellIdentifier>;-class GridCell {+class GridBaseCell {dynamic object;- GridCell({+ GridBaseCell({required this.object,});}/// Use to index the cell in the grid./// We use [fieldId + rowId] to identify the cell.-class GridCellCacheKey {+class CellCacheKey {final String fieldId;final String rowId;- GridCellCacheKey({+ CellCacheKey({required this.fieldId,required this.rowId,});@@ -24,27 +24,27 @@ class GridCellCacheKey {/// We use GridCellCacheKey to index the cell in the cache./// Read https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/architecture/frontend/grid/// for more information-class GridCellCache {- final String databaseId;+class CellCache {+ final String viewId;/// fieldId: {cacheKey: GridCell}final Map<String, Map<String, dynamic>> _cellDataByFieldId = {};- GridCellCache({- required this.databaseId,+ CellCache({+ required this.viewId,});void removeCellWithFieldId(String fieldId) {_cellDataByFieldId.remove(fieldId);}- void remove(GridCellCacheKey key) {+ void remove(CellCacheKey key) {var map = _cellDataByFieldId[key.fieldId];if (map != null) {map.remove(key.rowId);}}- void insert<T extends GridCell>(GridCellCacheKey key, T value) {+ void insert<T extends GridBaseCell>(CellCacheKey key, T value) {var map = _cellDataByFieldId[key.fieldId];if (map == null) {_cellDataByFieldId[key.fieldId] = {};@@ -54,7 +54,7 @@ class GridCellCache {map![key.rowId] = value.object;}- T? get<T>(GridCellCacheKey key) {+ T? get<T>(CellCacheKey key) {final map = _cellDataByFieldId[key.fieldId];if (map == null) {return null;diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_controller.dartsimilarity index 77%rename from frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_controller.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_controller.dartindex 1a59d443ca..bc7d6e83f0 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_controller.dart@@ -1,41 +1,40 @@part of 'cell_service.dart';-typedef GridTextCellController = GridCellController<String, String>;-typedef GridCheckboxCellController = GridCellController<String, String>;-typedef GridNumberCellController = GridCellController<String, String>;-typedef GridSelectOptionCellController- = GridCellController<SelectOptionCellDataPB, String>;-typedef GridChecklistCellController- = GridCellController<SelectOptionCellDataPB, String>;-typedef GridDateCellController- = GridCellController<DateCellDataPB, CalendarData>;-typedef GridURLCellController = GridCellController<URLCellDataPB, String>;--abstract class GridCellControllerBuilderDelegate {- GridCellFieldNotifier buildFieldNotifier();+typedef TextCellController = CellController<String, String>;+typedef CheckboxCellController = CellController<String, String>;+typedef NumberCellController = CellController<String, String>;+typedef SelectOptionCellController+ = CellController<SelectOptionCellDataPB, String>;+typedef ChecklistCellController+ = CellController<SelectOptionCellDataPB, String>;+typedef DateCellController = CellController<DateCellDataPB, CalendarData>;+typedef URLCellController = CellController<URLCellDataPB, String>;++abstract class CellControllerBuilderDelegate {+ CellFieldNotifier buildFieldNotifier();}-class GridCellControllerBuilder {- final GridCellIdentifier _cellId;- final GridCellCache _cellCache;- final GridCellControllerBuilderDelegate delegate;+class CellControllerBuilder {+ final CellIdentifier _cellId;+ final CellCache _cellCache;+ final CellControllerBuilderDelegate delegate;- GridCellControllerBuilder({+ CellControllerBuilder({required this.delegate,- required GridCellIdentifier cellId,- required GridCellCache cellCache,+ required CellIdentifier cellId,+ required CellCache cellCache,}) : _cellCache = cellCache,_cellId = cellId;- GridCellController build() {+ CellController build() {final cellFieldNotifier = delegate.buildFieldNotifier();switch (_cellId.fieldType) {case FieldType.Checkbox:- final cellDataLoader = GridCellDataLoader(+ final cellDataLoader = CellDataLoader(cellId: _cellId,parser: StringCellDataParser(),);- return GridTextCellController(+ return TextCellController(cellId: _cellId,cellCache: _cellCache,cellDataLoader: cellDataLoader,@@ -43,13 +42,13 @@ class GridCellControllerBuilder {cellDataPersistence: TextCellDataPersistence(cellId: _cellId),);case FieldType.DateTime:- final cellDataLoader = GridCellDataLoader(+ final cellDataLoader = CellDataLoader(cellId: _cellId,parser: DateCellDataParser(),reloadOnFieldChanged: true,);- return GridDateCellController(+ return DateCellController(cellId: _cellId,cellCache: _cellCache,cellDataLoader: cellDataLoader,@@ -57,12 +56,12 @@ class GridCellControllerBuilder {cellDataPersistence: DateCellDataPersistence(cellId: _cellId),);case FieldType.Number:- final cellDataLoader = GridCellDataLoader(+ final cellDataLoader = CellDataLoader(cellId: _cellId,parser: StringCellDataParser(),reloadOnFieldChanged: true,);- return GridNumberCellController(+ return NumberCellController(cellId: _cellId,cellCache: _cellCache,cellDataLoader: cellDataLoader,@@ -70,11 +69,11 @@ class GridCellControllerBuilder {cellDataPersistence: TextCellDataPersistence(cellId: _cellId),);case FieldType.RichText:- final cellDataLoader = GridCellDataLoader(+ final cellDataLoader = CellDataLoader(cellId: _cellId,parser: StringCellDataParser(),);- return GridTextCellController(+ return TextCellController(cellId: _cellId,cellCache: _cellCache,cellDataLoader: cellDataLoader,@@ -84,13 +83,13 @@ class GridCellControllerBuilder {case FieldType.MultiSelect:case FieldType.SingleSelect:case FieldType.Checklist:- final cellDataLoader = GridCellDataLoader(+ final cellDataLoader = CellDataLoader(cellId: _cellId,parser: SelectOptionCellDataParser(),reloadOnFieldChanged: true,);- return GridSelectOptionCellController(+ return SelectOptionCellController(cellId: _cellId,cellCache: _cellCache,cellDataLoader: cellDataLoader,@@ -99,11 +98,11 @@ class GridCellControllerBuilder {);case FieldType.URL:- final cellDataLoader = GridCellDataLoader(+ final cellDataLoader = CellDataLoader(cellId: _cellId,parser: URLCellDataParser(),);- return GridURLCellController(+ return URLCellController(cellId: _cellId,cellCache: _cellCache,cellDataLoader: cellDataLoader,@@ -123,14 +122,14 @@ class GridCellControllerBuilder {/// Generic D represents the type of data that will be saved to the disk///// ignore: must_be_immutable-class GridCellController<T, D> extends Equatable {- final GridCellIdentifier cellId;- final GridCellCache _cellsCache;- final GridCellCacheKey _cacheKey;- final FieldService _fieldService;- final GridCellFieldNotifier _fieldNotifier;- final GridCellDataLoader<T> _cellDataLoader;- final GridCellDataPersistence<D> _cellDataPersistence;+class CellController<T, D> extends Equatable {+ final CellIdentifier cellId;+ final CellCache _cellsCache;+ final CellCacheKey _cacheKey;+ final FieldBackendService _fieldBackendSvc;+ final CellFieldNotifier _fieldNotifier;+ final CellDataLoader<T> _cellDataLoader;+ final CellDataPersistence<D> _cellDataPersistence;CellListener? _cellListener;CellDataNotifier<T?>? _cellDataNotifier;@@ -141,26 +140,26 @@ class GridCellController<T, D> extends Equatable {Timer? _saveDataOperation;bool _isDispose = false;- GridCellController({+ CellController({required this.cellId,- required GridCellCache cellCache,- required GridCellFieldNotifier fieldNotifier,- required GridCellDataLoader<T> cellDataLoader,- required GridCellDataPersistence<D> cellDataPersistence,+ required CellCache cellCache,+ required CellFieldNotifier fieldNotifier,+ required CellDataLoader<T> cellDataLoader,+ required CellDataPersistence<D> cellDataPersistence,}) : _cellsCache = cellCache,_cellDataLoader = cellDataLoader,_cellDataPersistence = cellDataPersistence,_fieldNotifier = fieldNotifier,- _fieldService = FieldService(- viewId: cellId.databaseId,+ _fieldBackendSvc = FieldBackendService(+ viewId: cellId.viewId,fieldId: cellId.fieldInfo.id,),- _cacheKey = GridCellCacheKey(+ _cacheKey = CellCacheKey(rowId: cellId.rowId,fieldId: cellId.fieldInfo.id,);- String get databaseId => cellId.databaseId;+ String get viewId => cellId.viewId;String get rowId => cellId.rowId;@@ -254,9 +253,9 @@ class GridCellController<T, D> extends Equatable {/// Return the TypeOptionPB that can be parsed into corresponding class using the [parser]./// [PD] is the type that the parser return.- Future<Either<PD, FlowyError>>- getFieldTypeOption<PD, P extends TypeOptionDataParser>(P parser) {- return _fieldService+ Future<Either<PD, FlowyError>> getTypeOption<PD, P extends TypeOptionParser>(+ P parser) {+ return _fieldBackendSvc.getFieldTypeOptionData(fieldType: fieldType).then((result) {return result.fold(@@ -295,7 +294,7 @@ class GridCellController<T, D> extends Equatable {_loadDataOperation = Timer(const Duration(milliseconds: 10), () {_cellDataLoader.loadData().then((data) {if (data != null) {- _cellsCache.insert(_cacheKey, GridCell(object: data));+ _cellsCache.insert(_cacheKey, GridBaseCell(object: data));} else {_cellsCache.remove(_cacheKey);}@@ -329,12 +328,11 @@ class GridCellController<T, D> extends Equatable {[_cellsCache.get(_cacheKey) ?? "", cellId.rowId + cellId.fieldInfo.id];}-class GridCellFieldNotifierImpl extends IGridCellFieldNotifier {- final GridFieldController _fieldController;+class GridCellFieldNotifierImpl extends ICellFieldNotifier {+ final FieldController _fieldController;OnReceiveUpdateFields? _onChangesetFn;- GridCellFieldNotifierImpl(GridFieldController cache)- : _fieldController = cache;+ GridCellFieldNotifierImpl(FieldController cache) : _fieldController = cache;@overridevoid onCellDispose() {@@ -352,7 +350,7 @@ class GridCellFieldNotifierImpl extends IGridCellFieldNotifier {}};_fieldController.addListener(- onFieldsUpdated: _onChangesetFn,+ onReceiveFields: _onChangesetFn,);}}diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_loader.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_data_loader.dartsimilarity index 75%rename from frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_loader.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_data_loader.dartindex 7c269df6d2..f6c67e219e 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_loader.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_data_loader.dart@@ -5,17 +5,17 @@ abstract class IGridCellDataConfig {bool get reloadOnFieldChanged;}-abstract class GridCellDataParser<T> {+abstract class CellDataParser<T> {T? parserData(List<int> data);}-class GridCellDataLoader<T> {- final CellService service = CellService();- final GridCellIdentifier cellId;- final GridCellDataParser<T> parser;+class CellDataLoader<T> {+ final CellBackendService service = CellBackendService();+ final CellIdentifier cellId;+ final CellDataParser<T> parser;final bool reloadOnFieldChanged;- GridCellDataLoader({+ CellDataLoader({required this.cellId,required this.parser,this.reloadOnFieldChanged = false,@@ -43,7 +43,7 @@ class GridCellDataLoader<T> {}}-class StringCellDataParser implements GridCellDataParser<String> {+class StringCellDataParser implements CellDataParser<String> {@overrideString? parserData(List<int> data) {final s = utf8.decode(data);@@ -51,7 +51,7 @@ class StringCellDataParser implements GridCellDataParser<String> {}}-class DateCellDataParser implements GridCellDataParser<DateCellDataPB> {+class DateCellDataParser implements CellDataParser<DateCellDataPB> {@overrideDateCellDataPB? parserData(List<int> data) {if (data.isEmpty) {@@ -62,7 +62,7 @@ class DateCellDataParser implements GridCellDataParser<DateCellDataPB> {}class SelectOptionCellDataParser- implements GridCellDataParser<SelectOptionCellDataPB> {+ implements CellDataParser<SelectOptionCellDataPB> {@overrideSelectOptionCellDataPB? parserData(List<int> data) {if (data.isEmpty) {@@ -72,7 +72,7 @@ class SelectOptionCellDataParser}}-class URLCellDataParser implements GridCellDataParser<URLCellDataPB> {+class URLCellDataParser implements CellDataParser<URLCellDataPB> {@overrideURLCellDataPB? parserData(List<int> data) {if (data.isEmpty) {diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_persistence.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_data_persistence.dartsimilarity index 72%rename from frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_persistence.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_data_persistence.dartindex d1a4284ae8..f2b06c51c7 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_data_persistence.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_data_persistence.dart@@ -2,22 +2,21 @@ part of 'cell_service.dart';/// Save the cell data to disk/// You can extend this class to do custom operations. For example, the DateCellDataPersistence.-abstract class GridCellDataPersistence<D> {+abstract class CellDataPersistence<D> {Future<Option<FlowyError>> save(D data);}-class TextCellDataPersistence implements GridCellDataPersistence<String> {- final GridCellIdentifier cellId;+class TextCellDataPersistence implements CellDataPersistence<String> {+ final CellIdentifier cellId;+ final _cellBackendSvc = CellBackendService();TextCellDataPersistence({required this.cellId,});- final CellService _cellService = CellService();@overrideFuture<Option<FlowyError>> save(String data) async {- final fut = _cellService.updateCell(cellId: cellId, data: data);-+ final fut = _cellBackendSvc.updateCell(cellId: cellId, data: data);return fut.then((result) {return result.fold((l) => none(),@@ -33,8 +32,8 @@ class CalendarData with _$CalendarData {_CalendarData;}-class DateCellDataPersistence implements GridCellDataPersistence<CalendarData> {- final GridCellIdentifier cellId;+class DateCellDataPersistence implements CellDataPersistence<CalendarData> {+ final CellIdentifier cellId;DateCellDataPersistence({required this.cellId,});@@ -60,9 +59,9 @@ class DateCellDataPersistence implements GridCellDataPersistence<CalendarData> {}}-CellIdPB _makeCellPath(GridCellIdentifier cellId) {+CellIdPB _makeCellPath(CellIdentifier cellId) {return CellIdPB.create()- ..databaseId = cellId.databaseId+ ..viewId = cellId.viewId..fieldId = cellId.fieldId..rowId = cellId.rowId;}diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_field_notifier.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_field_notifier.dartsimilarity index 80%rename from frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_field_notifier.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_field_notifier.dartindex f643500c55..02fc0b7261 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_field_notifier.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_field_notifier.dart@@ -1,23 +1,22 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:flutter/foundation.dart';-+import '../field/field_controller.dart';import 'cell_service.dart';-abstract class IGridCellFieldNotifier {+abstract class ICellFieldNotifier {void onCellFieldChanged(void Function(FieldInfo) callback);void onCellDispose();}/// DatabasePB's cell helper wrapper that enables each cell will get notified when the corresponding field was changed./// You Register an onFieldChanged callback to listen to the cell changes, and unregister if you don't want to listen.-class GridCellFieldNotifier {- final IGridCellFieldNotifier notifier;+class CellFieldNotifier {+ final ICellFieldNotifier notifier;/// fieldId: {objectId: callback}final Map<String, Map<String, List<VoidCallback>>> _fieldListenerByFieldId ={};- GridCellFieldNotifier({required this.notifier}) {+ CellFieldNotifier({required this.notifier}) {notifier.onCellFieldChanged((field) {final map = _fieldListenerByFieldId[field.id];@@ -33,7 +32,7 @@ class GridCellFieldNotifier {}///- void register(GridCellCacheKey cacheKey, VoidCallback onFieldChanged) {+ void register(CellCacheKey cacheKey, VoidCallback onFieldChanged) {var map = _fieldListenerByFieldId[cacheKey.fieldId];if (map == null) {_fieldListenerByFieldId[cacheKey.fieldId] = {};@@ -49,7 +48,7 @@ class GridCellFieldNotifier {}}- void unregister(GridCellCacheKey cacheKey, VoidCallback fn) {+ void unregister(CellCacheKey cacheKey, VoidCallback fn) {var callbacks = _fieldListenerByFieldId[cacheKey.fieldId]?[cacheKey.rowId];final index = callbacks?.indexWhere((callback) => callback == fn);if (index != null && index != -1) {diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_listener.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_listener.dartsimilarity index 96%rename from frontend/app_flowy/lib/plugins/grid/application/cell/cell_listener.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_listener.dartindex 59dbea1952..749d2b2baa 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_listener.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/core/grid_notification.dart';+import 'package:appflowy/core/grid_notification.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/notification.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_service.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_service.dartsimilarity index 74%rename from frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_service.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_service.dartindex fdf2973593..9d3ab3344e 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_service.dart@@ -12,30 +12,28 @@ import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dimport 'package:appflowy_backend/protobuf/flowy-database/url_type_option_entities.pb.dart';import 'package:flutter/foundation.dart';import 'package:freezed_annotation/freezed_annotation.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/field_controller.dart';-import '../../field/type_option/type_option_context.dart';+import '../field/field_controller.dart';+import '../field/field_service.dart';+import '../field/type_option/type_option_context.dart';import 'cell_field_notifier.dart';+import 'cell_listener.dart';part 'cell_service.freezed.dart';part 'cell_data_loader.dart';part 'cell_controller.dart';part 'cell_cache.dart';part 'cell_data_persistence.dart';-// key: rowId--class CellService {- CellService();+class CellBackendService {+ CellBackendService();Future<Either<void, FlowyError>> updateCell({- required GridCellIdentifier cellId,+ required CellIdentifier cellId,required String data,}) {final payload = CellChangesetPB.create()- ..databaseId = cellId.databaseId+ ..viewId = cellId.viewId..fieldId = cellId.fieldId..rowId = cellId.rowId..typeCellData = data;@@ -43,10 +41,10 @@ class CellService {}Future<Either<CellPB, FlowyError>> getCell({- required GridCellIdentifier cellId,+ required CellIdentifier cellId,}) {final payload = CellIdPB.create()- ..databaseId = cellId.databaseId+ ..viewId = cellId.viewId..fieldId = cellId.fieldId..rowId = cellId.rowId;return DatabaseEventGetCell(payload).send();@@ -56,15 +54,15 @@ class CellService {/// Id of the cell/// We can locate the cell by using database + rowId + field.id.@freezed-class GridCellIdentifier with _$GridCellIdentifier {- const factory GridCellIdentifier({- required String databaseId,+class CellIdentifier with _$CellIdentifier {+ const factory CellIdentifier({+ required String viewId,required String rowId,required FieldInfo fieldInfo,- }) = _GridCellIdentifier;+ }) = _CellIdentifier;// ignore: unused_element- const GridCellIdentifier._();+ const CellIdentifier._();String get fieldId => fieldInfo.id;diff --git a/frontend/app_flowy/lib/plugins/grid/application/grid_service.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/database_service.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/grid/application/grid_service.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/database_service.dartindex c2aa2384b5..289acbebfc 100644--- a/frontend/app_flowy/lib/plugins/grid/application/grid_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/database_service.dart@@ -7,9 +7,9 @@ import 'package:appflowy_backend/protobuf/flowy-database/grid_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/group.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';-class DatabaseFFIService {+class DatabaseBackendService {final String viewId;- DatabaseFFIService({+ DatabaseBackendService({required this.viewId,});diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/application/defines.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/defines.dartnew file mode 100644index 0000000000..1e5beccbc2--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/defines.dart@@ -0,0 +1,18 @@+import 'dart:collection';++import 'package:appflowy_backend/protobuf/flowy-database/grid_entities.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';++import '../grid/presentation/widgets/filter/filter_info.dart';+import 'field/field_controller.dart';+import 'row/row_cache.dart';++typedef OnFieldsChanged = void Function(UnmodifiableListView<FieldInfo>);+typedef OnFiltersChanged = void Function(List<FilterInfo>);+typedef OnDatabaseChanged = void Function(DatabasePB);+typedef OnRowsChanged = void Function(+ List<RowInfo>,+ RowsChangedReason,+);++typedef OnError = void Function(FlowyError);diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_action_sheet_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_action_sheet_bloc.dartsimilarity index 95%rename from frontend/app_flowy/lib/plugins/grid/application/field/field_action_sheet_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_action_sheet_bloc.dartindex c6add37b80..354bafbf1f 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/field_action_sheet_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_action_sheet_bloc.dart@@ -9,10 +9,10 @@ part 'field_action_sheet_bloc.freezed.dart';class FieldActionSheetBlocextends Bloc<FieldActionSheetEvent, FieldActionSheetState> {- final FieldService fieldService;+ final FieldBackendService fieldService;- FieldActionSheetBloc({required GridFieldCellContext fieldCellContext})- : fieldService = FieldService(+ FieldActionSheetBloc({required FieldCellContext fieldCellContext})+ : fieldService = FieldBackendService(viewId: fieldCellContext.viewId,fieldId: fieldCellContext.field.id,),diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_cell_bloc.dartsimilarity index 82%rename from frontend/app_flowy/lib/plugins/grid/application/field/field_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_cell_bloc.dartindex 2ba48eaa55..d96e08e86b 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/field_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_cell_bloc.dart@@ -1,21 +1,22 @@-import 'package:app_flowy/plugins/grid/application/field/field_listener.dart';-import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';+import 'field_listener.dart';+import 'field_service.dart';+part 'field_cell_bloc.freezed.dart';class FieldCellBloc extends Bloc<FieldCellEvent, FieldCellState> {final SingleFieldListener _fieldListener;- final FieldService _fieldService;+ final FieldBackendService _fieldBackendSvc;FieldCellBloc({- required GridFieldCellContext cellContext,+ required FieldCellContext cellContext,}) : _fieldListener = SingleFieldListener(fieldId: cellContext.field.id),- _fieldService = FieldService(+ _fieldBackendSvc = FieldBackendService(viewId: cellContext.viewId, fieldId: cellContext.field.id),super(FieldCellState.initial(cellContext)) {on<FieldCellEvent>(@@ -33,7 +34,7 @@ class FieldCellBloc extends Bloc<FieldCellEvent, FieldCellState> {},endUpdateWidth: () {if (state.width != state.field.width.toDouble()) {- _fieldService.updateField(width: state.width);+ _fieldBackendSvc.updateField(width: state.width);}},);@@ -73,14 +74,14 @@ class FieldCellEvent with _$FieldCellEvent {@freezedclass FieldCellState with _$FieldCellState {const factory FieldCellState({- required String databaseId,+ required String viewId,required FieldPB field,required double width,}) = _FieldCellState;- factory FieldCellState.initial(GridFieldCellContext cellContext) =>+ factory FieldCellState.initial(FieldCellContext cellContext) =>FieldCellState(- databaseId: cellContext.viewId,+ viewId: cellContext.viewId,field: cellContext.field,width: cellContext.field.width.toDouble(),);diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_controller.dartsimilarity index 85%rename from frontend/app_flowy/lib/plugins/grid/application/field/field_controller.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_controller.dartindex 523c6e020a..7e169cde09 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/field_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_controller.dart@@ -1,14 +1,4 @@import 'dart:collection';-import 'package:app_flowy/plugins/grid/application/field/grid_listener.dart';-import 'package:app_flowy/plugins/grid/application/filter/filter_listener.dart';-import 'package:app_flowy/plugins/grid/application/filter/filter_service.dart';-import 'package:app_flowy/plugins/grid/application/grid_service.dart';-import 'package:app_flowy/plugins/grid/application/setting/setting_listener.dart';-import 'package:app_flowy/plugins/grid/application/setting/setting_service.dart';-import 'package:app_flowy/plugins/grid/application/sort/sort_listener.dart';-import 'package:app_flowy/plugins/grid/application/sort/sort_service.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/sort/sort_info.dart';import 'package:appflowy_backend/protobuf/flowy-database/filter_changeset.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/sort_entities.pb.dart';import 'package:dartz/dartz.dart';@@ -19,7 +9,17 @@ import 'package:appflowy_backend/protobuf/flowy-database/group.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/util.pb.dart';import 'package:flutter/foundation.dart';+import '../../grid/presentation/widgets/filter/filter_info.dart';+import '../../grid/presentation/widgets/sort/sort_info.dart';+import '../database_service.dart';+import '../filter/filter_listener.dart';+import '../filter/filter_service.dart';import '../row/row_cache.dart';+import '../setting/setting_listener.dart';+import '../setting/setting_service.dart';+import '../sort/sort_listener.dart';+import '../sort/sort_service.dart';+import 'field_listener.dart';class _GridFieldNotifier extends ChangeNotifier {List<FieldInfo> _fieldInfos = [];@@ -71,19 +71,19 @@ typedef OnReceiveFields = void Function(List<FieldInfo>);typedef OnReceiveFilters = void Function(List<FilterInfo>);typedef OnReceiveSorts = void Function(List<SortInfo>);-class GridFieldController {- final String databaseId;+class FieldController {+ final String viewId;// Listeners- final DatabaseFieldsListener _fieldListener;+ final FieldsListener _fieldListener;final DatabaseSettingListener _settingListener;final FiltersListener _filtersListener;final SortsListener _sortsListener;// FFI services- final DatabaseFFIService _gridFFIService;- final SettingFFIService _settingFFIService;- final FilterFFIService _filterFFIService;- final SortFFIService _sortFFIService;+ final DatabaseBackendService _databaseBackendSvc;+ final SettingBackendService _settingBackendSvc;+ final FilterBackendService _filterBackendSvc;+ final SortBackendService _sortBackendSvc;// Field callbacksfinal Map<OnReceiveFields, VoidCallback> _fieldCallbacks = {};@@ -147,15 +147,15 @@ class GridFieldController {return sorts.first;}- GridFieldController({required this.databaseId})- : _fieldListener = DatabaseFieldsListener(databaseId: databaseId),- _settingListener = DatabaseSettingListener(databaseId: databaseId),- _filterFFIService = FilterFFIService(viewId: databaseId),- _filtersListener = FiltersListener(viewId: databaseId),- _gridFFIService = DatabaseFFIService(viewId: databaseId),- _sortFFIService = SortFFIService(viewId: databaseId),- _sortsListener = SortsListener(viewId: databaseId),- _settingFFIService = SettingFFIService(viewId: databaseId) {+ FieldController({required this.viewId})+ : _fieldListener = FieldsListener(viewId: viewId),+ _settingListener = DatabaseSettingListener(viewId: viewId),+ _filterBackendSvc = FilterBackendService(viewId: viewId),+ _filtersListener = FiltersListener(viewId: viewId),+ _databaseBackendSvc = DatabaseBackendService(viewId: viewId),+ _sortBackendSvc = SortBackendService(viewId: viewId),+ _sortsListener = SortsListener(viewId: viewId),+ _settingBackendSvc = SettingBackendService(viewId: viewId) {//Listen on field's changes_listenOnFieldChanges();@@ -168,7 +168,7 @@ class GridFieldController {//Listen on the sort changes_listenOnSortChanged();- _settingFFIService.getSetting().then((result) {+ _settingBackendSvc.getSetting().then((result) {result.fold((setting) => _updateSetting(setting),(err) => Log.error(err),@@ -209,7 +209,7 @@ class GridFieldController {);if (fieldInfo != null) {_filterPBByFieldId[fieldInfo.id] = newFilter;- filters.add(FilterInfo(databaseId, newFilter, fieldInfo));+ filters.add(FilterInfo(viewId, newFilter, fieldInfo));}}}@@ -243,7 +243,7 @@ class GridFieldController {// Insert the filter with the position: filterIndex, otherwise,// append it to the end of the list.final filterInfo =- FilterInfo(databaseId, updatedFilter.filter, fieldInfo);+ FilterInfo(viewId, updatedFilter.filter, fieldInfo);if (filterIndex != -1) {filters.insert(filterIndex, filterInfo);} else {@@ -381,9 +381,9 @@ class GridFieldController {_deleteFields(changeset.deletedFields);_insertFields(changeset.insertedFields);- final updateFields = _updateFields(changeset.updatedFields);+ final updatedFields = _updateFields(changeset.updatedFields);for (final listener in _updatedFieldCallbacks.values) {- listener(updateFields);+ listener(updatedFields);}},(err) => Log.error(err),@@ -448,7 +448,7 @@ class GridFieldController {Future<Either<Unit, FlowyError>> loadFields({required List<FieldIdPB> fieldIds,}) async {- final result = await _gridFFIService.getFields(fieldIds: fieldIds);+ final result = await _databaseBackendSvc.getFields(fieldIds: fieldIds);return Future(() => result.fold((newFields) {@@ -465,7 +465,7 @@ class GridFieldController {}Future<Either<Unit, FlowyError>> _loadFilters() async {- return _filterFFIService.getAllFilters().then((result) {+ return _filterBackendSvc.getAllFilters().then((result) {return result.fold((filterPBs) {final List<FilterInfo> filters = [];@@ -476,7 +476,7 @@ class GridFieldController {fieldType: filterPB.fieldType,);if (fieldInfo != null) {- final filterInfo = FilterInfo(databaseId, filterPB, fieldInfo);+ final filterInfo = FilterInfo(viewId, filterPB, fieldInfo);filters.add(filterInfo);}}@@ -490,7 +490,7 @@ class GridFieldController {}Future<Either<Unit, FlowyError>> _loadSorts() async {- return _sortFFIService.getAllSorts().then((result) {+ return _sortBackendSvc.getAllSorts().then((result) {return result.fold((sortPBs) {final List<SortInfo> sortInfos = [];@@ -517,32 +517,32 @@ class GridFieldController {}void addListener({- OnReceiveFields? onFields,- OnReceiveUpdateFields? onFieldsUpdated,+ OnReceiveFields? onReceiveFields,+ OnReceiveUpdateFields? onFieldsChanged,OnReceiveFilters? onFilters,OnReceiveSorts? onSorts,bool Function()? listenWhen,}) {- if (onFieldsUpdated != null) {+ if (onFieldsChanged != null) {callback(List<FieldInfo> updateFields) {if (listenWhen != null && listenWhen() == false) {return;}- onFieldsUpdated(updateFields);+ onFieldsChanged(updateFields);}- _updatedFieldCallbacks[onFieldsUpdated] = callback;+ _updatedFieldCallbacks[onFieldsChanged] = callback;}- if (onFields != null) {+ if (onReceiveFields != null) {callback() {if (listenWhen != null && listenWhen() == false) {return;}- onFields(fieldInfos);+ onReceiveFields(fieldInfos);}- _fieldCallbacks[onFields] = callback;+ _fieldCallbacks[onReceiveFields] = callback;_fieldNotifier?.addListener(callback);}@@ -652,32 +652,21 @@ class GridFieldController {}}-class GridRowFieldNotifierImpl extends RowChangesetNotifierForward- with RowCacheDelegate {- final GridFieldController _cache;- OnReceiveUpdateFields? _onChangesetFn;+class RowDelegatesImpl extends RowFieldsDelegate with RowCacheDelegate {+ final FieldController _cache;OnReceiveFields? _onFieldFn;- GridRowFieldNotifierImpl(GridFieldController cache) : _cache = cache;+ RowDelegatesImpl(FieldController cache) : _cache = cache;@overrideUnmodifiableListView<FieldInfo> get fields =>UnmodifiableListView(_cache.fieldInfos);@override- void onRowFieldsChanged(VoidCallback callback) {- _onFieldFn = (_) => callback();- _cache.addListener(onFields: _onFieldFn);- }-- @override- void onRowFieldChanged(void Function(FieldInfo) callback) {- _onChangesetFn = (List<FieldInfo> fieldInfos) {- for (final updatedField in fieldInfos) {- callback(updatedField);- }+ void onFieldsChanged(void Function(List<FieldInfo>) callback) {+ _onFieldFn = (fieldInfos) {+ callback(fieldInfos);};-- _cache.addListener(onFieldsUpdated: _onChangesetFn);+ _cache.addListener(onReceiveFields: _onFieldFn);}@override@@ -686,11 +675,6 @@ class GridRowFieldNotifierImpl extends RowChangesetNotifierForward_cache.removeListener(onFieldsListener: _onFieldFn!);_onFieldFn = null;}-- if (_onChangesetFn != null) {- _cache.removeListener(onChangesetListener: _onChangesetFn!);- _onChangesetFn = null;- }}}diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_editor_bloc.dartsimilarity index 88%rename from frontend/app_flowy/lib/plugins/grid/application/field/field_editor_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_editor_bloc.dartindex 3a4012c5f9..586235eeaa 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/field_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_editor_bloc.dart@@ -13,13 +13,13 @@ class FieldEditorBloc extends Bloc<FieldEditorEvent, FieldEditorState> {final TypeOptionDataController dataController;FieldEditorBloc({- required String databaseId,+ required String viewId,required String fieldName,required bool isGroupField,required IFieldTypeOptionLoader loader,}) : dataController =- TypeOptionDataController(databaseId: databaseId, loader: loader),- super(FieldEditorState.initial(databaseId, fieldName, isGroupField)) {+ TypeOptionDataController(viewId: viewId, loader: loader),+ super(FieldEditorState.initial(viewId, fieldName, isGroupField)) {on<FieldEditorEvent>((event, emit) async {await event.when(@@ -48,8 +48,8 @@ class FieldEditorBloc extends Bloc<FieldEditorEvent, FieldEditorState> {state.field.fold(() => null,(field) {- final fieldService = FieldService(- viewId: databaseId,+ final fieldService = FieldBackendService(+ viewId: viewId,fieldId: field.id,);fieldService.deleteField();@@ -84,7 +84,7 @@ class FieldEditorEvent with _$FieldEditorEvent {@freezedclass FieldEditorState with _$FieldEditorState {const factory FieldEditorState({- required String databaseId,+ required String viewId,required String errorText,required String name,required Option<FieldPB> field,@@ -93,12 +93,12 @@ class FieldEditorState with _$FieldEditorState {}) = _FieldEditorState;factory FieldEditorState.initial(- String databaseId,+ String viewId,String fieldName,bool isGroupField,) =>FieldEditorState(- databaseId: databaseId,+ viewId: viewId,errorText: '',field: none(),canDelete: false,diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_listener.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_listener.dartsimilarity index 55%rename from frontend/app_flowy/lib/plugins/grid/application/field/field_listener.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_listener.dartindex ace470a8f3..bc6125859a 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/field_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_listener.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/core/grid_notification.dart';+import 'package:appflowy/core/grid_notification.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/notification.pb.dart';@@ -49,3 +49,43 @@ class SingleFieldListener {_updateFieldNotifier = null;}}++typedef UpdateFieldsNotifiedValue+ = Either<DatabaseFieldChangesetPB, FlowyError>;++class FieldsListener {+ final String viewId;+ PublishNotifier<UpdateFieldsNotifiedValue>? updateFieldsNotifier =+ PublishNotifier();+ DatabaseNotificationListener? _listener;+ FieldsListener({required this.viewId});++ void start(+ {required void Function(UpdateFieldsNotifiedValue) onFieldsChanged}) {+ updateFieldsNotifier?.addPublishListener(onFieldsChanged);+ _listener = DatabaseNotificationListener(+ objectId: viewId,+ handler: _handler,+ );+ }++ void _handler(DatabaseNotification ty, Either<Uint8List, FlowyError> result) {+ switch (ty) {+ case DatabaseNotification.DidUpdateFields:+ result.fold(+ (payload) => updateFieldsNotifier?.value =+ left(DatabaseFieldChangesetPB.fromBuffer(payload)),+ (error) => updateFieldsNotifier?.value = right(error),+ );+ break;+ default:+ break;+ }+ }++ Future<void> stop() async {+ await _listener?.stop();+ updateFieldsNotifier?.dispose();+ updateFieldsNotifier = null;+ }+}diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_service.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_service.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/grid/application/field/field_service.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_service.dartindex 793b90b100..c005870310 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/field_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_service.dart@@ -11,11 +11,11 @@ part 'field_service.freezed.dart';/// you can find the corresponding event implementation in event_map.rs of the corresponding crate.////// You could check out the rust-lib/flowy-database/event_map.rs for more information.-class FieldService {+class FieldBackendService {final String viewId;final String fieldId;- FieldService({required this.viewId, required this.fieldId});+ FieldBackendService({required this.viewId, required this.fieldId});Future<Either<Unit, FlowyError>> moveField(int fromIndex, int toIndex) {final payload = MoveFieldPayloadPB.create()@@ -35,7 +35,7 @@ class FieldService {double? width,}) {var payload = FieldChangesetPB.create()- ..databaseId = viewId+ ..viewId = viewId..fieldId = fieldId;if (name != null) {@@ -107,9 +107,9 @@ class FieldService {}@freezed-class GridFieldCellContext with _$GridFieldCellContext {- const factory GridFieldCellContext({+class FieldCellContext with _$FieldCellContext {+ const factory FieldCellContext({required String viewId,required FieldPB field,- }) = _GridFieldCellContext;+ }) = _FieldCellContext;}diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_type_option_edit_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_type_option_edit_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/application/field/field_type_option_edit_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/field_type_option_edit_bloc.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/date_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/date_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/application/field/type_option/date_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/date_bloc.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/edit_select_option_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/edit_select_option_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/application/field/type_option/edit_select_option_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/edit_select_option_bloc.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/multi_select_type_option.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/multi_select_type_option.dartsimilarity index 93%rename from frontend/app_flowy/lib/plugins/grid/application/field/type_option/multi_select_type_option.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/multi_select_type_option.dartindex 0d216f7c51..4a6eb5277a 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/multi_select_type_option.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/multi_select_type_option.dart@@ -8,17 +8,17 @@ import 'type_option_service.dart';import 'package:protobuf/protobuf.dart';class MultiSelectAction with ISelectOptionAction {- final String databaseId;+ final String viewId;final String fieldId;- final TypeOptionFFIService service;+ final TypeOptionBackendService service;final MultiSelectTypeOptionContext typeOptionContext;MultiSelectAction({- required this.databaseId,+ required this.viewId,required this.fieldId,required this.typeOptionContext,- }) : service = TypeOptionFFIService(- databaseId: databaseId,+ }) : service = TypeOptionBackendService(+ viewId: viewId,fieldId: fieldId,);diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/number_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/number_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/application/field/type_option/number_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/number_bloc.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/number_format_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/number_format_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/application/field/type_option/number_format_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/number_format_bloc.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/select_option_type_option_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/select_option_type_option_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/application/field/type_option/select_option_type_option_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/select_option_type_option_bloc.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/single_select_type_option.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/single_select_type_option.dartsimilarity index 93%rename from frontend/app_flowy/lib/plugins/grid/application/field/type_option/single_select_type_option.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/single_select_type_option.dartindex 2e67120fdb..d0c4d5a44e 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/single_select_type_option.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/single_select_type_option.dart@@ -8,16 +8,16 @@ import 'type_option_context.dart';import 'type_option_service.dart';class SingleSelectAction with ISelectOptionAction {- final String databaseId;+ final String viewId;final String fieldId;final SingleSelectTypeOptionContext typeOptionContext;- final TypeOptionFFIService service;+ final TypeOptionBackendService service;SingleSelectAction({- required this.databaseId,+ required this.viewId,required this.fieldId,required this.typeOptionContext,- }) : service = TypeOptionFFIService(databaseId: databaseId, fieldId: fieldId);+ }) : service = TypeOptionBackendService(viewId: viewId, fieldId: fieldId);SingleSelectTypeOptionPB get typeOption => typeOptionContext.typeOption;diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_context.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/type_option_context.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_context.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/type_option_context.dartindex cc2205e406..34ed5d161d 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_context.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/type_option_context.dart@@ -14,7 +14,7 @@ import 'package:protobuf/protobuf.dart';import 'type_option_data_controller.dart';-abstract class TypeOptionDataParser<T> {+abstract class TypeOptionParser<T> {T fromBuffer(List<int> buffer);}@@ -22,7 +22,7 @@ abstract class TypeOptionDataParser<T> {typedef NumberTypeOptionContext = TypeOptionContext<NumberTypeOptionPB>;class NumberTypeOptionWidgetDataParser- extends TypeOptionDataParser<NumberTypeOptionPB> {+ extends TypeOptionParser<NumberTypeOptionPB> {@overrideNumberTypeOptionPB fromBuffer(List<int> buffer) {return NumberTypeOptionPB.fromBuffer(buffer);@@ -33,7 +33,7 @@ class NumberTypeOptionWidgetDataParsertypedef RichTextTypeOptionContext = TypeOptionContext<RichTextTypeOptionPB>;class RichTextTypeOptionWidgetDataParser- extends TypeOptionDataParser<RichTextTypeOptionPB> {+ extends TypeOptionParser<RichTextTypeOptionPB> {@overrideRichTextTypeOptionPB fromBuffer(List<int> buffer) {return RichTextTypeOptionPB.fromBuffer(buffer);@@ -44,7 +44,7 @@ class RichTextTypeOptionWidgetDataParsertypedef CheckboxTypeOptionContext = TypeOptionContext<CheckboxTypeOptionPB>;class CheckboxTypeOptionWidgetDataParser- extends TypeOptionDataParser<CheckboxTypeOptionPB> {+ extends TypeOptionParser<CheckboxTypeOptionPB> {@overrideCheckboxTypeOptionPB fromBuffer(List<int> buffer) {return CheckboxTypeOptionPB.fromBuffer(buffer);@@ -54,8 +54,7 @@ class CheckboxTypeOptionWidgetDataParser// URLtypedef URLTypeOptionContext = TypeOptionContext<URLTypeOptionPB>;-class URLTypeOptionWidgetDataParser- extends TypeOptionDataParser<URLTypeOptionPB> {+class URLTypeOptionWidgetDataParser extends TypeOptionParser<URLTypeOptionPB> {@overrideURLTypeOptionPB fromBuffer(List<int> buffer) {return URLTypeOptionPB.fromBuffer(buffer);@@ -65,7 +64,7 @@ class URLTypeOptionWidgetDataParser// Datetypedef DateTypeOptionContext = TypeOptionContext<DateTypeOptionPB>;-class DateTypeOptionDataParser extends TypeOptionDataParser<DateTypeOptionPB> {+class DateTypeOptionDataParser extends TypeOptionParser<DateTypeOptionPB> {@overrideDateTypeOptionPB fromBuffer(List<int> buffer) {return DateTypeOptionPB.fromBuffer(buffer);@@ -77,7 +76,7 @@ typedef SingleSelectTypeOptionContext= TypeOptionContext<SingleSelectTypeOptionPB>;class SingleSelectTypeOptionWidgetDataParser- extends TypeOptionDataParser<SingleSelectTypeOptionPB> {+ extends TypeOptionParser<SingleSelectTypeOptionPB> {@overrideSingleSelectTypeOptionPB fromBuffer(List<int> buffer) {return SingleSelectTypeOptionPB.fromBuffer(buffer);@@ -89,7 +88,7 @@ typedef MultiSelectTypeOptionContext= TypeOptionContext<MultiSelectTypeOptionPB>;class MultiSelectTypeOptionWidgetDataParser- extends TypeOptionDataParser<MultiSelectTypeOptionPB> {+ extends TypeOptionParser<MultiSelectTypeOptionPB> {@overrideMultiSelectTypeOptionPB fromBuffer(List<int> buffer) {return MultiSelectTypeOptionPB.fromBuffer(buffer);@@ -100,7 +99,7 @@ class MultiSelectTypeOptionWidgetDataParsertypedef ChecklistTypeOptionContext = TypeOptionContext<ChecklistTypeOptionPB>;class ChecklistTypeOptionWidgetDataParser- extends TypeOptionDataParser<ChecklistTypeOptionPB> {+ extends TypeOptionParser<ChecklistTypeOptionPB> {@overrideChecklistTypeOptionPB fromBuffer(List<int> buffer) {return ChecklistTypeOptionPB.fromBuffer(buffer);@@ -109,7 +108,7 @@ class ChecklistTypeOptionWidgetDataParserclass TypeOptionContext<T extends GeneratedMessage> {T? _typeOptionObject;- final TypeOptionDataParser<T> dataParser;+ final TypeOptionParser<T> dataParser;final TypeOptionDataController _dataController;TypeOptionContext({@@ -117,7 +116,7 @@ class TypeOptionContext<T extends GeneratedMessage> {required TypeOptionDataController dataController,}) : _dataController = dataController;- String get databaseId => _dataController.databaseId;+ String get viewId => _dataController.viewId;String get fieldId => _dataController.field.id;diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_data_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/type_option_data_controller.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_data_controller.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/type_option_data_controller.dartindex 6ac4512927..b97257f0cc 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_data_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/type_option_data_controller.dart@@ -1,16 +1,16 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';import 'package:flowy_infra/notifier.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';-import 'package:app_flowy/plugins/grid/application/field/field_service.dart';import 'package:dartz/dartz.dart';import 'package:protobuf/protobuf.dart' hide FieldInfo;import 'package:appflowy_backend/log.dart';+import '../field_service.dart';import 'type_option_context.dart';class TypeOptionDataController {- final String databaseId;+ final String viewId;final IFieldTypeOptionLoader loader;late TypeOptionPB _typeOptiondata;final PublishNotifier<FieldPB> _fieldNotifier = PublishNotifier();@@ -22,13 +22,13 @@ class TypeOptionDataController {/// is null///TypeOptionDataController({- required this.databaseId,+ required this.viewId,required this.loader,FieldInfo? fieldInfo,}) {if (fieldInfo != null) {_typeOptiondata = TypeOptionPB.create()- ..viewId = databaseId+ ..viewId = viewId..field_2 = fieldInfo.field;}}@@ -53,7 +53,7 @@ class TypeOptionDataController {return _typeOptiondata.field_2;}- T getTypeOption<T>(TypeOptionDataParser<T> parser) {+ T getTypeOption<T>(TypeOptionParser<T> parser) {return parser.fromBuffer(_typeOptiondata.typeOptionData);}@@ -66,7 +66,8 @@ class TypeOptionDataController {_fieldNotifier.value = _typeOptiondata.field_2;- FieldService(viewId: databaseId, fieldId: field.id).updateField(name: name);+ FieldBackendService(viewId: viewId, fieldId: field.id)+ .updateField(name: name);}set typeOptionData(List<int> typeOptionData) {@@ -76,8 +77,8 @@ class TypeOptionDataController {}});- FieldService.updateFieldTypeOption(- viewId: databaseId,+ FieldBackendService.updateFieldTypeOption(+ viewId: viewId,fieldId: field.id,typeOptionData: typeOptionData,);diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_service.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/type_option_service.dartsimilarity index 82%rename from frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_service.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/type_option_service.dartindex ace4ac8819..b440a25af5 100644--- a/frontend/app_flowy/lib/plugins/grid/application/field/type_option/type_option_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/field/type_option/type_option_service.dart@@ -4,12 +4,12 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/cell_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';-class TypeOptionFFIService {- final String databaseId;+class TypeOptionBackendService {+ final String viewId;final String fieldId;- TypeOptionFFIService({- required this.databaseId,+ TypeOptionBackendService({+ required this.viewId,required this.fieldId,});@@ -18,7 +18,7 @@ class TypeOptionFFIService {}) {final payload = CreateSelectOptionPayloadPB.create()..optionName = name- ..databaseId = databaseId+ ..viewId = viewId..fieldId = fieldId;return DatabaseEventCreateSelectOption(payload).send();diff --git a/frontend/app_flowy/lib/plugins/grid/application/filter/filter_listener.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/filter/filter_listener.dartsimilarity index 98%rename from frontend/app_flowy/lib/plugins/grid/application/filter/filter_listener.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/filter/filter_listener.dartindex f580d79b2a..d309f995f1 100644--- a/frontend/app_flowy/lib/plugins/grid/application/filter/filter_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/filter/filter_listener.dart@@ -1,6 +1,6 @@import 'dart:typed_data';-import 'package:app_flowy/core/grid_notification.dart';+import 'package:appflowy/core/grid_notification.dart';import 'package:flowy_infra/notifier.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/notification.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/filter/filter_service.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/filter/filter_service.dartsimilarity index 98%rename from frontend/app_flowy/lib/plugins/grid/application/filter/filter_service.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/filter/filter_service.dartindex 564d546101..aaea678ece 100644--- a/frontend/app_flowy/lib/plugins/grid/application/filter/filter_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/filter/filter_service.dart@@ -14,9 +14,9 @@ import 'package:appflowy_backend/protobuf/flowy-database/text_filter.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/util.pb.dart';import 'package:fixnum/fixnum.dart' as $fixnum;-class FilterFFIService {+class FilterBackendService {final String viewId;- const FilterFFIService({required this.viewId});+ const FilterBackendService({required this.viewId});Future<Either<List<FilterPB>, FlowyError>> getAllFilters() {final payload = DatabaseViewIdPB()..value = viewId;diff --git a/frontend/app_flowy/lib/plugins/grid/application/row/row_cache.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_cache.dartsimilarity index 85%rename from frontend/app_flowy/lib/plugins/grid/application/row/row_cache.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_cache.dartindex 0631bc4caf..24aca7b186 100644--- a/frontend/app_flowy/lib/plugins/grid/application/row/row_cache.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_cache.dart@@ -1,20 +1,19 @@import 'dart:collection';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';import 'package:flutter/foundation.dart';import 'package:freezed_annotation/freezed_annotation.dart';+import '../cell/cell_service.dart';+import '../field/field_controller.dart';import 'row_list.dart';part 'row_cache.freezed.dart';typedef RowUpdateCallback = void Function();-abstract class RowChangesetNotifierForward {- void onRowFieldsChanged(VoidCallback callback);- void onRowFieldChanged(void Function(FieldInfo) callback);+abstract class RowFieldsDelegate {+ void onFieldsChanged(void Function(List<FieldInfo>) callback);}abstract class RowCacheDelegate {@@ -27,14 +26,14 @@ abstract class RowCacheDelegate {////// Read https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/architecture/frontend/grid for more information.-class GridRowCache {- final String databaseId;+class RowCache {+ final String viewId;/// _rows containers the current block's rows/// Use List to reverse the order of the GridRow.final RowList _rowList = RowList();- final GridCellCache _cellCache;+ final CellCache _cellCache;final RowCacheDelegate _delegate;final RowChangesetNotifier _rowChangeReasonNotifier;@@ -43,20 +42,23 @@ class GridRowCache {return UnmodifiableListView(visibleRows);}- GridCellCache get cellCache => _cellCache;+ CellCache get cellCache => _cellCache;- GridRowCache({- required this.databaseId,- required RowChangesetNotifierForward notifier,- required RowCacheDelegate delegate,- }) : _cellCache = GridCellCache(databaseId: databaseId),+ RowCache({+ required this.viewId,+ required RowFieldsDelegate fieldsDelegate,+ required RowCacheDelegate cacheDelegate,+ }) : _cellCache = CellCache(viewId: viewId),_rowChangeReasonNotifier = RowChangesetNotifier(),- _delegate = delegate {+ _delegate = cacheDelegate {//- notifier.onRowFieldsChanged(() => _rowChangeReasonNotifier- .receive(const RowsChangedReason.fieldDidChange()));- notifier.onRowFieldChanged(- (field) => _cellCache.removeCellWithFieldId(field.id));+ fieldsDelegate.onFieldsChanged((fieldInfos) {+ for (final fieldInfo in fieldInfos) {+ _cellCache.removeCellWithFieldId(fieldInfo.id);+ }+ _rowChangeReasonNotifier+ .receive(const RowsChangedReason.fieldDidChange());+ });}void initializeRows(List<RowPB> rows) {@@ -72,13 +74,13 @@ class GridRowCache {await _cellCache.dispose();}- void applyRowsChanged(ViewRowsChangesetPB changeset) {+ void applyRowsChanged(RowsChangesetPB changeset) {_deleteRows(changeset.deletedRows);_insertRows(changeset.insertedRows);_updateRows(changeset.updatedRows);}- void applyRowsVisibility(ViewRowsVisibilityChangesetPB changeset) {+ void applyRowsVisibility(RowsVisibilityChangesetPB changeset) {_hideRows(changeset.invisibleRows);_showRows(changeset.visibleRows);}@@ -125,7 +127,7 @@ class GridRowCache {List<RowPB> rowPBs = [];for (final updatedRow in updatedRows) {for (final fieldId in updatedRow.fieldIds) {- final key = GridCellCacheKey(+ final key = CellCacheKey(fieldId: fieldId,rowId: updatedRow.row.id,);@@ -169,7 +171,7 @@ class GridRowCache {RowUpdateCallback addListener({required String rowId,- void Function(GridCellMap, RowsChangedReason)? onCellUpdated,+ void Function(CellByFieldId, RowsChangedReason)? onCellUpdated,bool Function()? listenWhen,}) {listenerHandler() async {@@ -181,7 +183,7 @@ class GridRowCache {if (onCellUpdated != null) {final rowInfo = _rowList.get(rowId);if (rowInfo != null) {- final GridCellMap cellDataMap =+ final CellByFieldId cellDataMap =_makeGridCells(rowId, rowInfo.rowPB);onCellUpdated(cellDataMap, _rowChangeReasonNotifier.reason);}@@ -204,7 +206,7 @@ class GridRowCache {_rowChangeReasonNotifier.removeListener(callback);}- GridCellMap loadGridCells(String rowId) {+ CellByFieldId loadGridCells(String rowId) {final RowPB? data = _rowList.get(rowId)?.rowPB;if (data == null) {_loadRow(rowId);@@ -214,7 +216,7 @@ class GridRowCache {Future<void> _loadRow(String rowId) async {final payload = RowIdPB.create()- ..viewId = databaseId+ ..viewId = viewId..rowId = rowId;final result = await DatabaseEventGetRow(payload).send();@@ -224,14 +226,14 @@ class GridRowCache {);}- GridCellMap _makeGridCells(String rowId, RowPB? row) {+ CellByFieldId _makeGridCells(String rowId, RowPB? row) {// ignore: prefer_collection_literals- var cellDataMap = GridCellMap();+ var cellDataMap = CellByFieldId();for (final field in _delegate.fields) {if (field.visibility) {- cellDataMap[field.id] = GridCellIdentifier(+ cellDataMap[field.id] = CellIdentifier(rowId: rowId,- databaseId: databaseId,+ viewId: viewId,fieldInfo: field,);}@@ -265,7 +267,7 @@ class GridRowCache {RowInfo buildGridRow(RowPB rowPB) {return RowInfo(- databaseId: databaseId,+ viewId: viewId,fields: _delegate.fields,rowPB: rowPB,);@@ -294,7 +296,7 @@ class RowChangesetNotifier extends ChangeNotifier {@unfreezedclass RowInfo with _$RowInfo {factory RowInfo({- required String databaseId,+ required String viewId,required UnmodifiableListView<FieldInfo> fields,required RowPB rowPB,}) = _RowInfo;diff --git a/frontend/app_flowy/lib/plugins/grid/application/row/row_data_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_data_controller.dartsimilarity index 59%rename from frontend/app_flowy/lib/plugins/grid/application/row/row_data_controller.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_data_controller.dartindex cb622fcbce..1689bb3d90 100644--- a/frontend/app_flowy/lib/plugins/grid/application/row/row_data_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_data_controller.dart@@ -1,26 +1,26 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_field_notifier.dart';import 'package:flutter/material.dart';-import '../../presentation/widgets/cell/cell_builder.dart';-import '../cell/cell_service/cell_service.dart';+import '../../grid/presentation/widgets/cell/cell_builder.dart';+import '../cell/cell_field_notifier.dart';+import '../cell/cell_service.dart';import '../field/field_controller.dart';import 'row_cache.dart';-typedef OnRowChanged = void Function(GridCellMap, RowsChangedReason);+typedef OnRowChanged = void Function(CellByFieldId, RowsChangedReason);class RowDataController extends GridCellBuilderDelegate {final RowInfo rowInfo;final List<VoidCallback> _onRowChangedListeners = [];- final GridFieldController _fieldController;- final GridRowCache _rowCache;+ final FieldController _fieldController;+ final RowCache _rowCache;RowDataController({required this.rowInfo,- required GridFieldController fieldController,- required GridRowCache rowCache,+ required FieldController fieldController,+ required RowCache rowCache,}) : _fieldController = fieldController,_rowCache = rowCache;- GridCellMap loadData() {+ CellByFieldId loadData() {return _rowCache.loadGridCells(rowInfo.rowPB.id);}@@ -39,11 +39,11 @@ class RowDataController extends GridCellBuilderDelegate {// GridCellBuilderDelegate implementation@override- GridCellFieldNotifier buildFieldNotifier() {- return GridCellFieldNotifier(+ CellFieldNotifier buildFieldNotifier() {+ return CellFieldNotifier(notifier: GridCellFieldNotifierImpl(_fieldController));}@override- GridCellCache get cellCache => _rowCache.cellCache;+ CellCache get cellCache => _rowCache.cellCache;}diff --git a/frontend/app_flowy/lib/plugins/grid/application/row/row_list.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_list.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/application/row/row_list.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_list.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/application/row/row_service.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_service.dartsimilarity index 89%rename from frontend/app_flowy/lib/plugins/grid/application/row/row_service.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_service.dartindex 91900f4cf8..58553c8b87 100644--- a/frontend/app_flowy/lib/plugins/grid/application/row/row_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/row/row_service.dart@@ -5,16 +5,16 @@ import 'package:appflowy_backend/protobuf/flowy-database/grid_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/group_changeset.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';-class RowFFIService {- final String databaseId;+class RowBackendService {+ final String viewId;- RowFFIService({- required this.databaseId,+ RowBackendService({+ required this.viewId,});Future<Either<RowPB, FlowyError>> createRow(String rowId) {final payload = CreateRowPayloadPB.create()- ..viewId = databaseId+ ..viewId = viewId..startRowId = rowId;return DatabaseEventCreateRow(payload).send();@@ -22,7 +22,7 @@ class RowFFIService {Future<Either<OptionalRowPB, FlowyError>> getRow(String rowId) {final payload = RowIdPB.create()- ..viewId = databaseId+ ..viewId = viewId..rowId = rowId;return DatabaseEventGetRow(payload).send();@@ -30,7 +30,7 @@ class RowFFIService {Future<Either<Unit, FlowyError>> deleteRow(String rowId) {final payload = RowIdPB.create()- ..viewId = databaseId+ ..viewId = viewId..rowId = rowId;return DatabaseEventDeleteRow(payload).send();@@ -38,17 +38,17 @@ class RowFFIService {Future<Either<Unit, FlowyError>> duplicateRow(String rowId) {final payload = RowIdPB.create()- ..viewId = databaseId+ ..viewId = viewId..rowId = rowId;return DatabaseEventDuplicateRow(payload).send();}}-class MoveRowFFIService {+class GroupBackendService {final String viewId;- MoveRowFFIService({+ GroupBackendService({required this.viewId,});diff --git a/frontend/app_flowy/lib/plugins/grid/application/setting/group_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/group_bloc.dartsimilarity index 51%rename from frontend/app_flowy/lib/plugins/grid/application/setting/group_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/setting/group_bloc.dartindex 696e60c2fb..075c48c58d 100644--- a/frontend/app_flowy/lib/plugins/grid/application/setting/group_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/group_bloc.dart@@ -1,26 +1,25 @@+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/setting/setting_service.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import '../field/field_controller.dart';-import 'setting_service.dart';-part 'group_bloc.freezed.dart';-class GridGroupBloc extends Bloc<GridGroupEvent, GridGroupState> {- final GridFieldController _fieldController;- final SettingFFIService _settingFFIService;+class DatabaseGroupBloc extends Bloc<DatabaseGroupEvent, DatabaseGroupState> {+ final FieldController _fieldController;+ final SettingBackendService _settingBackendSvc;Function(List<FieldInfo>)? _onFieldsFn;- GridGroupBloc({+ DatabaseGroupBloc({required String viewId,- required GridFieldController fieldController,+ required FieldController fieldController,}) : _fieldController = fieldController,- _settingFFIService = SettingFFIService(viewId: viewId),- super(GridGroupState.initial(viewId, fieldController.fieldInfos)) {- on<GridGroupEvent>(+ _settingBackendSvc = SettingBackendService(viewId: viewId),+ super(DatabaseGroupState.initial(viewId, fieldController.fieldInfos)) {+ on<DatabaseGroupEvent>((event, emit) async {event.when(initial: () {@@ -30,7 +29,7 @@ class GridGroupBloc extends Bloc<GridGroupEvent, GridGroupState> {emit(state.copyWith(fieldContexts: fieldContexts));},setGroupByField: (String fieldId, FieldType fieldType) async {- final result = await _settingFFIService.groupByField(+ final result = await _settingBackendSvc.groupByField(fieldId: fieldId,fieldType: fieldType,);@@ -52,36 +51,36 @@ class GridGroupBloc extends Bloc<GridGroupEvent, GridGroupState> {void _startListening() {_onFieldsFn = (fieldContexts) =>- add(GridGroupEvent.didReceiveFieldUpdate(fieldContexts));+ add(DatabaseGroupEvent.didReceiveFieldUpdate(fieldContexts));_fieldController.addListener(- onFields: _onFieldsFn,+ onReceiveFields: _onFieldsFn,listenWhen: () => !isClosed,);}}@freezed-class GridGroupEvent with _$GridGroupEvent {- const factory GridGroupEvent.initial() = _Initial;- const factory GridGroupEvent.setGroupByField(+class DatabaseGroupEvent with _$DatabaseGroupEvent {+ const factory DatabaseGroupEvent.initial() = _Initial;+ const factory DatabaseGroupEvent.setGroupByField(String fieldId,FieldType fieldType,- ) = _GroupByField;- const factory GridGroupEvent.didReceiveFieldUpdate(List<FieldInfo> fields) =- _DidReceiveFieldUpdate;+ ) = _DatabaseGroupEvent;+ const factory DatabaseGroupEvent.didReceiveFieldUpdate(+ List<FieldInfo> fields) = _DidReceiveFieldUpdate;}@freezed-class GridGroupState with _$GridGroupState {- const factory GridGroupState({- required String databaseId,+class DatabaseGroupState with _$DatabaseGroupState {+ const factory DatabaseGroupState({+ required String viewId,required List<FieldInfo> fieldContexts,- }) = _GridGroupState;+ }) = _DatabaseGroupState;- factory GridGroupState.initial(- String databaseId, List<FieldInfo> fieldContexts) =>- GridGroupState(- databaseId: databaseId,+ factory DatabaseGroupState.initial(+ String viewId, List<FieldInfo> fieldContexts) =>+ DatabaseGroupState(+ viewId: viewId,fieldContexts: fieldContexts,);}diff --git a/frontend/app_flowy/lib/plugins/grid/application/setting/property_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/property_bloc.dartsimilarity index 54%rename from frontend/app_flowy/lib/plugins/grid/application/setting/property_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/setting/property_bloc.dartindex d21b6e5dbb..b49367034a 100644--- a/frontend/app_flowy/lib/plugins/grid/application/setting/property_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/property_bloc.dart@@ -1,34 +1,34 @@-import 'package:app_flowy/plugins/grid/application/field/field_service.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';import 'package:appflowy_backend/log.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import '../field/field_controller.dart';+import '../field/field_service.dart';part 'property_bloc.freezed.dart';-class GridPropertyBloc extends Bloc<GridPropertyEvent, GridPropertyState> {- final GridFieldController _fieldController;+class DatabasePropertyBloc+ extends Bloc<DatabasePropertyEvent, DatabasePropertyState> {+ final FieldController _fieldController;Function(List<FieldInfo>)? _onFieldsFn;- GridPropertyBloc(- {required String databaseId,- required GridFieldController fieldController})+ DatabasePropertyBloc(+ {required String viewId, required FieldController fieldController}): _fieldController = fieldController,super(- GridPropertyState.initial(databaseId, fieldController.fieldInfos)) {- on<GridPropertyEvent>(+ DatabasePropertyState.initial(viewId, fieldController.fieldInfos)) {+ on<DatabasePropertyEvent>((event, emit) async {await event.map(initial: (_Initial value) {_startListening();},setFieldVisibility: (_SetFieldVisibility value) async {- final fieldService =- FieldService(viewId: databaseId, fieldId: value.fieldId);+ final fieldBackendSvc =+ FieldBackendService(viewId: viewId, fieldId: value.fieldId);final result =- await fieldService.updateField(visibility: value.visibility);+ await fieldBackendSvc.updateField(visibility: value.visibility);result.fold((l) => null,(err) => Log.error(err),@@ -56,38 +56,38 @@ class GridPropertyBloc extends Bloc<GridPropertyEvent, GridPropertyState> {void _startListening() {_onFieldsFn =- (fields) => add(GridPropertyEvent.didReceiveFieldUpdate(fields));+ (fields) => add(DatabasePropertyEvent.didReceiveFieldUpdate(fields));_fieldController.addListener(- onFields: _onFieldsFn,+ onReceiveFields: _onFieldsFn,listenWhen: () => !isClosed,);}}@freezed-class GridPropertyEvent with _$GridPropertyEvent {- const factory GridPropertyEvent.initial() = _Initial;- const factory GridPropertyEvent.setFieldVisibility(+class DatabasePropertyEvent with _$DatabasePropertyEvent {+ const factory DatabasePropertyEvent.initial() = _Initial;+ const factory DatabasePropertyEvent.setFieldVisibility(String fieldId, bool visibility) = _SetFieldVisibility;- const factory GridPropertyEvent.didReceiveFieldUpdate(+ const factory DatabasePropertyEvent.didReceiveFieldUpdate(List<FieldInfo> fields) = _DidReceiveFieldUpdate;- const factory GridPropertyEvent.moveField(int fromIndex, int toIndex) =+ const factory DatabasePropertyEvent.moveField(int fromIndex, int toIndex) =_MoveField;}@freezed-class GridPropertyState with _$GridPropertyState {- const factory GridPropertyState({- required String databaseId,+class DatabasePropertyState with _$DatabasePropertyState {+ const factory DatabasePropertyState({+ required String viewId,required List<FieldInfo> fieldContexts,}) = _GridPropertyState;- factory GridPropertyState.initial(- String databaseId,+ factory DatabasePropertyState.initial(+ String viewId,List<FieldInfo> fieldContexts,) =>- GridPropertyState(- databaseId: databaseId,+ DatabasePropertyState(+ viewId: viewId,fieldContexts: fieldContexts,);}diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_bloc.dartnew file mode 100644index 0000000000..9857a2871a--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_bloc.dart@@ -0,0 +1,49 @@+import 'package:flutter_bloc/flutter_bloc.dart';+import 'package:freezed_annotation/freezed_annotation.dart';+import 'dart:async';+import 'package:dartz/dartz.dart';++part 'setting_bloc.freezed.dart';++class DatabaseSettingBloc+ extends Bloc<DatabaseSettingEvent, DatabaseSettingState> {+ final String viewId;+ DatabaseSettingBloc({required this.viewId})+ : super(DatabaseSettingState.initial()) {+ on<DatabaseSettingEvent>(+ (event, emit) async {+ event.map(performAction: (_PerformAction value) {+ emit(state.copyWith(selectedAction: Some(value.action)));+ });+ },+ );+ }++ @override+ Future<void> close() async {+ return super.close();+ }+}++@freezed+class DatabaseSettingEvent with _$DatabaseSettingEvent {+ const factory DatabaseSettingEvent.performAction(+ DatabaseSettingAction action) = _PerformAction;+}++@freezed+class DatabaseSettingState with _$DatabaseSettingState {+ const factory DatabaseSettingState({+ required Option<DatabaseSettingAction> selectedAction,+ }) = _DatabaseSettingState;++ factory DatabaseSettingState.initial() => DatabaseSettingState(+ selectedAction: none(),+ );+}++enum DatabaseSettingAction {+ showFilters,+ sortBy,+ showProperties,+}diff --git a/frontend/app_flowy/lib/plugins/grid/application/setting/setting_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_controller.dartsimilarity index 83%rename from frontend/app_flowy/lib/plugins/grid/application/setting/setting_controller.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_controller.dartindex c63b3155d0..cb63463149 100644--- a/frontend/app_flowy/lib/plugins/grid/application/setting/setting_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_controller.dart@@ -1,14 +1,14 @@-import 'package:app_flowy/plugins/grid/application/setting/setting_service.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pb.dart';import 'setting_listener.dart';+import 'setting_service.dart';typedef OnError = void Function(FlowyError);typedef OnSettingUpdated = void Function(DatabaseViewSettingPB);class SettingController {final String viewId;- final SettingFFIService _ffiService;+ final SettingBackendService _settingBackendSvc;final DatabaseSettingListener _listener;OnSettingUpdated? _onSettingUpdated;OnError? _onError;@@ -17,10 +17,10 @@ class SettingController {SettingController({required this.viewId,- }) : _ffiService = SettingFFIService(viewId: viewId),- _listener = DatabaseSettingListener(databaseId: viewId) {+ }) : _settingBackendSvc = SettingBackendService(viewId: viewId),+ _listener = DatabaseSettingListener(viewId: viewId) {// Load setting- _ffiService.getSetting().then((result) {+ _settingBackendSvc.getSetting().then((result) {result.fold((newSetting) => updateSetting(newSetting),(err) => _onError?.call(err),diff --git a/frontend/app_flowy/lib/plugins/grid/application/setting/setting_listener.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_listener.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/application/setting/setting_listener.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_listener.dartindex 275ef11725..6e10238cfb 100644--- a/frontend/app_flowy/lib/plugins/grid/application/setting/setting_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_listener.dart@@ -1,6 +1,6 @@import 'dart:typed_data';-import 'package:app_flowy/core/grid_notification.dart';+import 'package:appflowy/core/grid_notification.dart';import 'package:dartz/dartz.dart';import 'package:flowy_infra/notifier.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';@@ -10,19 +10,19 @@ import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pb.dartypedef UpdateSettingNotifiedValue = Either<DatabaseViewSettingPB, FlowyError>;class DatabaseSettingListener {- final String databaseId;+ final String viewId;DatabaseNotificationListener? _listener;PublishNotifier<UpdateSettingNotifiedValue>? _updateSettingNotifier =PublishNotifier();- DatabaseSettingListener({required this.databaseId});+ DatabaseSettingListener({required this.viewId});void start({required void Function(UpdateSettingNotifiedValue) onSettingUpdated,}) {_updateSettingNotifier?.addPublishListener(onSettingUpdated);_listener =- DatabaseNotificationListener(objectId: databaseId, handler: _handler);+ DatabaseNotificationListener(objectId: viewId, handler: _handler);}void _handler(DatabaseNotification ty, Either<Uint8List, FlowyError> result) {diff --git a/frontend/app_flowy/lib/plugins/grid/application/setting/setting_service.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_service.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/grid/application/setting/setting_service.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_service.dartindex 2f0cc056f5..54bdb85e48 100644--- a/frontend/app_flowy/lib/plugins/grid/application/setting/setting_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_service.dart@@ -6,10 +6,10 @@ import 'package:appflowy_backend/protobuf/flowy-database/grid_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/group.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pb.dart';-class SettingFFIService {+class SettingBackendService {final String viewId;- const SettingFFIService({required this.viewId});+ const SettingBackendService({required this.viewId});Future<Either<DatabaseViewSettingPB, FlowyError>> getSetting() {final payload = DatabaseViewIdPB.create()..value = viewId;@@ -21,6 +21,7 @@ class SettingFFIService {required FieldType fieldType,}) {final insertGroupPayload = InsertGroupPayloadPB.create()+ ..viewId = viewId..fieldId = fieldId..fieldType = fieldType;final payload = DatabaseSettingChangesetPB.create()diff --git a/frontend/app_flowy/lib/plugins/grid/application/sort/sort_listener.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/sort/sort_listener.dartsimilarity index 96%rename from frontend/app_flowy/lib/plugins/grid/application/sort/sort_listener.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/sort/sort_listener.dartindex 08a1241a71..2ed79bc59c 100644--- a/frontend/app_flowy/lib/plugins/grid/application/sort/sort_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/sort/sort_listener.dart@@ -1,6 +1,6 @@import 'dart:typed_data';-import 'package:app_flowy/core/grid_notification.dart';+import 'package:appflowy/core/grid_notification.dart';import 'package:flowy_infra/notifier.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:dartz/dartz.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/sort/sort_service.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/sort/sort_service.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/grid/application/sort/sort_service.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/sort/sort_service.dartindex 40fba8f673..f7b4999878 100644--- a/frontend/app_flowy/lib/plugins/grid/application/sort/sort_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/sort/sort_service.dart@@ -7,10 +7,10 @@ import 'package:appflowy_backend/protobuf/flowy-database/grid_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/sort_entities.pb.dart';-class SortFFIService {+class SortBackendService {final String viewId;- SortFFIService({required this.viewId});+ SortBackendService({required this.viewId});Future<Either<List<SortPB>, FlowyError>> getAllSorts() {final payload = DatabaseViewIdPB()..value = viewId;diff --git a/frontend/app_flowy/lib/plugins/grid/application/view/grid_view_cache.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/view/view_cache.dartsimilarity index 73%rename from frontend/app_flowy/lib/plugins/grid/application/view/grid_view_cache.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/view/view_cache.dartindex 6e9740a91b..6f58c3fbde 100644--- a/frontend/app_flowy/lib/plugins/grid/application/view/grid_view_cache.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/view/view_cache.dart@@ -1,28 +1,27 @@import 'dart:async';-import 'package:app_flowy/plugins/grid/application/view/grid_view_listener.dart';import 'package:appflowy_backend/log.dart';-import '../field/field_controller.dart';import '../row/row_cache.dart';+import 'view_listener.dart';/// Read https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/architecture/frontend/grid for more informationclass DatabaseViewCache {- final String databaseId;- late GridRowCache _rowCache;- final GridViewListener _gridViewListener;+ final String viewId;+ late RowCache _rowCache;+ final DatabaseViewListener _gridViewListener;List<RowInfo> get rowInfos => _rowCache.visibleRows;- GridRowCache get rowCache => _rowCache;+ RowCache get rowCache => _rowCache;DatabaseViewCache({- required this.databaseId,- required GridFieldController fieldController,- }) : _gridViewListener = GridViewListener(viewId: databaseId) {- final delegate = GridRowFieldNotifierImpl(fieldController);- _rowCache = GridRowCache(- databaseId: databaseId,- notifier: delegate,- delegate: delegate,+ required this.viewId,+ required FieldController fieldController,+ }) : _gridViewListener = DatabaseViewListener(viewId: viewId) {+ final delegate = RowDelegatesImpl(fieldController);+ _rowCache = RowCache(+ viewId: viewId,+ fieldsDelegate: delegate,+ cacheDelegate: delegate,);_gridViewListener.start(diff --git a/frontend/app_flowy/lib/plugins/grid/application/view/grid_view_listener.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/view/view_listener.dartsimilarity index 65%rename from frontend/app_flowy/lib/plugins/grid/application/view/grid_view_listener.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/application/view/view_listener.dartindex 16bb04dc8e..ac0d298eb4 100644--- a/frontend/app_flowy/lib/plugins/grid/application/view/grid_view_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/view/view_listener.dart@@ -1,6 +1,6 @@import 'dart:async';import 'dart:typed_data';-import 'package:app_flowy/core/grid_notification.dart';+import 'package:appflowy/core/grid_notification.dart';import 'package:appflowy_backend/protobuf/flowy-database/sort_entities.pb.dart';import 'package:dartz/dartz.dart';import 'package:flowy_infra/notifier.dart';@@ -8,33 +8,31 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/notification.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/view_entities.pb.dart';-typedef GridRowsVisibilityNotifierValue- = Either<ViewRowsVisibilityChangesetPB, FlowyError>;+typedef RowsVisibilityNotifierValue+ = Either<RowsVisibilityChangesetPB, FlowyError>;-typedef GridViewRowsNotifierValue = Either<ViewRowsChangesetPB, FlowyError>;-typedef GridViewReorderAllRowsNotifierValue = Either<List<String>, FlowyError>;-typedef GridViewSingleRowNotifierValue = Either<ReorderSingleRowPB, FlowyError>;+typedef NumberOfRowsNotifierValue = Either<RowsChangesetPB, FlowyError>;+typedef ReorderAllRowsNotifierValue = Either<List<String>, FlowyError>;+typedef SingleRowNotifierValue = Either<ReorderSingleRowPB, FlowyError>;-class GridViewListener {+class DatabaseViewListener {final String viewId;- PublishNotifier<GridViewRowsNotifierValue>? _rowsNotifier = PublishNotifier();- PublishNotifier<GridViewReorderAllRowsNotifierValue>? _reorderAllRows =+ PublishNotifier<NumberOfRowsNotifierValue>? _rowsNotifier = PublishNotifier();+ PublishNotifier<ReorderAllRowsNotifierValue>? _reorderAllRows =PublishNotifier();- PublishNotifier<GridViewSingleRowNotifierValue>? _reorderSingleRow =+ PublishNotifier<SingleRowNotifierValue>? _reorderSingleRow =PublishNotifier();- PublishNotifier<GridRowsVisibilityNotifierValue>? _rowsVisibility =+ PublishNotifier<RowsVisibilityNotifierValue>? _rowsVisibility =PublishNotifier();DatabaseNotificationListener? _listener;- GridViewListener({required this.viewId});+ DatabaseViewListener({required this.viewId});void start({- required void Function(GridViewRowsNotifierValue) onRowsChanged,- required void Function(GridViewReorderAllRowsNotifierValue)- onReorderAllRows,- required void Function(GridViewSingleRowNotifierValue) onReorderSingleRow,- required void Function(GridRowsVisibilityNotifierValue)- onRowsVisibilityChanged,+ required void Function(NumberOfRowsNotifierValue) onRowsChanged,+ required void Function(ReorderAllRowsNotifierValue) onReorderAllRows,+ required void Function(SingleRowNotifierValue) onReorderSingleRow,+ required void Function(RowsVisibilityNotifierValue) onRowsVisibilityChanged,}) {if (_listener != null) {_listener?.stop();@@ -56,14 +54,14 @@ class GridViewListener {case DatabaseNotification.DidUpdateViewRowsVisibility:result.fold((payload) => _rowsVisibility?.value =- left(ViewRowsVisibilityChangesetPB.fromBuffer(payload)),+ left(RowsVisibilityChangesetPB.fromBuffer(payload)),(error) => _rowsVisibility?.value = right(error),);break;case DatabaseNotification.DidUpdateViewRows:result.fold(- (payload) => _rowsNotifier?.value =- left(ViewRowsChangesetPB.fromBuffer(payload)),+ (payload) =>+ _rowsNotifier?.value = left(RowsChangesetPB.fromBuffer(payload)),(error) => _rowsNotifier?.value = right(error),);break;diff --git a/frontend/app_flowy/lib/plugins/board/application/board_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dartsimilarity index 94%rename from frontend/app_flowy/lib/plugins/board/application/board_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dartindex 2b74d62416..a486ae2e1f 100644--- a/frontend/app_flowy/lib/plugins/board/application/board_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dart@@ -1,9 +1,6 @@import 'dart:async';import 'dart:collection';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';-import 'package:app_flowy/plugins/grid/application/row/row_service.dart';import 'package:appflowy_board/appflowy_board.dart';import 'package:dartz/dartz.dart';import 'package:equatable/equatable.dart';@@ -14,6 +11,9 @@ import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';+import '../../application/field/field_controller.dart';+import '../../application/row/row_cache.dart';+import '../../application/row/row_service.dart';import 'board_data_controller.dart';import 'group_controller.dart';@@ -22,16 +22,15 @@ part 'board_bloc.freezed.dart';class BoardBloc extends Bloc<BoardEvent, BoardState> {final BoardDataController _gridDataController;late final AppFlowyBoardController boardController;- final MoveRowFFIService _rowService;+ final GroupBackendService _groupBackendSvc;final LinkedHashMap<String, GroupController> groupControllers =LinkedHashMap();- GridFieldController get fieldController =>- _gridDataController.fieldController;- String get databaseId => _gridDataController.viewId;+ FieldController get fieldController => _gridDataController.fieldController;+ String get viewId => _gridDataController.viewId;BoardBloc({required ViewPB view})- : _rowService = MoveRowFFIService(viewId: view.id),+ : _groupBackendSvc = GroupBackendService(viewId: view.id),_gridDataController = BoardDataController(view: view),super(BoardState.initial(view.id)) {boardController = AppFlowyBoardController(@@ -154,7 +153,7 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {void _moveRow(RowPB? fromRow, String columnId, RowPB? toRow) {if (fromRow != null) {- _rowService+ _groupBackendSvc.moveGroupRow(fromRowId: fromRow.id,toGroupId: columnId,@@ -167,7 +166,7 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {}void _moveGroup(String fromGroupId, String toGroupId) {- _rowService+ _groupBackendSvc.moveGroup(fromGroupId: fromGroupId,toGroupId: toGroupId,@@ -204,13 +203,13 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {}}- GridRowCache? getRowCache(String blockId) {+ RowCache? getRowCache(String blockId) {return _gridDataController.rowCache;}void _startListening() {_gridDataController.addListener(- onGridChanged: (grid) {+ onDatabaseChanged: (grid) {if (!isClosed) {add(BoardEvent.didReceiveGridUpdate(grid));}@@ -285,7 +284,7 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {},);final controller = GroupController(- databaseId: state.databaseId,+ viewId: state.viewId,group: group,delegate: delegate,);@@ -332,7 +331,7 @@ class BoardEvent with _$BoardEvent {@freezedclass BoardState with _$BoardState {const factory BoardState({- required String databaseId,+ required String viewId,required Option<DatabasePB> grid,required List<String> groupIds,required Option<BoardEditingRow> editingRow,@@ -340,9 +339,9 @@ class BoardState with _$BoardState {required Option<FlowyError> noneOrError,}) = _BoardState;- factory BoardState.initial(String databaseId) => BoardState(+ factory BoardState.initial(String viewId) => BoardState(grid: none(),- databaseId: databaseId,+ viewId: viewId,groupIds: [],editingRow: none(),noneOrError: none(),@@ -397,7 +396,7 @@ class GroupItem extends AppFlowyGroupItem {}class GroupControllerDelegateImpl extends GroupControllerDelegate {- final GridFieldController fieldController;+ final FieldController fieldController;final AppFlowyBoardController controller;final void Function(String, RowPB, int?) onNewColumnItem;diff --git a/frontend/app_flowy/lib/plugins/board/application/board_data_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_data_controller.dartsimilarity index 77%rename from frontend/app_flowy/lib/plugins/board/application/board_data_controller.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_data_controller.dartindex 00d8e520b0..b54073b17b 100644--- a/frontend/app_flowy/lib/plugins/board/application/board_data_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_data_controller.dart@@ -1,55 +1,48 @@import 'dart:collection';-import 'package:app_flowy/plugins/grid/application/view/grid_view_cache.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/grid_service.dart';-import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'dart:async';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';+import '../../application/database_service.dart';+import '../../application/defines.dart';+import '../../application/field/field_controller.dart';+import '../../application/row/row_cache.dart';+import '../../application/view/view_cache.dart';import 'board_listener.dart';-typedef OnFieldsChanged = void Function(UnmodifiableListView<FieldInfo>);-typedef OnGridChanged = void Function(DatabasePB);typedef DidLoadGroups = void Function(List<GroupPB>);typedef OnUpdatedGroup = void Function(List<GroupPB>);typedef OnDeletedGroup = void Function(List<String>);typedef OnInsertedGroup = void Function(InsertedGroupPB);typedef OnResetGroups = void Function(List<GroupPB>);-typedef OnRowsChanged = void Function(- List<RowInfo>,- RowsChangedReason,-);-typedef OnError = void Function(FlowyError);-class BoardDataController {final String viewId;- final DatabaseFFIService _databaseFFIService;- final GridFieldController fieldController;+ final DatabaseBackendService _databaseFFIService;+ final FieldController fieldController;final BoardListener _listener;late DatabaseViewCache _viewCache;OnFieldsChanged? _onFieldsChanged;- OnGridChanged? _onGridChanged;+ OnDatabaseChanged? _onDatabaseChanged;DidLoadGroups? _didLoadGroup;OnRowsChanged? _onRowsChanged;OnError? _onError;List<RowInfo> get rowInfos => _viewCache.rowInfos;- GridRowCache get rowCache => _viewCache.rowCache;+ RowCache get rowCache => _viewCache.rowCache;BoardDataController({required ViewPB view}): viewId = view.id,_listener = BoardListener(view.id),- _databaseFFIService = DatabaseFFIService(viewId: view.id),- fieldController = GridFieldController(databaseId: view.id) {+ _databaseFFIService = DatabaseBackendService(viewId: view.id),+ fieldController = FieldController(viewId: view.id) {//_viewCache = DatabaseViewCache(- databaseId: view.id,+ viewId: view.id,fieldController: fieldController,);_viewCache.addListener(onRowsChanged: (reason) {@@ -58,7 +51,7 @@ class BoardDataController {}void addListener({- required OnGridChanged onGridChanged,+ required OnDatabaseChanged onDatabaseChanged,OnFieldsChanged? onFieldsChanged,required DidLoadGroups didLoadGroups,OnRowsChanged? onRowsChanged,@@ -68,13 +61,13 @@ class BoardDataController {required OnResetGroups onResetGroups,required OnError? onError,}) {- _onGridChanged = onGridChanged;+ _onDatabaseChanged = onDatabaseChanged;_onFieldsChanged = onFieldsChanged;_didLoadGroup = didLoadGroups;_onRowsChanged = onRowsChanged;_onError = onError;- fieldController.addListener(onFields: (fields) {+ fieldController.addListener(onReceiveFields: (fields) {_onFieldsChanged?.call(UnmodifiableListView(fields));});@@ -110,7 +103,7 @@ class BoardDataController {final result = await _databaseFFIService.openGrid();return result.fold((grid) async {- _onGridChanged?.call(grid);+ _onDatabaseChanged?.call(grid);return fieldController.loadFields(fieldIds: grid.fields).then((result) {return result.fold((l) => Future(() async {diff --git a/frontend/app_flowy/lib/plugins/board/application/board_listener.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_listener.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/board/application/board_listener.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_listener.dartindex 98e6a1cf5d..0f88552050 100644--- a/frontend/app_flowy/lib/plugins/board/application/board_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_listener.dart@@ -1,6 +1,6 @@import 'dart:typed_data';-import 'package:app_flowy/core/grid_notification.dart';+import 'package:appflowy/core/grid_notification.dart';import 'package:flowy_infra/notifier.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/notification.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/board/application/card/board_checkbox_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_checkbox_cell_bloc.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/board/application/card/board_checkbox_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_checkbox_cell_bloc.dartindex 37dcf8bab3..7f30e775af 100644--- a/frontend/app_flowy/lib/plugins/board/application/card/board_checkbox_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_checkbox_cell_bloc.dart@@ -1,13 +1,14 @@-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';+import '../../../application/cell/cell_service.dart';+part 'board_checkbox_cell_bloc.freezed.dart';class BoardCheckboxCellBlocextends Bloc<BoardCheckboxCellEvent, BoardCheckboxCellState> {- final GridCheckboxCellController cellController;+ final CheckboxCellController cellController;void Function()? _onCellChangedFn;BoardCheckboxCellBloc({required this.cellController,@@ -64,7 +65,7 @@ class BoardCheckboxCellState with _$BoardCheckboxCellState {required bool isSelected,}) = _CheckboxCellState;- factory BoardCheckboxCellState.initial(GridTextCellController context) {+ factory BoardCheckboxCellState.initial(TextCellController context) {return BoardCheckboxCellState(isSelected: _isSelected(context.getCellData()));}diff --git a/frontend/app_flowy/lib/plugins/board/application/card/board_date_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_date_cell_bloc.dartsimilarity index 88%rename from frontend/app_flowy/lib/plugins/board/application/card/board_date_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_date_cell_bloc.dartindex 75067f305b..72538ed9d3 100644--- a/frontend/app_flowy/lib/plugins/board/application/card/board_date_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_date_cell_bloc.dart@@ -1,13 +1,14 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:appflowy_backend/protobuf/flowy-database/date_type_option_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';++import '../../../application/cell/cell_service.dart';+import '../../../application/field/field_controller.dart';part 'board_date_cell_bloc.freezed.dart';class BoardDateCellBloc extends Bloc<BoardDateCellEvent, BoardDateCellState> {- final GridDateCellController cellController;+ final DateCellController cellController;void Function()? _onCellChangedFn;BoardDateCellBloc({required this.cellController})@@ -61,7 +62,7 @@ class BoardDateCellState with _$BoardDateCellState {required FieldInfo fieldInfo,}) = _BoardDateCellState;- factory BoardDateCellState.initial(GridDateCellController context) {+ factory BoardDateCellState.initial(DateCellController context) {final cellData = context.getCellData();return BoardDateCellState(diff --git a/frontend/app_flowy/lib/plugins/board/application/card/board_number_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_number_cell_bloc.dartsimilarity index 88%rename from frontend/app_flowy/lib/plugins/board/application/card/board_number_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_number_cell_bloc.dartindex fb9759cc72..cee2c0541c 100644--- a/frontend/app_flowy/lib/plugins/board/application/card/board_number_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_number_cell_bloc.dart@@ -1,13 +1,13 @@-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';+import '../../../application/cell/cell_service.dart';part 'board_number_cell_bloc.freezed.dart';class BoardNumberCellBlocextends Bloc<BoardNumberCellEvent, BoardNumberCellState> {- final GridNumberCellController cellController;+ final NumberCellController cellController;void Function()? _onCellChangedFn;BoardNumberCellBloc({required this.cellController,@@ -60,7 +60,7 @@ class BoardNumberCellState with _$BoardNumberCellState {required String content,}) = _BoardNumberCellState;- factory BoardNumberCellState.initial(GridTextCellController context) =>+ factory BoardNumberCellState.initial(TextCellController context) =>BoardNumberCellState(content: context.getCellData() ?? "",);diff --git a/frontend/app_flowy/lib/plugins/board/application/card/board_select_option_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_select_option_cell_bloc.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/board/application/card/board_select_option_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_select_option_cell_bloc.dartindex 54b6197a54..a42a9d14a4 100644--- a/frontend/app_flowy/lib/plugins/board/application/card/board_select_option_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_select_option_cell_bloc.dart@@ -1,14 +1,14 @@import 'dart:async';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';part 'board_select_option_cell_bloc.freezed.dart';class BoardSelectOptionCellBlocextends Bloc<BoardSelectOptionCellEvent, BoardSelectOptionCellState> {- final GridSelectOptionCellController cellController;+ final SelectOptionCellController cellController;void Function()? _onCellChangedFn;BoardSelectOptionCellBloc({@@ -66,7 +66,7 @@ class BoardSelectOptionCellState with _$BoardSelectOptionCellState {}) = _BoardSelectOptionCellState;factory BoardSelectOptionCellState.initial(- GridSelectOptionCellController context) {+ SelectOptionCellController context) {final data = context.getCellData();return BoardSelectOptionCellState(selectedOptions: data?.selectOptions ?? [],diff --git a/frontend/app_flowy/lib/plugins/board/application/card/board_text_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_text_cell_bloc.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/board/application/card/board_text_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_text_cell_bloc.dartindex 1273877f29..874404f304 100644--- a/frontend/app_flowy/lib/plugins/board/application/card/board_text_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_text_cell_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';@@ -6,7 +6,7 @@ import 'dart:async';part 'board_text_cell_bloc.freezed.dart';class BoardTextCellBloc extends Bloc<BoardTextCellEvent, BoardTextCellState> {- final GridTextCellController cellController;+ final TextCellController cellController;void Function()? _onCellChangedFn;BoardTextCellBloc({required this.cellController,@@ -71,7 +71,7 @@ class BoardTextCellState with _$BoardTextCellState {required bool enableEdit,}) = _BoardTextCellState;- factory BoardTextCellState.initial(GridTextCellController context) =>+ factory BoardTextCellState.initial(TextCellController context) =>BoardTextCellState(content: context.getCellData() ?? "",enableEdit: false,diff --git a/frontend/app_flowy/lib/plugins/board/application/card/board_url_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_url_cell_bloc.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/board/application/card/board_url_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_url_cell_bloc.dartindex 0b13df6545..0ff9316277 100644--- a/frontend/app_flowy/lib/plugins/board/application/card/board_url_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/board_url_cell_bloc.dart@@ -1,13 +1,14 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/url_type_option_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';+import '../../../application/cell/cell_service.dart';+part 'board_url_cell_bloc.freezed.dart';class BoardURLCellBloc extends Bloc<BoardURLCellEvent, BoardURLCellState> {- final GridURLCellController cellController;+ final URLCellController cellController;void Function()? _onCellChangedFn;BoardURLCellBloc({required this.cellController,@@ -68,7 +69,7 @@ class BoardURLCellState with _$BoardURLCellState {required String url,}) = _BoardURLCellState;- factory BoardURLCellState.initial(GridURLCellController context) {+ factory BoardURLCellState.initial(URLCellController context) {final cellData = context.getCellData();return BoardURLCellState(content: cellData?.content ?? "",diff --git a/frontend/app_flowy/lib/plugins/board/application/card/card_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/card_bloc.dartsimilarity index 87%rename from frontend/app_flowy/lib/plugins/board/application/card/card_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/card_bloc.dartindex 76c78a7bb8..65530b950d 100644--- a/frontend/app_flowy/lib/plugins/board/application/card/card_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/card_bloc.dart@@ -1,19 +1,19 @@import 'dart:collection';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';-import 'package:app_flowy/plugins/grid/application/row/row_service.dart';import 'package:equatable/equatable.dart';import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';+import '../../../application/cell/cell_service.dart';+import '../../../application/row/row_cache.dart';+import '../../../application/row/row_service.dart';import 'card_data_controller.dart';part 'card_bloc.freezed.dart';class BoardCardBloc extends Bloc<BoardCardEvent, BoardCardState> {final String groupFieldId;- final RowFFIService _rowService;+ final RowBackendService _rowBackendSvc;final CardDataController _dataController;BoardCardBloc({@@ -21,8 +21,8 @@ class BoardCardBloc extends Bloc<BoardCardEvent, BoardCardState> {required String viewId,required CardDataController dataController,required bool isEditing,- }) : _rowService = RowFFIService(- databaseId: viewId,+ }) : _rowBackendSvc = RowBackendService(+ viewId: viewId,),_dataController = dataController,super(@@ -60,7 +60,7 @@ class BoardCardBloc extends Bloc<BoardCardEvent, BoardCardState> {RowInfo rowInfo() {return RowInfo(- databaseId: _rowService.databaseId,+ viewId: _rowBackendSvc.viewId,fields: UnmodifiableListView(state.cells.map((cell) => cell.identifier.fieldInfo).toList(),),@@ -81,7 +81,7 @@ class BoardCardBloc extends Bloc<BoardCardEvent, BoardCardState> {}List<BoardCellEquatable> _makeCells(- String groupFieldId, GridCellMap originalCellMap) {+ String groupFieldId, CellByFieldId originalCellMap) {List<BoardCellEquatable> cells = [];for (final entry in originalCellMap.entries) {// Filter out the cell if it's fieldId equal to the groupFieldId@@ -124,7 +124,7 @@ class BoardCardState with _$BoardCardState {}class BoardCellEquatable extends Equatable {- final GridCellIdentifier identifier;+ final CellIdentifier identifier;const BoardCellEquatable(this.identifier);diff --git a/frontend/app_flowy/lib/plugins/board/application/card/card_data_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/card_data_controller.dartsimilarity index 50%rename from frontend/app_flowy/lib/plugins/board/application/card/card_data_controller.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/card_data_controller.dartindex 2bc5b31716..67ddbaf993 100644--- a/frontend/app_flowy/lib/plugins/board/application/card/card_data_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/card/card_data_controller.dart@@ -1,27 +1,28 @@-import 'package:app_flowy/plugins/board/presentation/card/card_cell_builder.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_field_notifier.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';import 'package:flutter/foundation.dart';-typedef OnCardChanged = void Function(GridCellMap, RowsChangedReason);+import '../../../application/cell/cell_field_notifier.dart';+import '../../../application/cell/cell_service.dart';+import '../../../application/field/field_controller.dart';+import '../../../application/row/row_cache.dart';+import '../../presentation/card/card_cell_builder.dart';++typedef OnCardChanged = void Function(CellByFieldId, RowsChangedReason);class CardDataController extends BoardCellBuilderDelegate {final RowPB rowPB;- final GridFieldController _fieldController;- final GridRowCache _rowCache;+ final FieldController _fieldController;+ final RowCache _rowCache;final List<VoidCallback> _onCardChangedListeners = [];CardDataController({required this.rowPB,- required GridFieldController fieldController,- required GridRowCache rowCache,+ required FieldController fieldController,+ required RowCache rowCache,}) : _fieldController = fieldController,_rowCache = rowCache;- GridCellMap loadData() {+ CellByFieldId loadData() {return _rowCache.loadGridCells(rowPB.id);}@@ -39,11 +40,11 @@ class CardDataController extends BoardCellBuilderDelegate {}@override- GridCellFieldNotifier buildFieldNotifier() {- return GridCellFieldNotifier(+ CellFieldNotifier buildFieldNotifier() {+ return CellFieldNotifier(notifier: GridCellFieldNotifierImpl(_fieldController));}@override- GridCellCache get cellCache => _rowCache.cellCache;+ CellCache get cellCache => _rowCache.cellCache;}diff --git a/frontend/app_flowy/lib/plugins/board/application/group.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/group.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/board/application/group.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/group.dartdiff --git a/frontend/app_flowy/lib/plugins/board/application/group_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/group_controller.dartsimilarity index 99%rename from frontend/app_flowy/lib/plugins/board/application/group_controller.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/group_controller.dartindex d7a7c1bbec..8fd1368df1 100644--- a/frontend/app_flowy/lib/plugins/board/application/group_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/group_controller.dart@@ -18,7 +18,7 @@ class GroupController {final GroupControllerDelegate delegate;GroupController({- required String databaseId,+ required String viewId,required this.group,required this.delegate,}) : _listener = GroupListener(group);diff --git a/frontend/app_flowy/lib/plugins/board/application/group_listener.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/group_listener.dartsimilarity index 96%rename from frontend/app_flowy/lib/plugins/board/application/group_listener.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/group_listener.dartindex 8e8406e52f..4fb304c08e 100644--- a/frontend/app_flowy/lib/plugins/board/application/group_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/group_listener.dart@@ -1,6 +1,6 @@import 'dart:typed_data';-import 'package:app_flowy/core/grid_notification.dart';+import 'package:appflowy/core/grid_notification.dart';import 'package:flowy_infra/notifier.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/notification.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/board/application/toolbar/board_setting_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/toolbar/board_setting_bloc.dartsimilarity index 93%rename from frontend/app_flowy/lib/plugins/board/application/toolbar/board_setting_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/application/toolbar/board_setting_bloc.dartindex a7d390e2a9..739d9ee141 100644--- a/frontend/app_flowy/lib/plugins/board/application/toolbar/board_setting_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/toolbar/board_setting_bloc.dart@@ -6,8 +6,8 @@ import 'package:dartz/dartz.dart';part 'board_setting_bloc.freezed.dart';class BoardSettingBloc extends Bloc<BoardSettingEvent, BoardSettingState> {- final String databaseId;- BoardSettingBloc({required this.databaseId})+ final String viewId;+ BoardSettingBloc({required this.viewId}): super(BoardSettingState.initial()) {on<BoardSettingEvent>((event, emit) async {diff --git a/frontend/app_flowy/lib/plugins/board/board.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/board.dartsimilarity index 83%rename from frontend/app_flowy/lib/plugins/board/board.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/board.dartindex 8313f2f38e..fe1702873a 100644--- a/frontend/app_flowy/lib/plugins/board/board.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/board.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/util.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/widgets/left_bar_item.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/util.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/workspace/presentation/widgets/left_bar_item.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';@@ -28,9 +28,6 @@ class BoardPluginBuilder implements PluginBuilder {@overridePluginType get pluginType => PluginType.board;- @override- ViewDataFormatPB get dataFormatType => ViewDataFormatPB.DatabaseFormat;-@overrideViewLayoutTypePB? get layoutType => ViewLayoutTypePB.Board;}diff --git a/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/board/presentation/board_page.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dartindex fe04465e8a..80f9a45092 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dart@@ -2,13 +2,12 @@import 'dart:collection';-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/board/application/card/card_data_controller.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';-import 'package:app_flowy/plugins/grid/application/row/row_data_controller.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/cell/cell_builder.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/row/row_detail.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';+import 'package:appflowy/plugins/database_view/application/row/row_data_controller.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/cell/cell_builder.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/row/row_detail.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';@@ -22,6 +21,7 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import '../application/board_bloc.dart';+import '../application/card/card_data_controller.dart';import 'card/card.dart';import 'card/card_cell_builder.dart';import 'toolbar/board_toolbar.dart';@@ -227,7 +227,7 @@ class _BoardContentState extends State<BoardContent> {if (rowCache == null) return SizedBox(key: ObjectKey(groupItem));final fieldController = context.read<BoardBloc>().fieldController;- final databaseId = context.read<BoardBloc>().databaseId;+ final viewId = context.read<BoardBloc>().viewId;final cardController = CardDataController(fieldController: fieldController,rowCache: rowCache,@@ -249,14 +249,14 @@ class _BoardContentState extends State<BoardContent> {margin: config.cardPadding,decoration: _makeBoxDecoration(context),child: BoardCard(- viewId: databaseId,+ viewId: viewId,groupId: groupData.group.groupId,fieldId: groupItem.fieldInfo.id,isEditing: isEditing,cellBuilder: cellBuilder,dataController: cardController,openCard: (context) => _openCard(- databaseId,+ viewId,fieldController,rowPB,rowCache,@@ -292,14 +292,14 @@ class _BoardContentState extends State<BoardContent> {}void _openCard(- String databaseId,- GridFieldController fieldController,+ String viewId,+ FieldController fieldController,RowPB rowPB,- GridRowCache rowCache,+ RowCache rowCache,BuildContext context,) {final rowInfo = RowInfo(- databaseId: databaseId,+ viewId: viewId,fields: UnmodifiableListView(fieldController.fieldInfos),rowPB: rowPB,);@@ -331,7 +331,7 @@ class _ToolbarBlocAdaptor extends StatelessWidget {builder: (context, state) {final bloc = context.read<BoardBloc>();final toolbarContext = BoardToolbarContext(- viewId: bloc.databaseId,+ viewId: bloc.viewId,fieldController: bloc.fieldController,);diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/board_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_cell.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/board/presentation/card/board_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_cell.dartindex 549f7ba64c..bc34d856c6 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/board_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_cell.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/prelude.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:flutter/material.dart';abstract class FocusableBoardCell {@@ -24,7 +24,7 @@ class EditableRowNotifier {: isEditing = ValueNotifier(isEditing);void bindCell(- GridCellIdentifier cellIdentifier,+ CellIdentifier cellIdentifier,EditableCellNotifier notifier,) {assert(@@ -89,8 +89,7 @@ class EditableCellId {EditableCellId(this.rowId, this.fieldId);- factory EditableCellId.from(GridCellIdentifier cellIdentifier) =>- EditableCellId(+ factory EditableCellId.from(CellIdentifier cellIdentifier) => EditableCellId(cellIdentifier.rowId,cellIdentifier.fieldId,);diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/board_checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_checkbox_cell.dartsimilarity index 85%rename from frontend/app_flowy/lib/plugins/board/presentation/card/board_checkbox_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_checkbox_cell.dartindex 6b94d3399b..011c68b60a 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/board_checkbox_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_checkbox_cell.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/board/application/card/board_checkbox_cell_bloc.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/board/application/card/board_checkbox_cell_bloc.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flutter/material.dart';@@ -7,7 +7,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';class BoardCheckboxCell extends StatefulWidget {final String groupId;- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;const BoardCheckboxCell({required this.groupId,@@ -25,7 +25,7 @@ class _BoardCheckboxCellState extends State<BoardCheckboxCell> {@overridevoid initState() {final cellController =- widget.cellControllerBuilder.build() as GridCheckboxCellController;+ widget.cellControllerBuilder.build() as CheckboxCellController;_cellBloc = BoardCheckboxCellBloc(cellController: cellController);_cellBloc.add(const BoardCheckboxCellEvent.initial());super.initState();diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/board_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_checklist_cell.dartsimilarity index 69%rename from frontend/app_flowy/lib/plugins/board/presentation/card/board_checklist_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_checklist_cell.dartindex 1f7af63b3e..e8213786fb 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/board_checklist_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_checklist_cell.dart@@ -1,11 +1,12 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/cell/checklist_cell_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_progress_bar.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../application/cell/cell_service.dart';+import '../../../grid/application/cell/checklist_cell_bloc.dart';+import '../../../grid/presentation/widgets/cell/checklist_cell/checklist_progress_bar.dart';+class BoardChecklistCell extends StatefulWidget {- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;const BoardChecklistCell({required this.cellControllerBuilder, Key? key}): super(key: key);@@ -19,7 +20,7 @@ class _BoardChecklistCellState extends State<BoardChecklistCell> {@overridevoid initState() {final cellController =- widget.cellControllerBuilder.build() as GridChecklistCellController;+ widget.cellControllerBuilder.build() as ChecklistCellController;_cellBloc = ChecklistCellBloc(cellController: cellController);_cellBloc.add(const ChecklistCellEvent.initial());super.initState();diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/board_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_date_cell.dartsimilarity index 84%rename from frontend/app_flowy/lib/plugins/board/presentation/card/board_date_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_date_cell.dartindex 4d62608c45..7cb5173f25 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/board_date_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_date_cell.dart@@ -1,14 +1,14 @@-import 'package:app_flowy/plugins/board/application/card/board_date_cell_bloc.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';+import 'package:appflowy/plugins/database_view/board/application/card/board_date_cell_bloc.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../application/cell/cell_service.dart';import 'define.dart';class BoardDateCell extends StatefulWidget {final String groupId;- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;const BoardDateCell({required this.groupId,@@ -26,7 +26,7 @@ class _BoardDateCellState extends State<BoardDateCell> {@overridevoid initState() {final cellController =- widget.cellControllerBuilder.build() as GridDateCellController;+ widget.cellControllerBuilder.build() as DateCellController;_cellBloc = BoardDateCellBloc(cellController: cellController)..add(const BoardDateCellEvent.initial());diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/board_number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_number_cell.dartsimilarity index 84%rename from frontend/app_flowy/lib/plugins/board/presentation/card/board_number_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_number_cell.dartindex 907950fcc6..13b8372b8b 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/board_number_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_number_cell.dart@@ -1,13 +1,13 @@-import 'package:app_flowy/plugins/board/application/card/board_number_cell_bloc.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../application/cell/cell_service.dart';+import '../../application/card/board_number_cell_bloc.dart';import 'define.dart';class BoardNumberCell extends StatefulWidget {final String groupId;- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;const BoardNumberCell({required this.groupId,@@ -25,7 +25,7 @@ class _BoardNumberCellState extends State<BoardNumberCell> {@overridevoid initState() {final cellController =- widget.cellControllerBuilder.build() as GridNumberCellController;+ widget.cellControllerBuilder.build() as NumberCellController;_cellBloc = BoardNumberCellBloc(cellController: cellController)..add(const BoardNumberCellEvent.initial());diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/board_select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_select_option_cell.dartsimilarity index 83%rename from frontend/app_flowy/lib/plugins/board/presentation/card/board_select_option_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_select_option_cell.dartindex 65a16a1732..b5e75fcf42 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/board_select_option_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_select_option_cell.dart@@ -1,17 +1,17 @@-import 'package:app_flowy/plugins/board/application/card/board_select_option_cell_bloc.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/cell/select_option_cell/extension.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_editor.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../application/cell/cell_service.dart';+import '../../../grid/presentation/widgets/cell/select_option_cell/extension.dart';+import '../../../grid/presentation/widgets/cell/select_option_cell/select_option_editor.dart';+import '../../application/card/board_select_option_cell_bloc.dart';import 'board_cell.dart';class BoardSelectOptionCell extends StatefulWidget with EditableCell {final String groupId;- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;@overridefinal EditableCellNotifier? editableNotifier;@@ -34,7 +34,7 @@ class _BoardSelectOptionCellState extends State<BoardSelectOptionCell> {void initState() {_popover = PopoverController();final cellController =- widget.cellControllerBuilder.build() as GridSelectOptionCellController;+ widget.cellControllerBuilder.build() as SelectOptionCellController;_cellBloc = BoardSelectOptionCellBloc(cellController: cellController)..add(const BoardSelectOptionCellEvent.initial());super.initState();@@ -94,7 +94,7 @@ class _BoardSelectOptionCellState extends State<BoardSelectOptionCell> {popupBuilder: (BuildContext context) {return SelectOptionCellEditor(cellController: widget.cellControllerBuilder.build()- as GridSelectOptionCellController,+ as SelectOptionCellController,);},onClose: () {},diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/board_text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_text_cell.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/board/presentation/card/board_text_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_text_cell.dartindex 00501c8be8..31ea45f86b 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/board_text_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_text_cell.dart@@ -1,11 +1,11 @@-import 'package:app_flowy/plugins/board/application/card/board_text_cell_bloc.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/cell/cell_builder.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/cell/cell_builder.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:textstyle_extensions/textstyle_extensions.dart';+import '../../../application/cell/cell_service.dart';+import '../../application/card/board_text_cell_bloc.dart';import 'board_cell.dart';import 'define.dart';@@ -13,7 +13,7 @@ class BoardTextCell extends StatefulWidget with EditableCell {final String groupId;@overridefinal EditableCellNotifier? editableNotifier;- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;const BoardTextCell({required this.groupId,@@ -30,12 +30,12 @@ class _BoardTextCellState extends State<BoardTextCell> {late BoardTextCellBloc _cellBloc;late TextEditingController _controller;bool focusWhenInit = false;- SingleListenerFocusNode focusNode = SingleListenerFocusNode();+ final focusNode = SingleListenerFocusNode();@overridevoid initState() {final cellController =- widget.cellControllerBuilder.build() as GridTextCellController;+ widget.cellControllerBuilder.build() as TextCellController;_cellBloc = BoardTextCellBloc(cellController: cellController)..add(const BoardTextCellEvent.initial());_controller = TextEditingController(text: _cellBloc.state.content);diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/board_url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_url_cell.dartsimilarity index 87%rename from frontend/app_flowy/lib/plugins/board/presentation/card/board_url_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_url_cell.dartindex ab7ce3e84d..25c8706440 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/board_url_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/board_url_cell.dart@@ -1,15 +1,15 @@-import 'package:app_flowy/plugins/board/application/card/board_url_cell_bloc.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';import 'package:flowy_infra/size.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:textstyle_extensions/textstyle_extensions.dart';+import '../../../application/cell/cell_service.dart';+import '../../application/card/board_url_cell_bloc.dart';import 'define.dart';class BoardUrlCell extends StatefulWidget {final String groupId;- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;const BoardUrlCell({required this.groupId,@@ -27,7 +27,7 @@ class _BoardUrlCellState extends State<BoardUrlCell> {@overridevoid initState() {final cellController =- widget.cellControllerBuilder.build() as GridURLCellController;+ widget.cellControllerBuilder.build() as URLCellController;_cellBloc = BoardURLCellBloc(cellController: cellController);_cellBloc.add(const BoardURLCellEvent.initial());super.initState();diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/card.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/card.dartsimilarity index 96%rename from frontend/app_flowy/lib/plugins/board/presentation/card/card.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/card.dartindex 32a85a2d82..8dc418487d 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/card.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/card.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/board/application/card/card_bloc.dart';-import 'package:app_flowy/plugins/board/application/card/card_data_controller.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/row/row_action_sheet.dart';+import 'package:appflowy/plugins/database_view/board/application/card/card_bloc.dart';+import 'package:appflowy/plugins/database_view/board/application/card/card_data_controller.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/row/row_action_sheet.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/card_cell_builder.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/card_cell_builder.dartsimilarity index 88%rename from frontend/app_flowy/lib/plugins/board/presentation/card/card_cell_builder.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/card_cell_builder.dartindex e54891a133..a5e8a0e8a6 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/card_cell_builder.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/card_cell_builder.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter/material.dart';+import '../../../application/cell/cell_service.dart';import 'board_cell.dart';import 'board_checkbox_cell.dart';import 'board_checklist_cell.dart';@@ -11,9 +11,8 @@ import 'board_select_option_cell.dart';import 'board_text_cell.dart';import 'board_url_cell.dart';-abstract class BoardCellBuilderDelegate- extends GridCellControllerBuilderDelegate {- GridCellCache get cellCache;+abstract class BoardCellBuilderDelegate extends CellControllerBuilderDelegate {+ CellCache get cellCache;}class BoardCellBuilder {@@ -23,10 +22,10 @@ class BoardCellBuilder {Widget buildCell(String groupId,- GridCellIdentifier cellId,+ CellIdentifier cellId,EditableCellNotifier cellNotifier,) {- final cellControllerBuilder = GridCellControllerBuilder(+ final cellControllerBuilder = CellControllerBuilder(delegate: delegate,cellId: cellId,cellCache: delegate.cellCache,diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/container/accessory.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/container/accessory.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/board/presentation/card/container/accessory.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/container/accessory.dartdiff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/container/card_container.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/container/card_container.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/board/presentation/card/container/card_container.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/container/card_container.dartdiff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/define.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/define.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/board/presentation/card/define.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/card/define.dartdiff --git a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/toolbar/board_setting.dartsimilarity index 87%rename from frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/toolbar/board_setting.dartindex cc1d562592..5e97c9875f 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/toolbar/board_setting.dart@@ -1,9 +1,9 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/board/application/toolbar/board_setting_bloc.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/toolbar/grid_group.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/toolbar/grid_property.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/board/application/toolbar/board_setting_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/toolbar/grid_group.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/toolbar/grid_property.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';@@ -19,7 +19,7 @@ import 'board_toolbar.dart';class BoardSettingContext {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;BoardSettingContext({required this.viewId,required this.fieldController,@@ -44,7 +44,7 @@ class BoardSettingList extends StatelessWidget {@overrideWidget build(BuildContext context) {return BlocProvider(- create: (context) => BoardSettingBloc(databaseId: settingContext.viewId),+ create: (context) => BoardSettingBloc(viewId: settingContext.viewId),child: BlocListener<BoardSettingBloc, BoardSettingState>(listenWhen: (previous, current) =>previous.selectedAction != current.selectedAction,@@ -171,7 +171,7 @@ class _BoardSettingListPopoverState extends State<BoardSettingListPopover> {);case BoardSettingAction.properties:return GridPropertyList(- databaseId: widget.settingContext.viewId,+ viewId: widget.settingContext.viewId,fieldController: widget.settingContext.fieldController,);}diff --git a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/toolbar/board_toolbar.dartsimilarity index 89%rename from frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/toolbar/board_toolbar.dartindex a3b3cf6fe3..89434f0b1e 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/toolbar/board_toolbar.dart@@ -1,5 +1,6 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';@@ -7,12 +8,11 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flutter/material.dart';-import '../../../../generated/locale_keys.g.dart';import 'board_setting.dart';class BoardToolbarContext {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;BoardToolbarContext({required this.viewId,diff --git a/frontend/app_flowy/lib/plugins/board/tests/integrate_test/card_test.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/tests/integrate_test/card_test.dartsimilarity index 89%rename from frontend/app_flowy/lib/plugins/board/tests/integrate_test/card_test.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/board/tests/integrate_test/card_test.dartindex fa267744c7..29308d84dc 100644--- a/frontend/app_flowy/lib/plugins/board/tests/integrate_test/card_test.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/tests/integrate_test/card_test.dart@@ -1,6 +1,6 @@// import 'package:flutter_test/flutter_test.dart';// import 'package:integration_test/integration_test.dart';-// import 'package:app_flowy/main.dart' as app;+// import 'package:appflowy/main.dart' as app;// void main() {// IntegrationTestWidgetsFlutterBinding.ensureInitialized();diff --git a/frontend/app_flowy/lib/plugins/calendar/application/calendar_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dartsimilarity index 94%rename from frontend/app_flowy/lib/plugins/calendar/application/calendar_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dartindex d546a09348..e4a2239ab7 100644--- a/frontend/app_flowy/lib/plugins/calendar/application/calendar_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';@@ -17,7 +17,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {final CalendarDataController _databaseDataController;final EventController calendarEventsController = EventController();- GridFieldController get fieldController =>+ FieldController get fieldController =>_databaseDataController.fieldController;String get databaseId => _databaseDataController.databaseId;@@ -57,7 +57,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {);}- GridRowCache? getRowCache(String blockId) {+ RowCache? getRowCache(String blockId) {return _databaseDataController.rowCache;}diff --git a/frontend/app_flowy/lib/plugins/calendar/application/calendar_data_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_data_controller.dartsimilarity index 79%rename from frontend/app_flowy/lib/plugins/calendar/application/calendar_data_controller.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_data_controller.dartindex bf69611d51..e037be073d 100644--- a/frontend/app_flowy/lib/plugins/calendar/application/calendar_data_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_data_controller.dart@@ -1,10 +1,10 @@import 'dart:async';import 'dart:collection';-import 'package:app_flowy/plugins/grid/application/view/grid_view_cache.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/grid_service.dart';-import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';+import 'package:appflowy/plugins/database_view/application/database_service.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';+import 'package:appflowy/plugins/database_view/application/view/view_cache.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';@@ -22,8 +22,8 @@ typedef OnError = void Function(FlowyError);class CalendarDataController {final String databaseId;- final DatabaseFFIService _databaseFFIService;- final GridFieldController fieldController;+ final DatabaseBackendService _databaseBackendSvc;+ final FieldController fieldController;final CalendarListener _listener;late DatabaseViewCache _viewCache;@@ -35,15 +35,15 @@ class CalendarDataController {OnError? _onError;List<RowInfo> get rowInfos => _viewCache.rowInfos;- GridRowCache get rowCache => _viewCache.rowCache;+ RowCache get rowCache => _viewCache.rowCache;CalendarDataController({required ViewPB view}): databaseId = view.id,_listener = CalendarListener(view.id),- _databaseFFIService = DatabaseFFIService(viewId: view.id),- fieldController = GridFieldController(databaseId: view.id) {+ _databaseBackendSvc = DatabaseBackendService(viewId: view.id),+ fieldController = FieldController(viewId: view.id) {_viewCache = DatabaseViewCache(- databaseId: view.id,+ viewId: view.id,fieldController: fieldController,);_viewCache.addListener(onRowsChanged: (reason) {@@ -66,7 +66,7 @@ class CalendarDataController {_onArrangeWithNewField = onArrangeWithNewField;_onError = onError;- fieldController.addListener(onFields: (fields) {+ fieldController.addListener(onReceiveFields: (fields) {_onFieldsChanged?.call(UnmodifiableListView(fields));});@@ -87,7 +87,7 @@ class CalendarDataController {}Future<Either<Unit, FlowyError>> openDatabase() async {- final result = await _databaseFFIService.openGrid();+ final result = await _databaseBackendSvc.openGrid();return result.fold((database) async {_onDatabaseChanged?.call(database);@@ -109,7 +109,7 @@ class CalendarDataController {Future<void> dispose() async {await _viewCache.dispose();- await _databaseFFIService.closeGrid();+ await _databaseBackendSvc.closeGrid();await fieldController.dispose();}}diff --git a/frontend/app_flowy/lib/plugins/calendar/application/calendar_listener.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_listener.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/calendar/application/calendar_listener.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_listener.dartindex 4b2230ce1e..7317a3377f 100644--- a/frontend/app_flowy/lib/plugins/calendar/application/calendar_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_listener.dart@@ -1,6 +1,6 @@import 'dart:typed_data';-import 'package:app_flowy/core/grid_notification.dart';+import 'package:appflowy/core/grid_notification.dart';import 'package:flowy_infra/notifier.dart';import 'package:appflowy_backend/protobuf/flowy-error/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';diff --git a/frontend/app_flowy/lib/plugins/calendar/calendar.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/calendar.dartsimilarity index 84%rename from frontend/app_flowy/lib/plugins/calendar/calendar.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/calendar/calendar.dartindex 7e23d8c7dd..3b228f94f8 100644--- a/frontend/app_flowy/lib/plugins/calendar/calendar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/calendar.dart@@ -1,12 +1,12 @@-import 'package:app_flowy/generated/locale_keys.g.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/widgets/left_bar_item.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/workspace/presentation/widgets/left_bar_item.dart';import 'package:easy_localization/easy_localization.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flutter/material.dart';-import '../util.dart';+import '../../util.dart';import 'presentation/calendar_page.dart';class CalendarPluginBuilder extends PluginBuilder {@@ -28,9 +28,6 @@ class CalendarPluginBuilder extends PluginBuilder {@overridePluginType get pluginType => PluginType.calendar;- @override- ViewDataFormatPB get dataFormatType => ViewDataFormatPB.DatabaseFormat;-@overrideViewLayoutTypePB? get layoutType => ViewLayoutTypePB.Calendar;}diff --git a/frontend/app_flowy/lib/plugins/calendar/presentation/calendar_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/calendar/presentation/calendar_page.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dartindex 81db1747fc..1927eb7ee0 100644--- a/frontend/app_flowy/lib/plugins/calendar/presentation/calendar_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart@@ -1,5 +1,4 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:calendar_view/calendar_view.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';@@ -11,6 +10,7 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';import 'package:styled_widget/styled_widget.dart';+import '../../grid/presentation/layout/sizes.dart';import 'layout/sizes.dart';import 'toolbar/calendar_toolbar.dart';diff --git a/frontend/app_flowy/lib/plugins/calendar/presentation/layout/sizes.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/layout/sizes.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/calendar/presentation/layout/sizes.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/layout/sizes.dartdiff --git a/frontend/app_flowy/lib/plugins/calendar/presentation/toolbar/calendar_toolbar.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_toolbar.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/calendar/presentation/toolbar/calendar_toolbar.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_toolbar.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/checkbox_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/checkbox_cell_bloc.dartsimilarity index 88%rename from frontend/app_flowy/lib/plugins/grid/application/cell/checkbox_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/checkbox_cell_bloc.dartindex 9ff1534ba4..49fda2addd 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/checkbox_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/checkbox_cell_bloc.dart@@ -1,16 +1,16 @@+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'cell_service/cell_service.dart';part 'checkbox_cell_bloc.freezed.dart';class CheckboxCellBloc extends Bloc<CheckboxCellEvent, CheckboxCellState> {- final GridCheckboxCellController cellController;+ final CheckboxCellController cellController;void Function()? _onCellChangedFn;CheckboxCellBloc({- required CellService service,+ required CellBackendService service,required this.cellController,}) : super(CheckboxCellState.initial(cellController)) {on<CheckboxCellEvent>(@@ -65,7 +65,7 @@ class CheckboxCellState with _$CheckboxCellState {required bool isSelected,}) = _CheckboxCellState;- factory CheckboxCellState.initial(GridTextCellController context) {+ factory CheckboxCellState.initial(TextCellController context) {return CheckboxCellState(isSelected: _isSelected(context.getCellData()));}}diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/checklist_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/checklist_cell_bloc.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/grid/application/cell/checklist_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/checklist_cell_bloc.dartindex d0489792de..adfff3b474 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/checklist_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/checklist_cell_bloc.dart@@ -1,15 +1,15 @@+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'cell_service/cell_service.dart';import 'checklist_cell_editor_bloc.dart';import 'select_option_service.dart';part 'checklist_cell_bloc.freezed.dart';class ChecklistCellBloc extends Bloc<ChecklistCellEvent, ChecklistCellState> {- final GridChecklistCellController cellController;+ final ChecklistCellController cellController;final SelectOptionFFIService _selectOptionService;void Function()? _onCellChangedFn;ChecklistCellBloc({@@ -86,8 +86,7 @@ class ChecklistCellState with _$ChecklistCellState {required double percent,}) = _ChecklistCellState;- factory ChecklistCellState.initial(- GridChecklistCellController cellController) {+ factory ChecklistCellState.initial(ChecklistCellController cellController) {return const ChecklistCellState(allOptions: [],selectedOptions: [],diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/checklist_cell_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/checklist_cell_editor_bloc.dartsimilarity index 95%rename from frontend/app_flowy/lib/plugins/grid/application/cell/checklist_cell_editor_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/checklist_cell_editor_bloc.dartindex fa88e0c605..0b8dc4abec 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/checklist_cell_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/checklist_cell_editor_bloc.dart@@ -1,6 +1,6 @@import 'dart:async';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';@@ -14,7 +14,7 @@ part 'checklist_cell_editor_bloc.freezed.dart';class ChecklistCellEditorBlocextends Bloc<ChecklistCellEditorEvent, ChecklistCellEditorState> {final SelectOptionFFIService _selectOptionService;- final GridChecklistCellController cellController;+ final ChecklistCellController cellController;ChecklistCellEditorBloc({required this.cellController,@@ -137,8 +137,7 @@ class ChecklistCellEditorState with _$ChecklistCellEditorState {required String predicate,}) = _ChecklistCellEditorState;- factory ChecklistCellEditorState.initial(- GridSelectOptionCellController context) {+ factory ChecklistCellEditorState.initial(SelectOptionCellController context) {final data = context.getCellData(loadIfNotExist: true);return ChecklistCellEditorState(diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/date_cal_bloc.dartsimilarity index 95%rename from frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/date_cal_bloc.dartindex 791752dac8..6952adccee 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/date_cal_bloc.dart@@ -1,5 +1,6 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/field/field_service.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/field/field_service.dart';import 'package:easy_localization/easy_localization.dart'show StringTranslateExtension;import 'package:appflowy_backend/log.dart';@@ -11,14 +12,13 @@ import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'package:table_calendar/table_calendar.dart';import 'dart:async';-import 'cell_service/cell_service.dart';import 'package:dartz/dartz.dart';import 'package:protobuf/protobuf.dart';import 'package:fixnum/fixnum.dart' as $fixnum;part 'date_cal_bloc.freezed.dart';class DateCalBloc extends Bloc<DateCalEvent, DateCalState> {- final GridDateCellController cellController;+ final DateCellController cellController;void Function()? _onCellChangedFn;DateCalBloc({@@ -174,8 +174,8 @@ class DateCalBloc extends Bloc<DateCalEvent, DateCalState> {}});- final result = await FieldService.updateFieldTypeOption(- viewId: cellController.databaseId,+ final result = await FieldBackendService.updateFieldTypeOption(+ viewId: cellController.viewId,fieldId: cellController.fieldInfo.id,typeOptionData: newDateTypeOption.writeToBuffer(),);diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/date_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/date_cell_bloc.dartsimilarity index 88%rename from frontend/app_flowy/lib/plugins/grid/application/cell/date_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/date_cell_bloc.dartindex c9b897923a..349b25666d 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/date_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/date_cell_bloc.dart@@ -1,13 +1,13 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';import 'package:appflowy_backend/protobuf/flowy-database/date_type_option_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'cell_service/cell_service.dart';part 'date_cell_bloc.freezed.dart';class DateCellBloc extends Bloc<DateCellEvent, DateCellState> {- final GridDateCellController cellController;+ final DateCellController cellController;void Function()? _onCellChangedFn;DateCellBloc({required this.cellController})@@ -61,7 +61,7 @@ class DateCellState with _$DateCellState {required FieldInfo fieldInfo,}) = _DateCellState;- factory DateCellState.initial(GridDateCellController context) {+ factory DateCellState.initial(DateCellController context) {final cellData = context.getCellData();return DateCellState(diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/number_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/number_cell_bloc.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/grid/application/cell/number_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/number_cell_bloc.dartindex d3217794f3..da445497ca 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/number_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/number_cell_bloc.dart@@ -1,13 +1,13 @@+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:appflowy_backend/log.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'cell_service/cell_service.dart';part 'number_cell_bloc.freezed.dart';class NumberCellBloc extends Bloc<NumberCellEvent, NumberCellState> {- final GridNumberCellController cellController;+ final NumberCellController cellController;void Function()? _onCellChangedFn;NumberCellBloc({@@ -82,7 +82,7 @@ class NumberCellState with _$NumberCellState {required String cellContent,}) = _NumberCellState;- factory NumberCellState.initial(GridTextCellController context) {+ factory NumberCellState.initial(TextCellController context) {return NumberCellState(cellContent: context.getCellData() ?? "",);diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/select_option_cell_bloc.dartsimilarity index 89%rename from frontend/app_flowy/lib/plugins/grid/application/cell/select_option_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/select_option_cell_bloc.dartindex da2e723e6b..4022729959 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/select_option_cell_bloc.dart@@ -1,14 +1,14 @@import 'dart:async';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';part 'select_option_cell_bloc.freezed.dart';class SelectOptionCellBlocextends Bloc<SelectOptionCellEvent, SelectOptionCellState> {- final GridSelectOptionCellController cellController;+ final SelectOptionCellController cellController;void Function()? _onCellChangedFn;SelectOptionCellBloc({@@ -67,8 +67,7 @@ class SelectOptionCellState with _$SelectOptionCellState {required List<SelectOptionPB> selectedOptions,}) = _SelectOptionCellState;- factory SelectOptionCellState.initial(- GridSelectOptionCellController context) {+ factory SelectOptionCellState.initial(SelectOptionCellController context) {final data = context.getCellData();return SelectOptionCellState(diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/select_option_editor_bloc.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/grid/application/cell/select_option_editor_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/select_option_editor_bloc.dartindex 055615e817..10d01cc02a 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/select_option_editor_bloc.dart@@ -1,5 +1,5 @@import 'dart:async';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';@@ -12,7 +12,7 @@ part 'select_option_editor_bloc.freezed.dart';class SelectOptionCellEditorBlocextends Bloc<SelectOptionEditorEvent, SelectOptionEditorState> {final SelectOptionFFIService _selectOptionService;- final GridSelectOptionCellController cellController;+ final SelectOptionCellController cellController;SelectOptionCellEditorBloc({required this.cellController,@@ -256,8 +256,7 @@ class SelectOptionEditorState with _$SelectOptionEditorState {required Option<String> filter,}) = _SelectOptionEditorState;- factory SelectOptionEditorState.initial(- GridSelectOptionCellController context) {+ factory SelectOptionEditorState.initial(SelectOptionCellController context) {final data = context.getCellData(loadIfNotExist: false);return SelectOptionEditorState(options: data?.options ?? [],diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_service.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/select_option_service.dartsimilarity index 87%rename from frontend/app_flowy/lib/plugins/grid/application/cell/select_option_service.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/select_option_service.dartindex 7dff75949e..774aba57f8 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/select_option_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/select_option_service.dart@@ -1,29 +1,29 @@+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_service.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/cell_entities.pb.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';-import 'cell_service/cell_service.dart';class SelectOptionFFIService {- final GridCellIdentifier cellId;+ final CellIdentifier cellId;SelectOptionFFIService({required this.cellId});- String get databaseId => cellId.databaseId;+ String get viewId => cellId.viewId;String get fieldId => cellId.fieldInfo.id;String get rowId => cellId.rowId;Future<Either<Unit, FlowyError>> create({required String name, bool isSelected = true}) {- return TypeOptionFFIService(databaseId: databaseId, fieldId: fieldId)+ return TypeOptionBackendService(viewId: viewId, fieldId: fieldId).newOption(name: name).then((result) {return result.fold((option) {final cellIdentifier = CellIdPB.create()- ..databaseId = databaseId+ ..viewId = viewId..fieldId = fieldId..rowId = rowId;final payload = SelectOptionChangesetPB.create()@@ -62,7 +62,7 @@ class SelectOptionFFIService {Future<Either<SelectOptionCellDataPB, FlowyError>> getOptionContext() {final payload = CellIdPB.create()- ..databaseId = databaseId+ ..viewId = viewId..fieldId = fieldId..rowId = rowId;@@ -87,7 +87,7 @@ class SelectOptionFFIService {CellIdPB _cellIdentifier() {return CellIdPB.create()- ..databaseId = databaseId+ ..viewId = viewId..fieldId = fieldId..rowId = rowId;}diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/text_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/text_cell_bloc.dartsimilarity index 89%rename from frontend/app_flowy/lib/plugins/grid/application/cell/text_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/text_cell_bloc.dartindex 018baf2703..5db3017a76 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/text_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/text_cell_bloc.dart@@ -1,12 +1,12 @@+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'cell_service/cell_service.dart';part 'text_cell_bloc.freezed.dart';class TextCellBloc extends Bloc<TextCellEvent, TextCellState> {- final GridTextCellController cellController;+ final TextCellController cellController;void Function()? _onCellChangedFn;TextCellBloc({required this.cellController,@@ -66,8 +66,7 @@ class TextCellState with _$TextCellState {required String content,}) = _TextCellState;- factory TextCellState.initial(GridTextCellController context) =>- TextCellState(+ factory TextCellState.initial(TextCellController context) => TextCellState(content: context.getCellData() ?? "",);}diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/url_cell_bloc.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/url_cell_bloc.dartindex 724ec3f2eb..34bc741a91 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/url_cell_bloc.dart@@ -1,13 +1,13 @@+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/url_type_option_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'cell_service/cell_service.dart';part 'url_cell_bloc.freezed.dart';class URLCellBloc extends Bloc<URLCellEvent, URLCellState> {- final GridURLCellController cellController;+ final URLCellController cellController;void Function()? _onCellChangedFn;URLCellBloc({required this.cellController,@@ -68,7 +68,7 @@ class URLCellState with _$URLCellState {required String url,}) = _URLCellState;- factory URLCellState.initial(GridURLCellController context) {+ factory URLCellState.initial(URLCellController context) {final cellData = context.getCellData();return URLCellState(content: cellData?.content ?? "",diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/url_cell_editor_bloc.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_editor_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/url_cell_editor_bloc.dartindex a21c5e52bc..8e3b613b04 100644--- a/frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/cell/url_cell_editor_bloc.dart@@ -1,13 +1,13 @@+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/url_type_option_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'cell_service/cell_service.dart';part 'url_cell_editor_bloc.freezed.dart';class URLCellEditorBloc extends Bloc<URLCellEditorEvent, URLCellEditorState> {- final GridURLCellController cellController;+ final URLCellController cellController;void Function()? _onCellChangedFn;URLCellEditorBloc({required this.cellController,@@ -69,7 +69,7 @@ class URLCellEditorState with _$URLCellEditorState {required bool isFinishEditing,}) = _URLCellEditorState;- factory URLCellEditorState.initial(GridURLCellController context) {+ factory URLCellEditorState.initial(URLCellController context) {final cellData = context.getCellData();return URLCellEditorState(content: cellData?.content ?? "",diff --git a/frontend/app_flowy/lib/plugins/grid/application/filter/checkbox_filter_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/checkbox_filter_editor_bloc.dartsimilarity index 85%rename from frontend/app_flowy/lib/plugins/grid/application/filter/checkbox_filter_editor_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/checkbox_filter_editor_bloc.dartindex ebf46b2e7a..588ddd5346 100644--- a/frontend/app_flowy/lib/plugins/grid/application/filter/checkbox_filter_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/checkbox_filter_editor_bloc.dart@@ -1,22 +1,22 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_listener.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/filter/filter_info.dart';import 'package:appflowy_backend/protobuf/flowy-database/checkbox_filter.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/util.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'filter_listener.dart';-import 'filter_service.dart';part 'checkbox_filter_editor_bloc.freezed.dart';class CheckboxFilterEditorBlocextends Bloc<CheckboxFilterEditorEvent, CheckboxFilterEditorState> {final FilterInfo filterInfo;- final FilterFFIService _ffiService;+ final FilterBackendService _filterBackendSvc;final FilterListener _listener;CheckboxFilterEditorBloc({required this.filterInfo})- : _ffiService = FilterFFIService(viewId: filterInfo.viewId),+ : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),_listener = FilterListener(viewId: filterInfo.viewId,filterId: filterInfo.filter.id,@@ -29,14 +29,14 @@ class CheckboxFilterEditorBloc_startListening();},updateCondition: (CheckboxFilterConditionPB condition) {- _ffiService.insertCheckboxFilter(+ _filterBackendSvc.insertCheckboxFilter(filterId: filterInfo.filter.id,fieldId: filterInfo.fieldInfo.id,condition: condition,);},delete: () {- _ffiService.deleteFilter(+ _filterBackendSvc.deleteFilter(fieldId: filterInfo.fieldInfo.id,filterId: filterInfo.filter.id,fieldType: filterInfo.fieldInfo.fieldType,diff --git a/frontend/app_flowy/lib/plugins/grid/application/filter/checklist_filter_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/checklist_filter_bloc.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/application/filter/checklist_filter_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/checklist_filter_bloc.dartindex f66640b44c..6d2caf61e4 100644--- a/frontend/app_flowy/lib/plugins/grid/application/filter/checklist_filter_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/checklist_filter_bloc.dart@@ -1,24 +1,24 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_listener.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/filter/filter_info.dart';import 'package:appflowy_backend/protobuf/flowy-database/checklist_filter.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/util.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'filter_listener.dart';-import 'filter_service.dart';part 'checklist_filter_bloc.freezed.dart';class ChecklistFilterEditorBlocextends Bloc<ChecklistFilterEditorEvent, ChecklistFilterEditorState> {final FilterInfo filterInfo;- final FilterFFIService _ffiService;+ final FilterBackendService _filterBackendSvc;// final SelectOptionFFIService _selectOptionService;final FilterListener _listener;ChecklistFilterEditorBloc({required this.filterInfo,- }) : _ffiService = FilterFFIService(viewId: filterInfo.viewId),+ }) : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),// _selectOptionService =// SelectOptionFFIService(cellId: cellController.cellId)_listener = FilterListener(@@ -33,14 +33,14 @@ class ChecklistFilterEditorBloc_startListening();},updateCondition: (ChecklistFilterConditionPB condition) {- _ffiService.insertChecklistFilter(+ _filterBackendSvc.insertChecklistFilter(filterId: filterInfo.filter.id,fieldId: filterInfo.fieldInfo.id,condition: condition,);},delete: () {- _ffiService.deleteFilter(+ _filterBackendSvc.deleteFilter(fieldId: filterInfo.fieldInfo.id,filterId: filterInfo.filter.id,fieldType: filterInfo.fieldInfo.fieldType,diff --git a/frontend/app_flowy/lib/plugins/grid/application/filter/filter_create_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/filter_create_bloc.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/application/filter/filter_create_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/filter_create_bloc.dartindex 45f93f924c..966a433361 100644--- a/frontend/app_flowy/lib/plugins/grid/application/filter/filter_create_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/filter_create_bloc.dart@@ -1,4 +1,5 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_service.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';import 'package:appflowy_backend/protobuf/flowy-database/checkbox_filter.pbenum.dart';@@ -11,18 +12,17 @@ import 'package:appflowy_backend/protobuf/flowy-database/text_filter.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'filter_service.dart';part 'filter_create_bloc.freezed.dart';class GridCreateFilterBlocextends Bloc<GridCreateFilterEvent, GridCreateFilterState> {final String viewId;- final FilterFFIService _ffiService;- final GridFieldController fieldController;+ final FilterBackendService _filterBackendSvc;+ final FieldController fieldController;void Function(List<FieldInfo>)? _onFieldFn;GridCreateFilterBloc({required this.viewId, required this.fieldController})- : _ffiService = FilterFFIService(viewId: viewId),+ : _filterBackendSvc = FilterBackendService(viewId: viewId),super(GridCreateFilterState.initial(fieldController.fieldInfos)) {on<GridCreateFilterEvent>((event, emit) async {@@ -81,55 +81,55 @@ class GridCreateFilterBlocfields.retainWhere((field) => field.canCreateFilter);add(GridCreateFilterEvent.didReceiveFields(fields));};- fieldController.addListener(onFields: _onFieldFn);+ fieldController.addListener(onReceiveFields: _onFieldFn);}Future<Either<Unit, FlowyError>> _createDefaultFilter(FieldInfo field) async {final fieldId = field.id;switch (field.fieldType) {case FieldType.Checkbox:- return _ffiService.insertCheckboxFilter(+ return _filterBackendSvc.insertCheckboxFilter(fieldId: fieldId,condition: CheckboxFilterConditionPB.IsChecked,);case FieldType.DateTime:final timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;- return _ffiService.insertDateFilter(+ return _filterBackendSvc.insertDateFilter(fieldId: fieldId,condition: DateFilterConditionPB.DateIs,timestamp: timestamp,);case FieldType.MultiSelect:- return _ffiService.insertSelectOptionFilter(+ return _filterBackendSvc.insertSelectOptionFilter(fieldId: fieldId,condition: SelectOptionConditionPB.OptionIs,fieldType: FieldType.MultiSelect,);case FieldType.Checklist:- return _ffiService.insertChecklistFilter(+ return _filterBackendSvc.insertChecklistFilter(fieldId: fieldId,condition: ChecklistFilterConditionPB.IsIncomplete,);case FieldType.Number:- return _ffiService.insertNumberFilter(+ return _filterBackendSvc.insertNumberFilter(fieldId: fieldId,condition: NumberFilterConditionPB.Equal,content: "",);case FieldType.RichText:- return _ffiService.insertTextFilter(+ return _filterBackendSvc.insertTextFilter(fieldId: fieldId,condition: TextFilterConditionPB.Contains,content: '',);case FieldType.SingleSelect:- return _ffiService.insertSelectOptionFilter(+ return _filterBackendSvc.insertSelectOptionFilter(fieldId: fieldId,condition: SelectOptionConditionPB.OptionIs,fieldType: FieldType.SingleSelect,);case FieldType.URL:- return _ffiService.insertURLFilter(+ return _filterBackendSvc.insertURLFilter(fieldId: fieldId,condition: TextFilterConditionPB.Contains,);diff --git a/frontend/app_flowy/lib/plugins/grid/application/filter/filter_menu_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/filter_menu_bloc.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/grid/application/filter/filter_menu_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/filter_menu_bloc.dartindex 91b2322a8a..0931fade8b 100644--- a/frontend/app_flowy/lib/plugins/grid/application/filter/filter_menu_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/filter_menu_bloc.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/filter/filter_info.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';@@ -9,7 +9,7 @@ part 'filter_menu_bloc.freezed.dart';class GridFilterMenuBlocextends Bloc<GridFilterMenuEvent, GridFilterMenuState> {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;void Function(List<FilterInfo>)? _onFilterFn;void Function(List<FieldInfo>)? _onFieldFn;@@ -58,7 +58,7 @@ class GridFilterMenuBloconFilters: (filters) {_onFilterFn?.call(filters);},- onFields: (fields) {+ onReceiveFields: (fields) {_onFieldFn?.call(fields);},);diff --git a/frontend/app_flowy/lib/plugins/grid/application/filter/select_option_filter_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/select_option_filter_bloc.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/application/filter/select_option_filter_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/select_option_filter_bloc.dartindex c503c279ca..b547b9ebe5 100644--- a/frontend/app_flowy/lib/plugins/grid/application/filter/select_option_filter_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/select_option_filter_bloc.dart@@ -1,26 +1,26 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_listener.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/filter/filter_info.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_option_filter.pbserver.dart';import 'package:appflowy_backend/protobuf/flowy-database/util.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'filter_listener.dart';-import 'filter_service.dart';part 'select_option_filter_bloc.freezed.dart';class SelectOptionFilterEditorBlocextends Bloc<SelectOptionFilterEditorEvent, SelectOptionFilterEditorState> {final FilterInfo filterInfo;- final FilterFFIService _ffiService;+ final FilterBackendService _filterBackendSvc;final FilterListener _listener;final SelectOptionFilterDelegate delegate;SelectOptionFilterEditorBloc({required this.filterInfo,required this.delegate,- }) : _ffiService = FilterFFIService(viewId: filterInfo.viewId),+ }) : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),_listener = FilterListener(viewId: filterInfo.viewId,filterId: filterInfo.filter.id,@@ -34,7 +34,7 @@ class SelectOptionFilterEditorBloc_loadOptions();},updateCondition: (SelectOptionConditionPB condition) {- _ffiService.insertSelectOptionFilter(+ _filterBackendSvc.insertSelectOptionFilter(filterId: filterInfo.filter.id,fieldId: filterInfo.fieldInfo.id,condition: condition,@@ -43,7 +43,7 @@ class SelectOptionFilterEditorBloc);},updateContent: (List<String> optionIds) {- _ffiService.insertSelectOptionFilter(+ _filterBackendSvc.insertSelectOptionFilter(filterId: filterInfo.filter.id,fieldId: filterInfo.fieldInfo.id,condition: state.filter.condition,@@ -52,7 +52,7 @@ class SelectOptionFilterEditorBloc);},delete: () {- _ffiService.deleteFilter(+ _filterBackendSvc.deleteFilter(fieldId: filterInfo.fieldInfo.id,filterId: filterInfo.filter.id,fieldType: filterInfo.fieldInfo.fieldType,diff --git a/frontend/app_flowy/lib/plugins/grid/application/filter/select_option_filter_list_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/select_option_filter_list_bloc.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/grid/application/filter/select_option_filter_list_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/select_option_filter_list_bloc.dartindex db4f83da61..9ff924c449 100644--- a/frontend/app_flowy/lib/plugins/grid/application/filter/select_option_filter_list_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/select_option_filter_list_bloc.dart@@ -1,6 +1,6 @@import 'dart:async';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/application/filter/text_filter_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/text_filter_editor_bloc.dartsimilarity index 85%rename from frontend/app_flowy/lib/plugins/grid/application/filter/text_filter_editor_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/text_filter_editor_bloc.dartindex b1d6839a85..50a45ff2ee 100644--- a/frontend/app_flowy/lib/plugins/grid/application/filter/text_filter_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/text_filter_editor_bloc.dart@@ -1,22 +1,22 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_listener.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/filter/filter_info.dart';import 'package:appflowy_backend/protobuf/flowy-database/text_filter.pbserver.dart';import 'package:appflowy_backend/protobuf/flowy-database/util.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'filter_listener.dart';-import 'filter_service.dart';part 'text_filter_editor_bloc.freezed.dart';class TextFilterEditorBlocextends Bloc<TextFilterEditorEvent, TextFilterEditorState> {final FilterInfo filterInfo;- final FilterFFIService _ffiService;+ final FilterBackendService _filterBackendSvc;final FilterListener _listener;TextFilterEditorBloc({required this.filterInfo})- : _ffiService = FilterFFIService(viewId: filterInfo.viewId),+ : _filterBackendSvc = FilterBackendService(viewId: filterInfo.viewId),_listener = FilterListener(viewId: filterInfo.viewId,filterId: filterInfo.filter.id,@@ -29,7 +29,7 @@ class TextFilterEditorBloc_startListening();},updateCondition: (TextFilterConditionPB condition) {- _ffiService.insertTextFilter(+ _filterBackendSvc.insertTextFilter(filterId: filterInfo.filter.id,fieldId: filterInfo.fieldInfo.id,condition: condition,@@ -37,7 +37,7 @@ class TextFilterEditorBloc);},updateContent: (content) {- _ffiService.insertTextFilter(+ _filterBackendSvc.insertTextFilter(filterId: filterInfo.filter.id,fieldId: filterInfo.fieldInfo.id,condition: state.filter.condition,@@ -45,7 +45,7 @@ class TextFilterEditorBloc);},delete: () {- _ffiService.deleteFilter(+ _filterBackendSvc.deleteFilter(fieldId: filterInfo.fieldInfo.id,filterId: filterInfo.filter.id,fieldType: filterInfo.fieldInfo.fieldType,diff --git a/frontend/app_flowy/lib/plugins/grid/application/grid_accessory_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_accessory_bloc.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/application/grid_accessory_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_accessory_bloc.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/application/grid_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/grid/application/grid_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dartindex 9ab3b29f74..4ad41d53c4 100644--- a/frontend/app_flowy/lib/plugins/grid/application/grid_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart@@ -1,4 +1,6 @@import 'dart:async';+import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';+import 'package:appflowy/plugins/database_view/application/row/row_service.dart';import 'package:dartz/dartz.dart';import 'package:equatable/equatable.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';@@ -6,16 +8,14 @@ import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'field/field_controller.dart';+import '../../application/field/field_controller.dart';import 'grid_data_controller.dart';-import 'row/row_cache.dart';import 'dart:collection';-import 'row/row_service.dart';part 'grid_bloc.freezed.dart';class GridBloc extends Bloc<GridEvent, GridState> {- final GridController gridController;+ final DatabaseController gridController;void Function()? _createRowOperation;GridBloc({required ViewPB view, required this.gridController})@@ -36,8 +36,8 @@ class GridBloc extends Bloc<GridEvent, GridState> {);},deleteRow: (rowInfo) async {- final rowService = RowFFIService(- databaseId: rowInfo.databaseId,+ final rowService = RowBackendService(+ viewId: rowInfo.viewId,);await rowService.deleteRow(rowInfo.rowPB.id);},@@ -67,7 +67,7 @@ class GridBloc extends Bloc<GridEvent, GridState> {return super.close();}- GridRowCache? getRowCache(String blockId, String rowId) {+ RowCache? getRowCache(String blockId, String rowId) {return gridController.rowCache;}@@ -131,7 +131,7 @@ class GridEvent with _$GridEvent {@freezedclass GridState with _$GridState {const factory GridState({- required String databaseId,+ required String viewId,required Option<DatabasePB> grid,required GridFieldEquatable fields,required List<RowInfo> rowInfos,@@ -140,12 +140,12 @@ class GridState with _$GridState {required RowsChangedReason reason,}) = _GridState;- factory GridState.initial(String databaseId) => GridState(+ factory GridState.initial(String viewId) => GridState(fields: GridFieldEquatable(UnmodifiableListView([])),rowInfos: [],rowCount: 0,grid: none(),- databaseId: databaseId,+ viewId: viewId,loadingState: const _Loading(),reason: const InitialListState(),);diff --git a/frontend/app_flowy/lib/plugins/grid/application/grid_data_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_data_controller.dartsimilarity index 56%rename from frontend/app_flowy/lib/plugins/grid/application/grid_data_controller.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_data_controller.dartindex 62290b17a4..f9a9ac9049 100644--- a/frontend/app_flowy/lib/plugins/grid/application/grid_data_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_data_controller.dart@@ -1,17 +1,13 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/view/view_cache.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database/grid_entities.pb.dart';+import 'package:collection/collection.dart';import 'dart:async';import 'package:dartz/dartz.dart';-import 'view/grid_view_cache.dart';-import 'field/field_controller.dart';-import 'prelude.dart';-import 'row/row_cache.dart';--typedef OnFieldsChanged = void Function(List<FieldInfo>);-typedef OnFiltersChanged = void Function(List<FilterInfo>);-typedef OnGridChanged = void Function(DatabasePB);+import '../../application/database_service.dart';+import '../../application/defines.dart';+import '../../application/row/row_cache.dart';typedef OnRowsChanged = void Function(List<RowInfo> rowInfos,@@ -19,23 +15,23 @@ typedef OnRowsChanged = void Function();typedef ListenOnRowChangedCondition = bool Function();-class GridController {- final String databaseId;- final DatabaseFFIService _gridFFIService;- final GridFieldController fieldController;+class DatabaseController {+ final String viewId;+ final DatabaseBackendService _databaseBackendSvc;+ final FieldController fieldController;late DatabaseViewCache _viewCache;OnRowsChanged? _onRowChanged;- OnGridChanged? _onGridChanged;+ OnDatabaseChanged? _onGridChanged;List<RowInfo> get rowInfos => _viewCache.rowInfos;- GridRowCache get rowCache => _viewCache.rowCache;+ RowCache get rowCache => _viewCache.rowCache;- GridController({required ViewPB view})- : databaseId = view.id,- _gridFFIService = DatabaseFFIService(viewId: view.id),- fieldController = GridFieldController(databaseId: view.id) {+ DatabaseController({required ViewPB view})+ : viewId = view.id,+ _databaseBackendSvc = DatabaseBackendService(viewId: view.id),+ fieldController = FieldController(viewId: view.id) {_viewCache = DatabaseViewCache(- databaseId: databaseId,+ viewId: viewId,fieldController: fieldController,);_viewCache.addListener(onRowsChanged: (reason) {@@ -44,7 +40,7 @@ class GridController {}void addListener({- OnGridChanged? onGridChanged,+ OnDatabaseChanged? onGridChanged,OnRowsChanged? onRowsChanged,OnFieldsChanged? onFieldsChanged,OnFiltersChanged? onFiltersChanged,@@ -53,13 +49,15 @@ class GridController {_onRowChanged = onRowsChanged;fieldController.addListener(- onFields: onFieldsChanged,+ onReceiveFields: (fields) {+ onFieldsChanged?.call(UnmodifiableListView(fields));+ },onFilters: onFiltersChanged,);}Future<Either<Unit, FlowyError>> openGrid() async {- return _gridFFIService.openGrid().then((result) {+ return _databaseBackendSvc.openGrid().then((result) {return result.fold((grid) async {_onGridChanged?.call(grid);@@ -75,11 +73,11 @@ class GridController {}Future<void> createRow() async {- await _gridFFIService.createRow();+ await _databaseBackendSvc.createRow();}Future<void> dispose() async {- await _gridFFIService.closeGrid();+ await _databaseBackendSvc.closeGrid();await fieldController.dispose();}}diff --git a/frontend/app_flowy/lib/plugins/grid/application/grid_header_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_header_bloc.dartsimilarity index 85%rename from frontend/app_flowy/lib/plugins/grid/application/grid_header_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_header_bloc.dartindex f46f1347b2..7d212a80e0 100644--- a/frontend/app_flowy/lib/plugins/grid/application/grid_header_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_header_bloc.dart@@ -1,19 +1,19 @@-import 'package:app_flowy/plugins/grid/application/field/field_service.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'field/field_controller.dart';+import '../../application/field/field_service.dart';part 'grid_header_bloc.freezed.dart';class GridHeaderBloc extends Bloc<GridHeaderEvent, GridHeaderState> {- final GridFieldController fieldController;- final String databaseId;+ final FieldController fieldController;+ final String viewId;GridHeaderBloc({- required this.databaseId,+ required this.viewId,required this.fieldController,}) : super(GridHeaderState.initial(fieldController.fieldInfos)) {on<GridHeaderEvent>(@@ -46,7 +46,7 @@ class GridHeaderBloc extends Bloc<GridHeaderEvent, GridHeaderState> {emit(state.copyWith(fields: fields));final fieldService =- FieldService(viewId: databaseId, fieldId: value.field.id);+ FieldBackendService(viewId: viewId, fieldId: value.field.id);final result = await fieldService.moveField(value.fromIndex,value.toIndex,@@ -56,7 +56,8 @@ class GridHeaderBloc extends Bloc<GridHeaderEvent, GridHeaderState> {Future<void> _startListening() async {fieldController.addListener(- onFields: (fields) => add(GridHeaderEvent.didReceiveFieldUpdate(fields)),+ onReceiveFields: (fields) =>+ add(GridHeaderEvent.didReceiveFieldUpdate(fields)),listenWhen: () => !isClosed,);}diff --git a/frontend/app_flowy/lib/plugins/grid/application/row/row_action_sheet_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_action_sheet_bloc.dartsimilarity index 88%rename from frontend/app_flowy/lib/plugins/grid/application/row/row_action_sheet_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_action_sheet_bloc.dartindex b9317ff851..1ff5529ad9 100644--- a/frontend/app_flowy/lib/plugins/grid/application/row/row_action_sheet_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_action_sheet_bloc.dart@@ -1,4 +1,3 @@-import 'package:app_flowy/plugins/grid/application/row/row_service.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -6,16 +5,17 @@ import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';import 'package:dartz/dartz.dart';-import 'row_cache.dart';+import '../../../application/row/row_cache.dart';+import '../../../application/row/row_service.dart';part 'row_action_sheet_bloc.freezed.dart';class RowActionSheetBlocextends Bloc<RowActionSheetEvent, RowActionSheetState> {- final RowFFIService _rowService;+ final RowBackendService _rowService;RowActionSheetBloc({required RowInfo rowInfo})- : _rowService = RowFFIService(databaseId: rowInfo.databaseId),+ : _rowService = RowBackendService(viewId: rowInfo.viewId),super(RowActionSheetState.initial(rowInfo)) {on<RowActionSheetEvent>((event, emit) async {diff --git a/frontend/app_flowy/lib/plugins/grid/application/row/row_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_bloc.dartsimilarity index 68%rename from frontend/app_flowy/lib/plugins/grid/application/row/row_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_bloc.dartindex 436338cb06..7a5d413880 100644--- a/frontend/app_flowy/lib/plugins/grid/application/row/row_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_bloc.dart@@ -1,43 +1,44 @@import 'dart:collection';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:equatable/equatable.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'row_cache.dart';-import 'row_data_controller.dart';-import 'row_service.dart';++import '../../../application/cell/cell_service.dart';+import '../../../application/field/field_controller.dart';+import '../../../application/row/row_cache.dart';+import '../../../application/row/row_data_controller.dart';+import '../../../application/row/row_service.dart';part 'row_bloc.freezed.dart';class RowBloc extends Bloc<RowEvent, RowState> {- final RowFFIService _rowService;+ final RowBackendService _rowBackendSvc;final RowDataController _dataController;RowBloc({required RowInfo rowInfo,required RowDataController dataController,- }) : _rowService = RowFFIService(databaseId: rowInfo.databaseId),+ }) : _rowBackendSvc = RowBackendService(viewId: rowInfo.viewId),_dataController = dataController,super(RowState.initial(rowInfo, dataController.loadData())) {on<RowEvent>((event, emit) async {- await event.map(- initial: (_InitialRow value) async {+ await event.when(+ initial: () async {await _startListening();},- createRow: (_CreateRow value) {- _rowService.createRow(rowInfo.rowPB.id);+ createRow: () {+ _rowBackendSvc.createRow(rowInfo.rowPB.id);},- didReceiveCells: (_DidReceiveCells value) async {- final cells = value.gridCellMap.values+ didReceiveCells: (cellByFieldId, reason) async {+ final cells = cellByFieldId.values.map((e) => GridCellEquatable(e.fieldInfo)).toList();emit(state.copyWith(- gridCellMap: value.gridCellMap,+ cellByFieldId: cellByFieldId,cells: UnmodifiableListView(cells),- changeReason: value.reason,+ changeReason: reason,));},);@@ -67,24 +68,25 @@ class RowEvent with _$RowEvent {const factory RowEvent.initial() = _InitialRow;const factory RowEvent.createRow() = _CreateRow;const factory RowEvent.didReceiveCells(- GridCellMap gridCellMap, RowsChangedReason reason) = _DidReceiveCells;+ CellByFieldId cellsByFieldId, RowsChangedReason reason) =+ _DidReceiveCells;}@freezedclass RowState with _$RowState {const factory RowState({required RowInfo rowInfo,- required GridCellMap gridCellMap,+ required CellByFieldId cellByFieldId,required UnmodifiableListView<GridCellEquatable> cells,RowsChangedReason? changeReason,}) = _RowState;- factory RowState.initial(RowInfo rowInfo, GridCellMap cellDataMap) =>+ factory RowState.initial(RowInfo rowInfo, CellByFieldId cellByFieldId) =>RowState(rowInfo: rowInfo,- gridCellMap: cellDataMap,+ cellByFieldId: cellByFieldId,cells: UnmodifiableListView(- cellDataMap.values+ cellByFieldId.values.map((e) => GridCellEquatable(e.fieldInfo)).toList(),),diff --git a/frontend/app_flowy/lib/plugins/grid/application/row/row_detail_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_detail_bloc.dartsimilarity index 81%rename from frontend/app_flowy/lib/plugins/grid/application/row/row_detail_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_detail_bloc.dartindex 5f89a6a51d..83eb0f7782 100644--- a/frontend/app_flowy/lib/plugins/grid/application/row/row_detail_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/row/row_detail_bloc.dart@@ -1,9 +1,9 @@-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:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'row_data_controller.dart';+import '../../../application/cell/cell_service.dart';+import '../../../application/field/field_service.dart';+import '../../../application/row/row_data_controller.dart';part 'row_detail_bloc.freezed.dart';class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {@@ -26,8 +26,8 @@ class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {emit(state.copyWith(gridCells: value.gridCells));},deleteField: (_DeleteField value) {- final fieldService = FieldService(- viewId: dataController.rowInfo.databaseId,+ final fieldService = FieldBackendService(+ viewId: dataController.rowInfo.viewId,fieldId: value.fieldId,);fieldService.deleteField();@@ -59,13 +59,13 @@ class RowDetailEvent with _$RowDetailEvent {const factory RowDetailEvent.initial() = _Initial;const factory RowDetailEvent.deleteField(String fieldId) = _DeleteField;const factory RowDetailEvent.didReceiveCellDatas(- List<GridCellIdentifier> gridCells) = _DidReceiveCellDatas;+ List<CellIdentifier> gridCells) = _DidReceiveCellDatas;}@freezedclass RowDetailState with _$RowDetailState {const factory RowDetailState({- required List<GridCellIdentifier> gridCells,+ required List<CellIdentifier> gridCells,}) = _RowDetailState;factory RowDetailState.initial() => RowDetailState(diff --git a/frontend/app_flowy/lib/plugins/grid/application/sort/sort_create_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/sort_create_bloc.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/grid/application/sort/sort_create_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/sort_create_bloc.dartindex b29ed99b1e..c5bd4932fe 100644--- a/frontend/app_flowy/lib/plugins/grid/application/sort/sort_create_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/sort_create_bloc.dart@@ -1,4 +1,3 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';import 'package:appflowy_backend/protobuf/flowy-database/sort_entities.pbenum.dart';@@ -7,18 +6,19 @@ import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';-import 'sort_service.dart';+import '../../../application/field/field_controller.dart';+import '../../../application/sort/sort_service.dart';import 'util.dart';part 'sort_create_bloc.freezed.dart';class CreateSortBloc extends Bloc<CreateSortEvent, CreateSortState> {final String viewId;- final SortFFIService _ffiService;- final GridFieldController fieldController;+ final SortBackendService _sortBackendSvc;+ final FieldController fieldController;void Function(List<FieldInfo>)? _onFieldFn;CreateSortBloc({required this.viewId, required this.fieldController})- : _ffiService = SortFFIService(viewId: viewId),+ : _sortBackendSvc = SortBackendService(viewId: viewId),super(CreateSortState.initial(fieldController.fieldInfos)) {on<CreateSortEvent>((event, emit) async {@@ -77,11 +77,11 @@ class CreateSortBloc extends Bloc<CreateSortEvent, CreateSortState> {fields.retainWhere((field) => field.canCreateSort);add(CreateSortEvent.didReceiveFields(fields));};- fieldController.addListener(onFields: _onFieldFn);+ fieldController.addListener(onReceiveFields: _onFieldFn);}Future<Either<Unit, FlowyError>> _createDefaultSort(FieldInfo field) async {- final result = await _ffiService.insertSort(+ final result = await _sortBackendSvc.insertSort(fieldId: field.id,fieldType: field.fieldType,condition: SortConditionPB.Ascending);diff --git a/frontend/app_flowy/lib/plugins/grid/application/sort/sort_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/sort_editor_bloc.dartsimilarity index 85%rename from frontend/app_flowy/lib/plugins/grid/application/sort/sort_editor_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/sort_editor_bloc.dartindex 9d279a1e66..7f792d62db 100644--- a/frontend/app_flowy/lib/plugins/grid/application/sort/sort_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/sort_editor_bloc.dart@@ -1,27 +1,26 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/sort/sort_info.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/sort/sort_service.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/sort/sort_info.dart';import 'package:appflowy_backend/protobuf/flowy-database/sort_entities.pbenum.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database/sort_entities.pbserver.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';--import 'sort_service.dart';import 'util.dart';part 'sort_editor_bloc.freezed.dart';class SortEditorBloc extends Bloc<SortEditorEvent, SortEditorState> {final String viewId;- final SortFFIService _ffiService;- final GridFieldController fieldController;+ final SortBackendService _sortBackendSvc;+ final FieldController fieldController;void Function(List<FieldInfo>)? _onFieldFn;SortEditorBloc({required this.viewId,required this.fieldController,required List<SortInfo> sortInfos,- }) : _ffiService = SortFFIService(viewId: viewId),+ }) : _sortBackendSvc = SortBackendService(viewId: viewId),super(SortEditorState.initial(sortInfos, fieldController.fieldInfos)) {on<SortEditorEvent>((event, emit) async {@@ -41,7 +40,7 @@ class SortEditorBloc extends Bloc<SortEditorEvent, SortEditorState> {);},setCondition: (SortInfo sortInfo, SortConditionPB condition) async {- final result = await _ffiService.updateSort(+ final result = await _sortBackendSvc.updateSort(fieldId: sortInfo.fieldInfo.id,sortId: sortInfo.sortId,fieldType: sortInfo.fieldInfo.fieldType,@@ -50,14 +49,14 @@ class SortEditorBloc extends Bloc<SortEditorEvent, SortEditorState> {result.fold((l) => {}, (err) => Log.error(err));},deleteAllSorts: () async {- final result = await _ffiService.deleteAllSorts();+ final result = await _sortBackendSvc.deleteAllSorts();result.fold((l) => {}, (err) => Log.error(err));},didReceiveSorts: (List<SortInfo> sortInfos) {emit(state.copyWith(sortInfos: sortInfos));},deleteSort: (SortInfo sortInfo) async {- final result = await _ffiService.deleteSort(+ final result = await _sortBackendSvc.deleteSort(fieldId: sortInfo.fieldInfo.id,sortId: sortInfo.sortId,fieldType: sortInfo.fieldInfo.fieldType,@@ -76,7 +75,7 @@ class SortEditorBloc extends Bloc<SortEditorEvent, SortEditorState> {fieldController.addListener(listenWhen: () => !isClosed,- onFields: _onFieldFn,+ onReceiveFields: _onFieldFn,onSorts: (sorts) {add(SortEditorEvent.didReceiveSorts(sorts));},diff --git a/frontend/app_flowy/lib/plugins/grid/application/sort/sort_menu_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/sort_menu_bloc.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/grid/application/sort/sort_menu_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/sort_menu_bloc.dartindex ea0215ac30..fb1bb81bd1 100644--- a/frontend/app_flowy/lib/plugins/grid/application/sort/sort_menu_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/sort_menu_bloc.dart@@ -1,15 +1,15 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/sort/sort_info.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'dart:async';+import '../../../application/field/field_controller.dart';+import '../../presentation/widgets/sort/sort_info.dart';import 'util.dart';part 'sort_menu_bloc.freezed.dart';class SortMenuBloc extends Bloc<SortMenuEvent, SortMenuState> {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;void Function(List<SortInfo>)? _onSortChangeFn;void Function(List<FieldInfo>)? _onFieldFn;@@ -58,7 +58,7 @@ class SortMenuBloc extends Bloc<SortMenuEvent, SortMenuState> {onSorts: (sortInfos) {_onSortChangeFn?.call(sortInfos);},- onFields: (fields) {+ onReceiveFields: (fields) {_onFieldFn?.call(fields);},);diff --git a/frontend/app_flowy/lib/plugins/grid/application/sort/util.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/util.dartsimilarity index 73%rename from frontend/app_flowy/lib/plugins/grid/application/sort/util.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/util.dartindex 3dc42909cb..1189427515 100644--- a/frontend/app_flowy/lib/plugins/grid/application/sort/util.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/sort/util.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';+import '../../../application/field/field_controller.dart';List<FieldInfo> getCreatableSorts(List<FieldInfo> fieldInfos) {final List<FieldInfo> creatableFields = List.from(fieldInfos);diff --git a/frontend/app_flowy/lib/plugins/grid/grid.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/grid.dartsimilarity index 83%rename from frontend/app_flowy/lib/plugins/grid/grid.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/grid.dartindex 3e09aa8f9a..ba4bc2f628 100644--- a/frontend/app_flowy/lib/plugins/grid/grid.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/grid.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/util.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/widgets/left_bar_item.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/util.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/workspace/presentation/widgets/left_bar_item.dart';import 'package:easy_localization/easy_localization.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flutter/material.dart';@@ -28,9 +28,6 @@ class GridPluginBuilder implements PluginBuilder {@overridePluginType get pluginType => PluginType.grid;- @override- ViewDataFormatPB get dataFormatType => ViewDataFormatPB.DatabaseFormat;-@overrideViewLayoutTypePB? get layoutType => ViewLayoutTypePB.Grid;}diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dartindex b1d6660de1..a7b94a30ef 100755--- a/frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart@@ -1,10 +1,4 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/filter/filter_menu_bloc.dart';-import 'package:app_flowy/plugins/grid/application/grid_data_controller.dart';-import 'package:app_flowy/plugins/grid/application/row/row_data_controller.dart';-import 'package:app_flowy/plugins/grid/application/grid_bloc.dart';-import 'package:app_flowy/plugins/grid/application/sort/sort_menu_bloc.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui_web.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';@@ -16,9 +10,15 @@ import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:flutter/material.dart';import 'package:linked_scroll_controller/linked_scroll_controller.dart';-import '../application/row/row_cache.dart';-import '../application/setting/setting_bloc.dart';-import 'controller/grid_scroll.dart';+import '../../application/field/field_controller.dart';+import '../../application/row/row_cache.dart';+import '../../application/row/row_data_controller.dart';+import '../../application/setting/setting_bloc.dart';+import '../application/filter/filter_menu_bloc.dart';+import '../application/grid_bloc.dart';+import '../application/grid_data_controller.dart';+import '../application/sort/sort_menu_bloc.dart';+import 'grid_scroll.dart';import 'layout/layout.dart';import 'layout/sizes.dart';import 'widgets/accessory_menu.dart';@@ -35,11 +35,11 @@ class GridPage extends StatefulWidget {required this.view,this.onDeleted,Key? key,- }) : gridController = GridController(view: view),+ }) : gridController = DatabaseController(view: view),super(key: key);final ViewPB view;- final GridController gridController;+ final DatabaseController gridController;final VoidCallback? onDeleted;@override@@ -69,8 +69,8 @@ class _GridPageState extends State<GridPage> {fieldController: widget.gridController.fieldController,)..add(const SortMenuEvent.initial()),),- BlocProvider<GridSettingBloc>(- create: (context) => GridSettingBloc(databaseId: widget.view.id),+ BlocProvider<DatabaseSettingBloc>(+ create: (context) => DatabaseSettingBloc(viewId: widget.view.id),),],child: BlocBuilder<GridBloc, GridState>(@@ -146,8 +146,8 @@ class _FlowyGridState extends State<FlowyGrid> {crossAxisAlignment: CrossAxisAlignment.start,children: [const GridToolbar(),- GridAccessoryMenu(viewId: state.databaseId),- _gridHeader(context, state.databaseId),+ GridAccessoryMenu(viewId: state.viewId),+ _gridHeader(context, state.viewId),Flexible(child: child),const RowCountBadge(),],@@ -304,8 +304,8 @@ class _GridRowsState extends State<_GridRows> {void _openRowDetailPage(BuildContext context,RowInfo rowInfo,- GridFieldController fieldController,- GridRowCache rowCache,+ FieldController fieldController,+ RowCache rowCache,GridCellBuilder cellBuilder,) {final dataController = RowDataController(diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/controller/grid_scroll.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_scroll.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/controller/grid_scroll.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_scroll.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/layout/layout.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/layout/layout.dartsimilarity index 80%rename from frontend/app_flowy/lib/plugins/grid/presentation/layout/layout.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/layout/layout.dartindex 67fa9ff709..1cb17c8ebe 100755--- a/frontend/app_flowy/lib/plugins/grid/presentation/layout/layout.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/layout/layout.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';import 'sizes.dart';class GridLayout {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/layout/sizes.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/layout/sizes.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/layout/sizes.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/layout/sizes.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/accessory_menu.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/accessory_menu.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/accessory_menu.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/accessory_menu.dartindex 4967354f82..c2cbaf30b3 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/accessory_menu.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/accessory_menu.dart@@ -1,14 +1,14 @@-import 'package:app_flowy/plugins/grid/application/filter/filter_menu_bloc.dart';-import 'package:app_flowy/plugins/grid/application/grid_accessory_bloc.dart';-import 'package:app_flowy/plugins/grid/application/sort/sort_menu_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/sort/sort_menu.dart';+import 'package:appflowy/plugins/database_view/grid/application/filter/filter_menu_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_accessory_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/sort/sort_menu_bloc.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../layout/sizes.dart';import 'filter/filter_menu.dart';+import 'sort/sort_menu.dart';class GridAccessoryMenu extends StatelessWidget {final String viewId;diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_accessory.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_accessory.dartsimilarity index 99%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_accessory.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_accessory.dartindex de4b685b64..142dc81448 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_accessory.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_accessory.dart@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';import 'package:provider/provider.dart';import 'package:flowy_infra/size.dart';import 'package:styled_widget/styled_widget.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';import 'package:textstyle_extensions/textstyle_extensions.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_builder.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_builder.dartsimilarity index 94%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_builder.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_builder.dartindex 6eec3e3d29..e8dc7bfa29 100755--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_builder.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_builder.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter/services.dart';import 'package:flutter/widgets.dart';import 'package:flutter/material.dart';+import '../../../../application/cell/cell_service.dart';import 'cell_accessory.dart';import 'cell_shortcuts.dart';import 'checkbox_cell.dart';@@ -13,9 +13,8 @@ import 'select_option_cell/select_option_cell.dart';import 'text_cell.dart';import 'url_cell/url_cell.dart';-abstract class GridCellBuilderDelegate- extends GridCellControllerBuilderDelegate {- GridCellCache get cellCache;+abstract class GridCellBuilderDelegate extends CellControllerBuilderDelegate {+ CellCache get cellCache;}class GridCellBuilder {@@ -24,8 +23,8 @@ class GridCellBuilder {required this.delegate,});- GridCellWidget build(GridCellIdentifier cellId, {GridCellStyle? style}) {- final cellControllerBuilder = GridCellControllerBuilder(+ GridCellWidget build(CellIdentifier cellId, {GridCellStyle? style}) {+ final cellControllerBuilder = CellControllerBuilder(cellId: cellId,cellCache: delegate.cellCache,delegate: delegate,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_container.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_container.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_container.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_container.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_decoration.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_decoration.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_decoration.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_decoration.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_shortcuts.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_shortcuts.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/cell_shortcuts.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/cell_shortcuts.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checkbox_cell.dartsimilarity index 87%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checkbox_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checkbox_cell.dartindex ad1f8ad277..845c85bd6b 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checkbox_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checkbox_cell.dart@@ -1,14 +1,15 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';+import 'package:appflowy/startup/startup.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../../application/cell/cell_service.dart';+import '../../../application/cell/checkbox_cell_bloc.dart';import '../../layout/sizes.dart';import 'cell_builder.dart';class GridCheckboxCell extends GridCellWidget {- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;GridCheckboxCell({required this.cellControllerBuilder,Key? key,@@ -24,7 +25,7 @@ class _CheckboxCellState extends GridCellState<GridCheckboxCell> {@overridevoid initState() {final cellController =- widget.cellControllerBuilder.build() as GridCheckboxCellController;+ widget.cellControllerBuilder.build() as CheckboxCellController;_cellBloc = getIt<CheckboxCellBloc>(param1: cellController)..add(const CheckboxCellEvent.initial());super.initState();diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checklist_cell/checklist_cell.dartsimilarity index 79%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checklist_cell/checklist_cell.dartindex 0c9548974c..18893b0b37 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checklist_cell/checklist_cell.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/cell/checklist_cell_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/checklist_cell_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -11,7 +11,7 @@ import 'checklist_cell_editor.dart';import 'checklist_progress_bar.dart';class GridChecklistCell extends GridCellWidget {- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;GridChecklistCell({required this.cellControllerBuilder, Key? key}): super(key: key);@@ -27,7 +27,7 @@ class GridChecklistCellState extends GridCellState<GridChecklistCell> {void initState() {_popover = PopoverController();final cellController =- widget.cellControllerBuilder.build() as GridChecklistCellController;+ widget.cellControllerBuilder.build() as ChecklistCellController;_cellBloc = ChecklistCellBloc(cellController: cellController);_cellBloc.add(const ChecklistCellEvent.initial());super.initState();@@ -47,8 +47,8 @@ class GridChecklistCellState extends GridCellState<GridChecklistCell> {widget.onCellEditing.value = true;});return GridChecklistCellEditor(- cellController: widget.cellControllerBuilder.build()- as GridChecklistCellController,+ cellController:+ widget.cellControllerBuilder.build() as ChecklistCellController,);},onClose: () => widget.onCellEditing.value = false,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checklist_cell/checklist_cell_editor.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_cell_editor.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checklist_cell/checklist_cell_editor.dartindex 281f6a954c..36976d28a4 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_cell_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checklist_cell/checklist_cell_editor.dart@@ -1,8 +1,3 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/cell/checklist_cell_editor_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_progress_bar.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/header/type_option/select_option_editor.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -13,8 +8,14 @@ import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../../../application/cell/cell_service.dart';+import '../../../../application/cell/checklist_cell_editor_bloc.dart';+import '../../../layout/sizes.dart';+import '../../header/type_option/select_option_editor.dart';+import 'checklist_progress_bar.dart';+class GridChecklistCellEditor extends StatefulWidget {- final GridChecklistCellController cellController;+ final ChecklistCellController cellController;const GridChecklistCellEditor({required this.cellController, Key? key}): super(key: key);diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_progress_bar.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checklist_cell/checklist_progress_bar.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_progress_bar.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checklist_cell/checklist_progress_bar.dartindex 317d9dacff..5a3517e6a8 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/checklist_cell/checklist_progress_bar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/checklist_cell/checklist_progress_bar.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/cell/checklist_cell_editor_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/checklist_cell_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/date_cell/date_cell.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/date_cell/date_cell.dartindex 64813a5fd5..29573cdad0 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/date_cell/date_cell.dart@@ -1,8 +1,9 @@+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/date_cell_bloc.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/widgets.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';+import 'package:appflowy/startup/startup.dart';import 'package:appflowy_popover/appflowy_popover.dart';import '../../../layout/sizes.dart';@@ -21,7 +22,7 @@ abstract class GridCellDelegate {}class GridDateCell extends GridCellWidget {- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;late final DateCellStyle? cellStyle;GridDateCell({@@ -48,7 +49,7 @@ class _DateCellState extends GridCellState<GridDateCell> {void initState() {_popover = PopoverController();final cellController =- widget.cellControllerBuilder.build() as GridDateCellController;+ widget.cellControllerBuilder.build() as DateCellController;_cellBloc = getIt<DateCellBloc>(param1: cellController)..add(const DateCellEvent.initial());super.initState();@@ -83,8 +84,8 @@ class _DateCellState extends GridCellState<GridDateCell> {),popupBuilder: (BuildContext popoverContent) {return DateCellEditor(- cellController: widget.cellControllerBuilder.build()- as GridDateCellController,+ cellController:+ widget.cellControllerBuilder.build() as DateCellController,onDismissed: () => widget.onCellEditing.value = false,);},diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/date_cell/date_editor.dartsimilarity index 95%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/date_cell/date_editor.dartindex f8de1b2e59..4db76db17f 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/date_cell/date_editor.dart@@ -1,9 +1,8 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/cell/date_cal_bloc.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/common/type_option_separator.dart';-import 'package:app_flowy/workspace/presentation/widgets/toggle/toggle.dart';-import 'package:app_flowy/workspace/presentation/widgets/toggle/toggle_style.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/date_cal_bloc.dart';+import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';+import 'package:appflowy/workspace/presentation/widgets/toggle/toggle_style.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:dartz/dartz.dart' show Either;import 'package:easy_localization/easy_localization.dart';@@ -20,9 +19,10 @@ import 'package:appflowy_backend/protobuf/flowy-database/date_type_option.pb.darimport 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:table_calendar/table_calendar.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'package:textstyle_extensions/textstyle_extensions.dart';+import '../../../../../application/cell/cell_service.dart';import '../../../layout/sizes.dart';+import '../../common/type_option_separator.dart';import '../../header/type_option/date.dart';final kToday = DateTime.now();@@ -31,7 +31,7 @@ final kLastDay = DateTime(kToday.year, kToday.month + 3, kToday.day);class DateCellEditor extends StatefulWidget {final VoidCallback onDismissed;- final GridDateCellController cellController;+ final DateCellController cellController;const DateCellEditor({Key? key,@@ -47,7 +47,7 @@ class _DateCellEditor extends State<DateCellEditor> {@overrideWidget build(BuildContext context) {return FutureBuilder<Either<dynamic, FlowyError>>(- future: widget.cellController.getFieldTypeOption(+ future: widget.cellController.getTypeOption(DateTypeOptionDataParser(),),builder: (BuildContext context, snapshot) {@@ -77,7 +77,7 @@ class _DateCellEditor extends State<DateCellEditor> {}class _CellCalendarWidget extends StatefulWidget {- final GridDateCellController cellContext;+ final DateCellController cellContext;final DateTypeOptionPB dateTypeOptionPB;const _CellCalendarWidget({diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/number_cell.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/number_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/number_cell.dartindex 53badd13b0..de73f74823 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/number_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/number_cell.dart@@ -1,14 +1,15 @@import 'dart:async';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';+import 'package:appflowy/startup/startup.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../../application/cell/cell_service.dart';+import '../../../application/cell/number_cell_bloc.dart';import '../../layout/sizes.dart';import 'cell_builder.dart';class GridNumberCell extends GridCellWidget {- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;GridNumberCell({required this.cellControllerBuilder,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/prelude.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/prelude.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/prelude.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/extension.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/extension.dartsimilarity index 98%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/extension.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/extension.dartindex 155900e289..c83b8ade30 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/extension.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/extension.dart@@ -7,7 +7,7 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';import 'package:flutter/material.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';extension SelectOptionColorExtension on SelectOptionColorPB {Color make(BuildContext context) {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dartindex b601384169..48b2089019 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dart@@ -1,14 +1,12 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/startup/startup.dart';import 'package:appflowy_popover/appflowy_popover.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-// ignore: unused_import-import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../../application/cell/select_option_cell_bloc.dart';import '../../../layout/sizes.dart';import '../cell_builder.dart';import 'extension.dart';@@ -23,7 +21,7 @@ class SelectOptionCellStyle extends GridCellStyle {}class GridSingleSelectCell extends GridCellWidget {- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;late final SelectOptionCellStyle? cellStyle;GridSingleSelectCell({@@ -49,7 +47,7 @@ class _SingleSelectCellState extends GridCellState<GridSingleSelectCell> {@overridevoid initState() {final cellController =- widget.cellControllerBuilder.build() as GridSelectOptionCellController;+ widget.cellControllerBuilder.build() as SelectOptionCellController;_cellBloc = getIt<SelectOptionCellBloc>(param1: cellController)..add(const SelectOptionCellEvent.initial());_popover = PopoverController();@@ -86,7 +84,7 @@ class _SingleSelectCellState extends GridCellState<GridSingleSelectCell> {//----------------------------------------------------------------class GridMultiSelectCell extends GridCellWidget {- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;late final SelectOptionCellStyle? cellStyle;GridMultiSelectCell({@@ -112,7 +110,7 @@ class _MultiSelectCellState extends GridCellState<GridMultiSelectCell> {@overridevoid initState() {final cellController =- widget.cellControllerBuilder.build() as GridSelectOptionCellController;+ widget.cellControllerBuilder.build() as SelectOptionCellController;_cellBloc = getIt<SelectOptionCellBloc>(param1: cellController)..add(const SelectOptionCellEvent.initial());_popover = PopoverController();@@ -150,7 +148,7 @@ class _MultiSelectCellState extends GridCellState<GridMultiSelectCell> {class SelectOptionWrap extends StatefulWidget {final List<SelectOptionPB> selectOptions;final SelectOptionCellStyle? cellStyle;- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;final PopoverController popoverController;final ValueNotifier onCellEditing;@@ -187,7 +185,7 @@ class _SelectOptionWrapState extends State<SelectOptionWrap> {});return SelectOptionCellEditor(cellController: widget.cellControllerBuilder.build()- as GridSelectOptionCellController,+ as SelectOptionCellController,);},onClose: () => widget.onCellEditing.value = false,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_editor.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/select_option_editor.dartsimilarity index 96%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_editor.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/select_option_editor.dartindex 60e1c5e835..789c2f0181 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/select_option_editor.dart@@ -1,7 +1,5 @@import 'dart:collection';-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:app_flowy/plugins/grid/presentation/widgets/common/type_option_separator.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/select_option_editor_bloc.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/theme_extension.dart';@@ -14,10 +12,12 @@ import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dimport 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:textfield_tags/textfield_tags.dart';+import '../../../../../application/cell/cell_service.dart';import '../../../layout/sizes.dart';+import '../../common/type_option_separator.dart';import '../../header/type_option/select_option_editor.dart';import 'extension.dart';import 'text_field.dart';@@ -26,7 +26,7 @@ const double _editorPanelWidth = 300;const double _padding = 12.0;class SelectOptionCellEditor extends StatefulWidget {- final GridSelectOptionCellController cellController;+ final SelectOptionCellController cellController;static double editorPanelWidth = 300;const SelectOptionCellEditor({required this.cellController, Key? key})diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/text_field.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/text_field.dartsimilarity index 99%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/text_field.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/text_field.dartindex 775283e56b..dc015509ed 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/text_field.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/text_field.dart@@ -5,7 +5,7 @@ import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dimport 'package:flutter/gestures.dart';import 'package:flutter/material.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:flutter/services.dart';import 'package:textfield_tags/textfield_tags.dart';import 'package:textstyle_extensions/textstyle_extensions.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/text_cell.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/text_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/text_cell.dartindex f467500684..6a85a8f4f5 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/text_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/text_cell.dart@@ -1,9 +1,9 @@import 'dart:async';-import 'package:app_flowy/plugins/grid/presentation/widgets/cell/prelude.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/text_cell_bloc.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';+import 'package:appflowy/startup/startup.dart';import '../../layout/sizes.dart';import 'cell_builder.dart';@@ -16,7 +16,7 @@ class GridTextCellStyle extends GridCellStyle {}class GridTextCell extends GridCellWidget {- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;late final GridTextCellStyle? cellStyle;GridTextCell({required this.cellControllerBuilder,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/url_cell/cell_editor.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/cell_editor.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/url_cell/cell_editor.dartindex f7cf3ba38f..fd438055ab 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/cell_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/url_cell/cell_editor.dart@@ -1,13 +1,14 @@-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:flutter/material.dart';import 'dart:async';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../../../application/cell/cell_service.dart';+import '../../../../application/cell/url_cell_editor_bloc.dart';+class URLCellEditor extends StatefulWidget {final VoidCallback onExit;- final GridURLCellController cellController;+ final URLCellController cellController;const URLCellEditor({required this.cellController,required this.onExit,@@ -81,7 +82,7 @@ class _URLCellEditorState extends State<URLCellEditor> {class URLEditorPopover extends StatelessWidget {final VoidCallback onExit;- final GridURLCellController cellController;+ final URLCellController cellController;const URLEditorPopover({required this.cellController,required this.onExit,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/url_cell/url_cell.dartsimilarity index 89%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/url_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/url_cell/url_cell.dartindex c7a68826d8..c8273f7be3 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/url_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/cell/url_cell/url_cell.dart@@ -1,7 +1,7 @@import 'dart:async';-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/cell/url_cell_bloc.dart';-import 'package:app_flowy/workspace/presentation/home/toast.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/workspace/presentation/home/toast.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';@@ -9,8 +9,8 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';import 'package:url_launcher/url_launcher.dart';+import '../../../../application/cell/url_cell_bloc.dart';import '../../../layout/sizes.dart';import '../cell_accessory.dart';import '../cell_builder.dart';@@ -33,7 +33,7 @@ enum GridURLCellAccessoryType {}class GridURLCell extends GridCellWidget {- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;late final GridURLCellStyle? cellStyle;GridURLCell({required this.cellControllerBuilder,@@ -63,8 +63,7 @@ class GridURLCell extends GridCellWidget {);case GridURLCellAccessoryType.copyURL:- final cellContext =- cellControllerBuilder.build() as GridURLCellController;+ final cellContext = cellControllerBuilder.build() as URLCellController;return GridCellAccessoryBuilder(builder: (Key key) => _CopyURLAccessory(key: key,@@ -102,7 +101,7 @@ class _GridURLCellState extends GridCellState<GridURLCell> {@overridevoid initState() {final cellController =- widget.cellControllerBuilder.build() as GridURLCellController;+ widget.cellControllerBuilder.build() as URLCellController;_cellBloc = URLCellBloc(cellController: cellController);_cellBloc.add(const URLCellEvent.initial());super.initState();@@ -140,8 +139,8 @@ class _GridURLCellState extends GridCellState<GridURLCell> {),popupBuilder: (BuildContext popoverContext) {return URLEditorPopover(- cellController: widget.cellControllerBuilder.build()- as GridURLCellController,+ cellController:+ widget.cellControllerBuilder.build() as URLCellController,onExit: () => _popoverController.close(),);},@@ -183,7 +182,7 @@ class _GridURLCellState extends GridCellState<GridURLCell> {}class _EditURLAccessory extends StatefulWidget {- final GridCellControllerBuilder cellControllerBuilder;+ final CellControllerBuilder cellControllerBuilder;final BuildContext anchorContext;const _EditURLAccessory({required this.cellControllerBuilder,@@ -219,7 +218,7 @@ class _EditURLAccessoryState extends State<_EditURLAccessory>popupBuilder: (BuildContext popoverContext) {return URLEditorPopover(cellController:- widget.cellControllerBuilder.build() as GridURLCellController,+ widget.cellControllerBuilder.build() as URLCellController,onExit: () => _popoverController.close(),);},@@ -233,7 +232,7 @@ class _EditURLAccessoryState extends State<_EditURLAccessory>}class _CopyURLAccessory extends StatefulWidget {- final GridURLCellController cellContext;+ final URLCellController cellContext;const _CopyURLAccessory({required this.cellContext, Key? key}): super(key: key);diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/common/type_option_separator.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/common/type_option_separator.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/common/type_option_separator.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/common/type_option_separator.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/checkbox.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/checkbox.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/checkbox.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/checkbox.dartindex 794ea2f93f..b3e71db5fd 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/checkbox.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/checkbox.dart@@ -1,9 +1,6 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/filter/checkbox_filter_editor_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/condition_button.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/disclosure_button.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/grid/application/filter/checkbox_filter_editor_bloc.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';@@ -13,6 +10,9 @@ import 'package:appflowy_backend/protobuf/flowy-database/checkbox_filter.pbenum.import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../condition_button.dart';+import '../disclosure_button.dart';+import '../filter_info.dart';import 'choicechip.dart';class CheckboxFilterChoicechip extends StatefulWidget {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/checklist/checklist.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/checklist/checklist.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/checklist/checklist.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/checklist/checklist.dartindex 1a71cccbf0..85a0ec45f7 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/checklist/checklist.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/checklist/checklist.dart@@ -1,9 +1,6 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/filter/checklist_filter_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/condition_button.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/disclosure_button.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/grid/application/filter/checklist_filter_bloc.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -11,6 +8,9 @@ import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:appflowy_backend/protobuf/flowy-database/checklist_filter.pbenum.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../condition_button.dart';+import '../../disclosure_button.dart';+import '../../filter_info.dart';import '../choicechip.dart';class ChecklistFilterChoicechip extends StatefulWidget {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/choicechip.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/choicechip.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/choicechip.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/choicechip.dartindex 8963b2711f..8aa9892d41 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/choicechip.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/choicechip.dart@@ -1,5 +1,4 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/header/field_type_extension.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -7,6 +6,8 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';import 'dart:math' as math;+import '../filter_info.dart';+class ChoiceChipButton extends StatelessWidget {final FilterInfo filterInfo;final VoidCallback? onTap;diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/date.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/date.dartsimilarity index 80%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/date.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/date.dartindex 84cc03ef0f..f63ed27e47 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/date.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/date.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';import 'package:flutter/material.dart';+import '../filter_info.dart';import 'choicechip.dart';class DateFilterChoicechip extends StatelessWidget {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/number.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/number.dartsimilarity index 80%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/number.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/number.dartindex 41132ea95e..ee3c88bd70 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/number.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/number.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';import 'package:flutter/material.dart';+import '../filter_info.dart';import 'choicechip.dart';class NumberFilterChoicechip extends StatelessWidget {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dartindex 43255105e3..6f0ced4c82 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart@@ -1,7 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/condition_button.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';@@ -9,6 +7,9 @@ import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart'import 'package:appflowy_backend/protobuf/flowy-database/select_option_filter.pb.dart';import 'package:flutter/material.dart';+import '../../condition_button.dart';+import '../../filter_info.dart';+class SelectOptionFilterConditionList extends StatelessWidget {final FilterInfo filterInfo;final PopoverMutex popoverMutex;diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/option_list.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/option_list.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/option_list.dartindex 197955bc85..1120a178f7 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart@@ -1,7 +1,5 @@-import 'package:app_flowy/plugins/grid/application/filter/select_option_filter_list_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/cell/select_option_cell/extension.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';+import 'package:appflowy/plugins/database_view/grid/application/filter/select_option_filter_list_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';import 'package:flowy_infra_ui/widget/spacing.dart';@@ -10,6 +8,8 @@ import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dimport 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../cell/select_option_cell/extension.dart';+import '../../filter_info.dart';import 'select_option_loader.dart';class SelectOptionFilterList extends StatelessWidget {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/select_option.dartsimilarity index 95%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/select_option.dartindex dbad373242..f1aa4591d0 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart@@ -1,6 +1,4 @@-import 'package:app_flowy/plugins/grid/application/filter/select_option_filter_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/disclosure_button.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';+import 'package:appflowy/plugins/database_view/grid/application/filter/select_option_filter_bloc.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';@@ -10,6 +8,8 @@ import 'package:appflowy_backend/protobuf/flowy-database/select_option_filter.pbimport 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../disclosure_button.dart';+import '../../filter_info.dart';import '../choicechip.dart';import 'condition_list.dart';import 'option_list.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dartsimilarity index 78%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dartindex 815fd03480..e5f64fe839 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart@@ -1,9 +1,10 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/header/type_option/builder.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/header/type_option/builder.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';+import '../../filter_info.dart';+abstract class SelectOptionFilterDelegate {Future<List<SelectOptionPB>> loadOptions();}@@ -14,7 +15,7 @@ class SingleSelectOptionFilterDelegateImplSingleSelectOptionFilterDelegateImpl(FilterInfo filterInfo): typeOptionContext = makeSingleSelectTypeOptionContext(- databaseId: filterInfo.viewId,+ viewId: filterInfo.viewId,fieldPB: filterInfo.fieldInfo.field,);@@ -34,7 +35,7 @@ class MultiSelectOptionFilterDelegateImplMultiSelectOptionFilterDelegateImpl(FilterInfo filterInfo): typeOptionContext = makeMultiSelectTypeOptionContext(- databaseId: filterInfo.viewId,+ viewId: filterInfo.viewId,fieldPB: filterInfo.fieldInfo.field,);diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/text.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/text.dartsimilarity index 94%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/text.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/text.dartindex 45169cca54..c3f84eb0ce 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/text.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/text.dart@@ -1,9 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/filter/text_filter_editor_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/condition_button.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/disclosure_button.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';@@ -12,6 +8,10 @@ import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:appflowy_backend/protobuf/flowy-database/text_filter.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../../application/filter/text_filter_editor_bloc.dart';+import '../condition_button.dart';+import '../disclosure_button.dart';+import '../filter_info.dart';import 'choicechip.dart';class TextFilterChoicechip extends StatefulWidget {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/url.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/url.dartsimilarity index 80%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/url.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/url.dartindex 93ce1ff2a4..72bad7ee95 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/url.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/url.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/filter/filter_info.dart';import 'package:flutter/material.dart';+import '../filter_info.dart';import 'choicechip.dart';class URLFilterChoicechip extends StatelessWidget {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/condition_button.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/condition_button.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/condition_button.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/condition_button.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/create_filter_list.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/create_filter_list.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/create_filter_list.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/create_filter_list.dartindex 4c6856c7ab..e473034fb3 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/create_filter_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/create_filter_list.dart@@ -1,8 +1,6 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/filter/filter_create_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/header/field_type_extension.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -13,9 +11,12 @@ import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../../../../application/field/field_controller.dart';+import '../../../application/filter/filter_create_bloc.dart';+class GridCreateFilterList extends StatefulWidget {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;final VoidCallback onClosed;final VoidCallback? onCreateFilter;diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/disclosure_button.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/disclosure_button.dartsimilarity index 93%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/disclosure_button.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/disclosure_button.dartindex 9e6b94f8b8..7bab27b745 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/disclosure_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/disclosure_button.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/filter_info.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_info.dartsimilarity index 95%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/filter_info.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_info.dartindex 5f991b28c7..dd1c127d9a 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/filter_info.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_info.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';import 'package:appflowy_backend/protobuf/flowy-database/checkbox_filter.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/checklist_filter.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/date_filter.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/filter_menu.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_menu.dartsimilarity index 95%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/filter_menu.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_menu.dartindex c7561380a2..4d6214710a 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/filter_menu.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_menu.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/filter/filter_menu_bloc.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/grid/application/filter/filter_menu_bloc.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/app_flowy/lib/plugins/grid/presentation/widgets/filter/filter_menu_item.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_menu_item.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/filter_menu_item.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_menu_item.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/footer/grid_footer.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/footer/grid_footer.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/footer/grid_footer.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/footer/grid_footer.dartindex 0318ca8215..9e4eeb1a4a 100755--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/footer/grid_footer.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/footer/grid_footer.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/grid_bloc.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra/image.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/constants.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/constants.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/constants.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/constants.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_cell.dartsimilarity index 95%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_cell.dartindex 293a09146f..58c44099c8 100755--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_cell.dart@@ -1,3 +1,5 @@+import 'package:appflowy/plugins/database_view/application/field/field_cell_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/field_service.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme_extension.dart';@@ -8,14 +10,12 @@ import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart'import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import '../../../application/field/field_cell_bloc.dart';-import '../../../application/field/field_service.dart';import '../../layout/sizes.dart';import 'field_cell_action_sheet.dart';import 'field_type_extension.dart';class GridFieldCell extends StatefulWidget {- final GridFieldCellContext cellContext;+ final FieldCellContext cellContext;const GridFieldCell({Key? key,required this.cellContext,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell_action_sheet.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_cell_action_sheet.dartsimilarity index 87%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell_action_sheet.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_cell_action_sheet.dartindex 0d016da388..4cd23e3b84 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell_action_sheet.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_cell_action_sheet.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/header/field_editor.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';-import 'package:app_flowy/workspace/presentation/widgets/dialogs.dart';+import 'package:appflowy/plugins/database_view/application/field/field_action_sheet_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/field_service.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -11,13 +11,14 @@ import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:styled_widget/styled_widget.dart';import '../../layout/sizes.dart';+import 'field_editor.dart';class GridFieldCellActionSheet extends StatefulWidget {- final GridFieldCellContext cellContext;+ final FieldCellContext cellContext;const GridFieldCellActionSheet({required this.cellContext, Key? key}): super(key: key);@@ -35,7 +36,7 @@ class _GridFieldCellActionSheetState extends State<GridFieldCellActionSheet> {return SizedBox(width: 400,child: FieldEditor(- databaseId: widget.cellContext.viewId,+ viewId: widget.cellContext.viewId,fieldName: field.name,typeOptionLoader: FieldTypeOptionLoader(viewId: widget.cellContext.viewId,@@ -68,7 +69,7 @@ class _GridFieldCellActionSheetState extends State<GridFieldCellActionSheet> {}class _EditFieldButton extends StatelessWidget {- final GridFieldCellContext cellContext;+ final FieldCellContext cellContext;final void Function()? onTap;const _EditFieldButton({required this.cellContext, Key? key, this.onTap}): super(key: key);@@ -92,7 +93,7 @@ class _EditFieldButton extends StatelessWidget {}class _FieldOperationList extends StatelessWidget {- final GridFieldCellContext fieldInfo;+ final FieldCellContext fieldInfo;const _FieldOperationList(this.fieldInfo, {Key? key}) : super(key: key);@override@@ -133,7 +134,7 @@ class _FieldOperationList extends StatelessWidget {}class FieldActionCell extends StatelessWidget {- final GridFieldCellContext fieldInfo;+ final FieldCellContext fieldInfo;final FieldAction action;final bool enable;@@ -195,7 +196,7 @@ extension _FieldActionExtension on FieldAction {}}- void run(BuildContext context, GridFieldCellContext fieldInfo) {+ void run(BuildContext context, FieldCellContext fieldInfo) {switch (this) {case FieldAction.hide:context@@ -205,7 +206,7 @@ extension _FieldActionExtension on FieldAction {case FieldAction.duplicate:PopoverContainer.of(context).close();- FieldService(+ FieldBackendService(viewId: fieldInfo.viewId,fieldId: fieldInfo.field.id,).duplicateField();@@ -217,7 +218,7 @@ extension _FieldActionExtension on FieldAction {NavigatorAlertDialog(title: LocaleKeys.grid_field_deleteFieldPromptMessage.tr(),confirm: () {- FieldService(+ FieldBackendService(viewId: fieldInfo.viewId,fieldId: fieldInfo.field.id,).deleteField();diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_editor.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_editor.dartsimilarity index 92%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_editor.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_editor.dartindex bdffd8a59b..29e38e7a72 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_editor.dart@@ -1,6 +1,5 @@-import 'package:app_flowy/plugins/grid/application/field/field_editor_bloc.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database_view/application/field/field_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:dartz/dartz.dart' show none;import 'package:easy_localization/easy_localization.dart';@@ -11,18 +10,19 @@ import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:appflowy_backend/log.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import '../../layout/sizes.dart';import 'field_type_option_editor.dart';class FieldEditor extends StatefulWidget {- final String databaseId;+ final String viewId;final String fieldName;final bool isGroupField;final Function(String)? onDeleted;final IFieldTypeOptionLoader typeOptionLoader;const FieldEditor({- required this.databaseId,+ required this.viewId,this.fieldName = "",required this.typeOptionLoader,this.isGroupField = false,@@ -59,7 +59,7 @@ class _FieldEditorState extends State<FieldEditor> {];return BlocProvider(create: (context) => FieldEditorBloc(- databaseId: widget.databaseId,+ viewId: widget.viewId,fieldName: widget.fieldName,isGroupField: widget.isGroupField,loader: widget.typeOptionLoader,@@ -170,8 +170,9 @@ class _FieldNameTextFieldState extends State<_FieldNameTextField> {focusNode: focusNode,onSubmitted: (String _) => PopoverContainer.of(context).close(),text: context.read<FieldEditorBloc>().state.name,- errorText: context.read<FieldEditorBloc>().state.errorText.isEmpty ?- null : context.read<FieldEditorBloc>().state.errorText,+ errorText: context.read<FieldEditorBloc>().state.errorText.isEmpty+ ? null+ : context.read<FieldEditorBloc>().state.errorText,onChanged: (newName) {context.read<FieldEditorBloc>()diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_extension.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dartsimilarity index 96%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_extension.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dartindex 1ff4c55600..7272338c18 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_extension.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_list.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_list.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_list.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_list.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_option_editor.dartsimilarity index 94%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_option_editor.dartindex 8e5c4046e9..d78d825929 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_option_editor.dart@@ -1,5 +1,6 @@import 'dart:typed_data';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_data_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_type_option_edit_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_data_controller.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:dartz/dartz.dart' show Either;import 'package:flowy_infra/image.dart';@@ -9,7 +10,6 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';import '../../layout/sizes.dart';import 'field_type_extension.dart';import 'field_type_list.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dartindex 21d96c3ed6..7a1ececb57 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dart@@ -1,8 +1,9 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_service.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_header_bloc.dart';+import 'package:appflowy/startup/startup.dart';import 'package:easy_localization/easy_localization.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/theme_extension.dart';@@ -19,7 +20,7 @@ import 'field_cell.dart';class GridHeaderSliverAdaptor extends StatefulWidget {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;final ScrollController anchorScrollController;const GridHeaderSliverAdaptor({required this.viewId,@@ -99,7 +100,7 @@ class _GridHeaderState extends State<_GridHeader> {final cells = state.fields.where((field) => field.visibility).map((field) =>- GridFieldCellContext(viewId: widget.viewId, field: field.field))+ FieldCellContext(viewId: widget.viewId, field: field.field)).map((ctx) =>GridFieldCell(key: _getKeyById(ctx.field.id), cellContext: ctx)).toList();@@ -112,7 +113,7 @@ class _GridHeaderState extends State<_GridHeader> {scrollController: ScrollController(),header: const _CellLeading(),needsLongPressDraggable: false,- footer: _CellTrailing(databaseId: widget.viewId),+ footer: _CellTrailing(viewId: widget.viewId),onReorder: (int oldIndex, int newIndex) {_onReorder(cells, oldIndex, context, newIndex);},@@ -147,8 +148,8 @@ class _CellLeading extends StatelessWidget {}class _CellTrailing extends StatelessWidget {- final String databaseId;- const _CellTrailing({required this.databaseId, Key? key}) : super(key: key);+ final String viewId;+ const _CellTrailing({required this.viewId, Key? key}) : super(key: key);@overrideWidget build(BuildContext context) {@@ -160,15 +161,14 @@ class _CellTrailing extends StatelessWidget {border: Border(top: borderSide, bottom: borderSide),),padding: GridSize.headerContentInsets,- child: CreateFieldButton(databaseId: databaseId),+ child: CreateFieldButton(viewId: viewId),);}}class CreateFieldButton extends StatelessWidget {- final String databaseId;- const CreateFieldButton({required this.databaseId, Key? key})- : super(key: key);+ final String viewId;+ const CreateFieldButton({required this.viewId, Key? key}) : super(key: key);@overrideWidget build(BuildContext context) {@@ -188,8 +188,8 @@ class CreateFieldButton extends StatelessWidget {),popupBuilder: (BuildContext popover) {return FieldEditor(- databaseId: databaseId,- typeOptionLoader: NewFieldTypeOptionLoader(viewId: databaseId),+ viewId: viewId,+ typeOptionLoader: NewFieldTypeOptionLoader(viewId: viewId),);},);diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/builder.dartsimilarity index 86%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/builder.dartindex d92da4ed37..487eed0a5e 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/builder.dart@@ -1,8 +1,8 @@import 'dart:typed_data';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_data_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_data_controller.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:appflowy_backend/protobuf/flowy-database/checkbox_type_option.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/checklist_type_option.pb.dart';@@ -62,14 +62,14 @@ TypeOptionWidgetBuilder makeTypeOptionWidgetBuilder({required TypeOptionDataController dataController,required PopoverMutex popoverMutex,}) {- final databaseId = dataController.databaseId;+ final viewId = dataController.viewId;final fieldType = dataController.field.fieldType;switch (dataController.field.fieldType) {case FieldType.Checkbox:return CheckboxTypeOptionWidgetBuilder(makeTypeOptionContextWithDataController<CheckboxTypeOptionPB>(- databaseId: databaseId,+ viewId: viewId,fieldType: fieldType,dataController: dataController,),@@ -77,7 +77,7 @@ TypeOptionWidgetBuilder makeTypeOptionWidgetBuilder({case FieldType.DateTime:return DateTypeOptionWidgetBuilder(makeTypeOptionContextWithDataController<DateTypeOptionPB>(- databaseId: databaseId,+ viewId: viewId,fieldType: fieldType,dataController: dataController,),@@ -85,7 +85,7 @@ TypeOptionWidgetBuilder makeTypeOptionWidgetBuilder({case FieldType.SingleSelect:return SingleSelectTypeOptionWidgetBuilder(makeTypeOptionContextWithDataController<SingleSelectTypeOptionPB>(- databaseId: databaseId,+ viewId: viewId,fieldType: fieldType,dataController: dataController,),@@ -94,7 +94,7 @@ TypeOptionWidgetBuilder makeTypeOptionWidgetBuilder({case FieldType.MultiSelect:return MultiSelectTypeOptionWidgetBuilder(makeTypeOptionContextWithDataController<MultiSelectTypeOptionPB>(- databaseId: databaseId,+ viewId: viewId,fieldType: fieldType,dataController: dataController,),@@ -103,7 +103,7 @@ TypeOptionWidgetBuilder makeTypeOptionWidgetBuilder({case FieldType.Number:return NumberTypeOptionWidgetBuilder(makeTypeOptionContextWithDataController<NumberTypeOptionPB>(- databaseId: databaseId,+ viewId: viewId,fieldType: fieldType,dataController: dataController,),@@ -112,7 +112,7 @@ TypeOptionWidgetBuilder makeTypeOptionWidgetBuilder({case FieldType.RichText:return RichTextTypeOptionWidgetBuilder(makeTypeOptionContextWithDataController<RichTextTypeOptionPB>(- databaseId: databaseId,+ viewId: viewId,fieldType: fieldType,dataController: dataController,),@@ -121,7 +121,7 @@ TypeOptionWidgetBuilder makeTypeOptionWidgetBuilder({case FieldType.URL:return URLTypeOptionWidgetBuilder(makeTypeOptionContextWithDataController<URLTypeOptionPB>(- databaseId: databaseId,+ viewId: viewId,fieldType: fieldType,dataController: dataController,),@@ -130,7 +130,7 @@ TypeOptionWidgetBuilder makeTypeOptionWidgetBuilder({case FieldType.Checklist:return ChecklistTypeOptionWidgetBuilder(makeTypeOptionContextWithDataController<ChecklistTypeOptionPB>(- databaseId: databaseId,+ viewId: viewId,fieldType: fieldType,dataController: dataController,),@@ -140,51 +140,50 @@ TypeOptionWidgetBuilder makeTypeOptionWidgetBuilder({}TypeOptionContext<T> makeTypeOptionContext<T extends GeneratedMessage>({- required String databaseId,+ required String viewId,required FieldInfo fieldInfo,}) {- final loader =- FieldTypeOptionLoader(viewId: databaseId, field: fieldInfo.field);+ final loader = FieldTypeOptionLoader(viewId: viewId, field: fieldInfo.field);final dataController = TypeOptionDataController(- databaseId: databaseId,+ viewId: viewId,loader: loader,fieldInfo: fieldInfo,);return makeTypeOptionContextWithDataController(- databaseId: databaseId,+ viewId: viewId,fieldType: fieldInfo.fieldType,dataController: dataController,);}TypeOptionContext<SingleSelectTypeOptionPB> makeSingleSelectTypeOptionContext({- required String databaseId,+ required String viewId,required FieldPB fieldPB,}) {- return makeSelectTypeOptionContext(databaseId: databaseId, fieldPB: fieldPB);+ return makeSelectTypeOptionContext(viewId: viewId, fieldPB: fieldPB);}TypeOptionContext<MultiSelectTypeOptionPB> makeMultiSelectTypeOptionContext({- required String databaseId,+ required String viewId,required FieldPB fieldPB,}) {- return makeSelectTypeOptionContext(databaseId: databaseId, fieldPB: fieldPB);+ return makeSelectTypeOptionContext(viewId: viewId, fieldPB: fieldPB);}TypeOptionContext<T> makeSelectTypeOptionContext<T extends GeneratedMessage>({- required String databaseId,+ required String viewId,required FieldPB fieldPB,}) {final loader = FieldTypeOptionLoader(- viewId: databaseId,+ viewId: viewId,field: fieldPB,);final dataController = TypeOptionDataController(- databaseId: databaseId,+ viewId: viewId,loader: loader,);final typeOptionContext = makeTypeOptionContextWithDataController<T>(- databaseId: databaseId,+ viewId: viewId,fieldType: fieldPB.fieldType,dataController: dataController,);@@ -193,7 +192,7 @@ TypeOptionContext<T> makeSelectTypeOptionContext<T extends GeneratedMessage>({TypeOptionContext<T>makeTypeOptionContextWithDataController<T extends GeneratedMessage>({- required String databaseId,+ required String viewId,required FieldType fieldType,required TypeOptionDataController dataController,}) {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/checkbox.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/checkbox.dartsimilarity index 72%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/checkbox.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/checkbox.dartindex 92511a888a..13c20d5c4d 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/checkbox.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/checkbox.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';import 'package:flutter/material.dart';import 'builder.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/checklist.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/checklist.dartsimilarity index 73%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/checklist.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/checklist.dartindex 9240d52fde..75e3f5d505 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/checklist.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/checklist.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';import 'package:flutter/material.dart';import 'builder.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/date.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/date.dartsimilarity index 96%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/date.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/date.dartindex 2f9a36b801..6027492815 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/date.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/date.dart@@ -1,9 +1,9 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/date_bloc.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/workspace/presentation/widgets/toggle/toggle.dart';-import 'package:app_flowy/workspace/presentation/widgets/toggle/toggle_style.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/date_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';+import 'package:appflowy/workspace/presentation/widgets/toggle/toggle_style.dart';import 'package:easy_localization/easy_localization.dart' hide DateFormat;-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/button.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/multi_select.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/multi_select.dartsimilarity index 84%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/multi_select.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/multi_select.dartindex 9d6826f993..bc71a313c5 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/multi_select.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/multi_select.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/multi_select_type_option.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/multi_select_type_option.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';import 'package:flutter/material.dart';import 'package:appflowy_popover/appflowy_popover.dart';@@ -16,7 +16,7 @@ class MultiSelectTypeOptionWidgetBuilder extends TypeOptionWidgetBuilder {) : _widget = MultiSelectTypeOptionWidget(selectOptionAction: MultiSelectAction(fieldId: typeOptionContext.fieldId,- databaseId: typeOptionContext.databaseId,+ viewId: typeOptionContext.viewId,typeOptionContext: typeOptionContext,),popoverMutex: popoverMutex,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/number.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/number.dartsimilarity index 94%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/number.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/number.dartindex ddf76a4d82..067bb2d4c8 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/number.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/number.dart@@ -1,6 +1,6 @@-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:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/number_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/number_format_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -10,7 +10,7 @@ import 'package:appflowy_backend/protobuf/flowy-database/format.pbenum.dart';import 'package:flutter/material.dart';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 'package:appflowy/generated/locale_keys.g.dart';import '../../../layout/sizes.dart';import '../../common/type_option_separator.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/rich_text.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/rich_text.dartsimilarity index 72%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/rich_text.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/rich_text.dartindex 1ca0386c31..4ce086fc43 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/rich_text.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/rich_text.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';import 'package:flutter/material.dart';import 'builder.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/select_option.dartsimilarity index 98%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/select_option.dartindex eb7f78466a..91a646574f 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/select_option.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/select_option_type_option_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/select_option_type_option_bloc.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -8,7 +8,7 @@ import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dimport 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import '../../../layout/sizes.dart';import '../../cell/select_option_cell/extension.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option_editor.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/select_option_editor.dartsimilarity index 96%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option_editor.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/select_option_editor.dartindex 7455410195..f4c931d0d3 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/select_option_editor.dart@@ -1,5 +1,5 @@-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:appflowy/plugins/database_view/application/field/type_option/edit_select_option_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/extension.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';@@ -10,7 +10,7 @@ import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dimport 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import '../../../layout/sizes.dart';import '../../common/type_option_separator.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/single_select.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/single_select.dartsimilarity index 84%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/single_select.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/single_select.dartindex 8859196647..4b8db69941 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/single_select.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/single_select.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/single_select_type_option.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/single_select_type_option.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';import 'package:flutter/material.dart';import '../field_type_option_editor.dart';import 'package:appflowy_popover/appflowy_popover.dart';@@ -15,7 +15,7 @@ class SingleSelectTypeOptionWidgetBuilder extends TypeOptionWidgetBuilder {) : _widget = SingleSelectTypeOptionWidget(selectOptionAction: SingleSelectAction(fieldId: singleSelectTypeOption.fieldId,- databaseId: singleSelectTypeOption.databaseId,+ viewId: singleSelectTypeOption.viewId,typeOptionContext: singleSelectTypeOption,),popoverMutex: popoverMutex,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/url.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/url.dartsimilarity index 71%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/url.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/url.dartindex 9997837d63..38680299b2 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/url.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/url.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';import 'package:flutter/material.dart';import 'builder.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/grid_row.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/grid_row.dartsimilarity index 93%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/grid_row.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/grid_row.dartindex 35f81abc06..c18038f253 100755--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/grid_row.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/grid_row.dart@@ -1,6 +1,7 @@-import 'package:app_flowy/plugins/grid/application/prelude.dart';-import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';-import 'package:app_flowy/plugins/grid/application/row/row_data_controller.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/application/row/row_data_controller.dart';+import 'package:appflowy/plugins/database_view/grid/application/row/row_bloc.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -15,7 +16,7 @@ import '../cell/cell_accessory.dart';import '../cell/cell_container.dart';import '../cell/prelude.dart';import 'row_action_sheet.dart';-import "package:app_flowy/generated/locale_keys.g.dart";+import "package:appflowy/generated/locale_keys.g.dart";import 'package:easy_localization/easy_localization.dart';class GridRowWidget extends StatefulWidget {@@ -212,14 +213,14 @@ class RowContent extends StatelessWidget {mainAxisSize: MainAxisSize.max,mainAxisAlignment: MainAxisAlignment.start,crossAxisAlignment: CrossAxisAlignment.stretch,- children: _makeCells(context, state.gridCellMap),+ children: _makeCells(context, state.cellByFieldId),));},);}- List<Widget> _makeCells(BuildContext context, GridCellMap gridCellMap) {- return gridCellMap.values.map(+ List<Widget> _makeCells(BuildContext context, CellByFieldId cellByFieldId) {+ return cellByFieldId.values.map((cellId) {final GridCellWidget child = builder.build(cellId);diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_action_sheet.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/row_action_sheet.dartsimilarity index 93%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_action_sheet.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/row_action_sheet.dartindex 3b309c7275..d270b3a084 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_action_sheet.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/row_action_sheet.dart@@ -1,6 +1,7 @@-import 'package:app_flowy/plugins/grid/application/row/row_action_sheet_bloc.dart';+import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';+import 'package:appflowy/plugins/database_view/grid/application/row/row_action_sheet_bloc.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';@@ -9,7 +10,6 @@ import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import '../../../application/row/row_cache.dart';import '../../layout/sizes.dart';class GridRowActionSheet extends StatelessWidget {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/row_detail.dartsimilarity index 93%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/row_detail.dartindex 53c4ab1ae5..afcd61f87a 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/row/row_detail.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/application/row/row_data_controller.dart';-import 'package:app_flowy/plugins/grid/application/row/row_detail_bloc.dart';-import 'package:app_flowy/workspace/presentation/widgets/dialogs.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/row/row_data_controller.dart';+import 'package:appflowy/plugins/database_view/grid/application/row/row_detail_bloc.dart';+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -11,7 +11,7 @@ import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_scroll_bar.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -66,7 +66,7 @@ class _RowDetailPageState extends State<RowDetailPage> {Expanded(child: _PropertyList(cellBuilder: widget.cellBuilder,- viewId: widget.dataController.rowInfo.databaseId,+ viewId: widget.dataController.rowInfo.viewId,),),],@@ -205,7 +205,7 @@ class _CreateFieldButtonState extends State<_CreateFieldButton> {),popupBuilder: (BuildContext popOverContext) {return FieldEditor(- databaseId: widget.viewId,+ viewId: widget.viewId,typeOptionLoader: NewFieldTypeOptionLoader(viewId: widget.viewId),onDeleted: (fieldId) {popoverController.close();@@ -235,7 +235,7 @@ class _CreateFieldButtonState extends State<_CreateFieldButton> {}class _RowDetailCell extends StatefulWidget {- final GridCellIdentifier cellId;+ final CellIdentifier cellId;final GridCellBuilder cellBuilder;const _RowDetailCell({required this.cellId,@@ -296,11 +296,11 @@ class _RowDetailCellState extends State<_RowDetailCell> {Widget buildFieldEditor() {return FieldEditor(- databaseId: widget.cellId.databaseId,+ viewId: widget.cellId.viewId,fieldName: widget.cellId.fieldInfo.field.name,isGroupField: widget.cellId.fieldInfo.isGroupField,typeOptionLoader: FieldTypeOptionLoader(- viewId: widget.cellId.databaseId,+ viewId: widget.cellId.viewId,field: widget.cellId.fieldInfo.field,),onDeleted: (fieldId) {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/shortcuts.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/shortcuts.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/shortcuts.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/shortcuts.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/create_sort_list.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/create_sort_list.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/create_sort_list.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/create_sort_list.dartindex 6ed598d2ba..be25a01ec8 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/create_sort_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/create_sort_list.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/sort/sort_create_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/header/field_type_extension.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/grid/application/sort/sort_create_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -15,7 +15,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';class GridCreateSortList extends StatefulWidget {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;final VoidCallback onClosed;final VoidCallback? onCreateSort;diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/order_panel.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/order_panel.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/order_panel.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/order_panel.dartindex b541226c1e..c4b1c138b0 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/order_panel.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/order_panel.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';import 'package:appflowy_backend/protobuf/flowy-database/sort_entities.pbenum.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/style_widget/button.dart';diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_choice_button.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_choice_button.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_choice_button.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_choice_button.dartdiff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_editor.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_editor.dartsimilarity index 93%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_editor.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_editor.dartindex e34b7a8a4c..a0c175659e 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_editor.dart@@ -1,9 +1,8 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/application/sort/sort_editor_bloc.dart';-import 'package:app_flowy/plugins/grid/application/sort/util.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/sort/create_sort_list.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/grid/application/sort/sort_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/sort/util.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';import 'package:appflowy_backend/protobuf/flowy-database/sort_entities.pbenum.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';@@ -17,6 +16,7 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'dart:math' as math;+import 'create_sort_list.dart';import 'order_panel.dart';import 'sort_choice_button.dart';import 'sort_info.dart';@@ -24,7 +24,7 @@ import 'sort_info.dart';class SortEditor extends StatefulWidget {final String viewId;final List<SortInfo> sortInfos;- final GridFieldController fieldController;+ final FieldController fieldController;const SortEditor({required this.viewId,required this.fieldController,@@ -156,7 +156,7 @@ class _SortItem extends StatelessWidget {class _AddSortButton extends StatefulWidget {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;final PopoverMutex popoverMutex;const _AddSortButton({required this.viewId,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_info.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_info.dartsimilarity index 73%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_info.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_info.dartindex 8e11ce3186..0af6acde4d 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_info.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_info.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';import 'package:appflowy_backend/protobuf/flowy-database/sort_entities.pb.dart';class SortInfo {diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_menu.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_menu.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_menu.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_menu.dartindex 2f4a04c4b9..19b9b1a569 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/sort/sort_menu.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/sort/sort_menu.dart@@ -1,16 +1,16 @@-import 'package:app_flowy/plugins/grid/application/sort/sort_menu_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/sort/sort_info.dart';+import 'package:appflowy/plugins/database_view/grid/application/sort/sort_menu_bloc.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';import 'dart:math' as math;import 'sort_choice_button.dart';import 'sort_editor.dart';+import 'sort_info.dart';class SortMenu extends StatelessWidget {const SortMenu({Key? key}) : super(key: key);diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/filter_button.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/filter_button.dartsimilarity index 94%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/filter_button.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/filter_button.dartindex 0292f09645..19935e5471 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/filter_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/filter_button.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/filter/filter_menu_bloc.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/grid/application/filter/filter_menu_bloc.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/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_group.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_group.dartsimilarity index 79%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_group.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_group.dartindex 7cffb6ac62..127cb63247 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_group.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_group.dart@@ -1,18 +1,18 @@-import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';-import 'package:app_flowy/plugins/grid/presentation/layout/sizes.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/header/field_type_extension.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/setting/group_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';-import 'package:app_flowy/plugins/grid/application/setting/group_bloc.dart';import 'package:flutter_bloc/flutter_bloc.dart';class GridGroupList extends StatelessWidget {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;final VoidCallback onDismissed;const GridGroupList({required this.viewId,@@ -24,11 +24,11 @@ class GridGroupList extends StatelessWidget {@overrideWidget build(BuildContext context) {return BlocProvider(- create: (context) => GridGroupBloc(+ create: (context) => DatabaseGroupBloc(viewId: viewId,fieldController: fieldController,- )..add(const GridGroupEvent.initial()),- child: BlocBuilder<GridGroupBloc, GridGroupState>(+ )..add(const DatabaseGroupEvent.initial()),+ child: BlocBuilder<DatabaseGroupBloc, DatabaseGroupState>(builder: (context, state) {final cells = state.fieldContexts.map((fieldInfo) {Widget cell = _GridGroupCell(@@ -86,8 +86,8 @@ class _GridGroupCell extends StatelessWidget {),rightIcon: rightIcon,onTap: () {- context.read<GridGroupBloc>().add(- GridGroupEvent.setGroupByField(+ context.read<DatabaseGroupBloc>().add(+ DatabaseGroupEvent.setGroupByField(fieldInfo.id,fieldInfo.fieldType,),diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_property.dartsimilarity index 77%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_property.dartindex 9e1c3ca095..f5406997f4 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_property.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/header/field_editor.dart';-import 'package:app_flowy/startup/startup.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:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/setting/property_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dart';+import 'package:appflowy/startup/startup.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -13,14 +13,14 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:styled_widget/styled_widget.dart';-import '../../../application/field/field_controller.dart';import '../../layout/sizes.dart';+import '../header/field_editor.dart';class GridPropertyList extends StatefulWidget {- final String databaseId;- final GridFieldController fieldController;+ final String viewId;+ final FieldController fieldController;const GridPropertyList({- required this.databaseId,+ required this.viewId,required this.fieldController,Key? key,}) : super(key: key);@@ -41,15 +41,15 @@ class _GridPropertyListState extends State<GridPropertyList> {@overrideWidget build(BuildContext context) {return BlocProvider(- create: (context) => getIt<GridPropertyBloc>(- param1: widget.databaseId, param2: widget.fieldController)- ..add(const GridPropertyEvent.initial()),- child: BlocBuilder<GridPropertyBloc, GridPropertyState>(+ create: (context) => getIt<DatabasePropertyBloc>(+ param1: widget.viewId, param2: widget.fieldController)+ ..add(const DatabasePropertyEvent.initial()),+ child: BlocBuilder<DatabasePropertyBloc, DatabasePropertyState>(builder: (context, state) {final cells = state.fieldContexts.map((field) {return _GridPropertyCell(popoverMutex: _popoverMutex,- databaseId: widget.databaseId,+ viewId: widget.viewId,fieldInfo: field,key: ValueKey(field.id),);@@ -72,11 +72,11 @@ class _GridPropertyListState extends State<GridPropertyList> {class _GridPropertyCell extends StatefulWidget {final FieldInfo fieldInfo;- final String databaseId;+ final String viewId;final PopoverMutex popoverMutex;const _GridPropertyCell({- required this.databaseId,+ required this.viewId,required this.fieldInfo,required this.popoverMutex,Key? key,@@ -126,8 +126,8 @@ class _GridPropertyCellState extends State<_GridPropertyCell> {rightIcon: FlowyIconButton(hoverColor: Colors.transparent,onPressed: () {- context.read<GridPropertyBloc>().add(- GridPropertyEvent.setFieldVisibility(+ context.read<DatabasePropertyBloc>().add(+ DatabasePropertyEvent.setFieldVisibility(widget.fieldInfo.id, !widget.fieldInfo.visibility));},icon: checkmark.padding(all: 6.0),@@ -136,10 +136,10 @@ class _GridPropertyCellState extends State<_GridPropertyCell> {).padding(horizontal: 6.0),popupBuilder: (BuildContext context) {return FieldEditor(- databaseId: widget.databaseId,+ viewId: widget.viewId,fieldName: widget.fieldInfo.name,typeOptionLoader: FieldTypeOptionLoader(- viewId: widget.databaseId,+ viewId: widget.viewId,field: widget.fieldInfo.field,),);diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_setting.dartsimilarity index 73%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_setting.dartindex c01e6925ca..25b742b6fc 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_setting.dart@@ -1,4 +1,5 @@-import 'package:app_flowy/plugins/grid/application/setting/setting_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/setting/setting_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -7,13 +8,12 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';-import '../../../application/field/field_controller.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import '../../layout/sizes.dart';class GridSettingContext {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;GridSettingContext({required this.viewId,@@ -23,15 +23,16 @@ class GridSettingContext {class GridSettingList extends StatelessWidget {final GridSettingContext settingContext;- final Function(GridSettingAction, GridSettingContext) onAction;+ final Function(DatabaseSettingAction, GridSettingContext) onAction;const GridSettingList({required this.settingContext, required this.onAction, Key? key}): super(key: key);@overrideWidget build(BuildContext context) {- final cells =- GridSettingAction.values.where((value) => value.enable()).map((action) {+ final cells = DatabaseSettingAction.values+ .where((value) => value.enable())+ .map((action) {return _SettingItem(action: action,onAction: (action) => onAction(action, settingContext));@@ -56,8 +57,8 @@ class GridSettingList extends StatelessWidget {}class _SettingItem extends StatelessWidget {- final GridSettingAction action;- final Function(GridSettingAction) onAction;+ final DatabaseSettingAction action;+ final Function(DatabaseSettingAction) onAction;const _SettingItem({required this.action,@@ -84,32 +85,32 @@ class _SettingItem extends StatelessWidget {}}-extension _GridSettingExtension on GridSettingAction {+extension _GridSettingExtension on DatabaseSettingAction {String iconName() {switch (this) {- case GridSettingAction.showFilters:+ case DatabaseSettingAction.showFilters:return 'grid/setting/filter';- case GridSettingAction.sortBy:+ case DatabaseSettingAction.sortBy:return 'grid/setting/sort';- case GridSettingAction.showProperties:+ case DatabaseSettingAction.showProperties:return 'grid/setting/properties';}}String title() {switch (this) {- case GridSettingAction.showFilters:+ case DatabaseSettingAction.showFilters:return LocaleKeys.grid_settings_filter.tr();- case GridSettingAction.sortBy:+ case DatabaseSettingAction.sortBy:return LocaleKeys.grid_settings_sortBy.tr();- case GridSettingAction.showProperties:+ case DatabaseSettingAction.showProperties:return LocaleKeys.grid_settings_Properties.tr();}}bool enable() {switch (this) {- case GridSettingAction.showProperties:+ case DatabaseSettingAction.showProperties:return true;default:return false;diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_toolbar.dartsimilarity index 80%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_toolbar.dartindex 0d4b6e7966..69ad698b2f 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_toolbar.dart@@ -1,14 +1,14 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/toolbar/sort_button.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';import 'package:flutter/material.dart';-import '../../../application/field/field_controller.dart';import '../../layout/sizes.dart';import 'filter_button.dart';import 'setting_button.dart';+import 'sort_button.dart';class GridToolbarContext {final String viewId;- final GridFieldController fieldController;+ final FieldController fieldController;GridToolbarContext({required this.viewId,required this.fieldController,diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/setting_button.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/setting_button.dartsimilarity index 87%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/setting_button.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/setting_button.dartindex c7077734ff..64ba7e7deb 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/setting_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/setting_button.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/grid_bloc.dart';-import 'package:app_flowy/plugins/grid/application/setting/setting_bloc.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/application/setting/setting_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_bloc.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';@@ -37,7 +37,7 @@ class _SettingButtonState extends State<SettingButton> {final fieldController =context.read<GridBloc>().gridController.fieldController;return GridSettingContext(- viewId: state.databaseId,+ viewId: state.viewId,fieldController: fieldController,);},@@ -76,13 +76,13 @@ class _GridSettingListPopover extends StatefulWidget {}class _GridSettingListPopoverState extends State<_GridSettingListPopover> {- GridSettingAction? _action;+ DatabaseSettingAction? _action;@overrideWidget build(BuildContext context) {- if (_action == GridSettingAction.showProperties) {+ if (_action == DatabaseSettingAction.showProperties) {return GridPropertyList(- databaseId: widget.settingContext.viewId,+ viewId: widget.settingContext.viewId,fieldController: widget.settingContext.fieldController,);}diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/sort_button.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/sort_button.dartsimilarity index 91%rename from frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/sort_button.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/sort_button.dartindex efe9d47cc3..5910bc7cc4 100644--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/sort_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/sort_button.dart@@ -1,6 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/grid/application/sort/sort_menu_bloc.dart';-import 'package:app_flowy/plugins/grid/presentation/widgets/sort/create_sort_list.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database_view/grid/application/sort/sort_menu_bloc.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';@@ -9,6 +8,8 @@ import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import '../sort/create_sort_list.dart';+class SortButton extends StatefulWidget {const SortButton({Key? key}) : super(key: key);diff --git a/frontend/app_flowy/lib/plugins/document/application/doc_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dartsimilarity index 94%rename from frontend/app_flowy/lib/plugins/document/application/doc_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dartindex f66aa94008..92533b80d4 100644--- a/frontend/app_flowy/lib/plugins/document/application/doc_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dart@@ -1,8 +1,8 @@import 'dart:convert';-import 'package:app_flowy/plugins/trash/application/trash_service.dart';-import 'package:app_flowy/user/application/user_service.dart';-import 'package:app_flowy/workspace/application/view/view_listener.dart';-import 'package:app_flowy/plugins/document/application/doc_service.dart';+import 'package:appflowy/plugins/trash/application/trash_service.dart';+import 'package:appflowy/user/application/user_service.dart';+import 'package:appflowy/workspace/application/view/view_listener.dart';+import 'package:appflowy/plugins/document/application/doc_service.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pbserver.dart';import 'package:appflowy_editor/appflowy_editor.dart'show EditorState, Document, Transaction;@@ -14,7 +14,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'package:dartz/dartz.dart';import 'dart:async';-import 'package:app_flowy/util/either_extension.dart';+import 'package:appflowy/util/either_extension.dart';part 'doc_bloc.freezed.dart';@@ -76,7 +76,7 @@ class DocumentBloc extends Bloc<DocumentEvent, DocumentState> {}Future<void> _initial(Initial value, Emitter<DocumentState> emit) async {- final userProfile = await UserService.getCurrentUserProfile();+ final userProfile = await UserBackendService.getCurrentUserProfile();if (userProfile.isRight()) {emit(state.copyWith(diff --git a/frontend/app_flowy/lib/plugins/document/application/doc_service.dart b/frontend/appflowy_flutter/lib/plugins/document/application/doc_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/application/doc_service.dartrename to frontend/appflowy_flutter/lib/plugins/document/application/doc_service.dartdiff --git a/frontend/app_flowy/lib/plugins/document/application/prelude.dart b/frontend/appflowy_flutter/lib/plugins/document/application/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/application/prelude.dartrename to frontend/appflowy_flutter/lib/plugins/document/application/prelude.dartdiff --git a/frontend/app_flowy/lib/plugins/document/application/share_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/application/share_bloc.dartsimilarity index 89%rename from frontend/app_flowy/lib/plugins/document/application/share_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/document/application/share_bloc.dartindex 418d2f4a04..92c2f347a2 100644--- a/frontend/app_flowy/lib/plugins/document/application/share_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/application/share_bloc.dart@@ -1,8 +1,8 @@import 'dart:convert';import 'dart:io';-import 'package:app_flowy/plugins/document/application/share_service.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/parsers/divider_node_parser.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/parsers/math_equation_node_parser.dart';+import 'package:appflowy/plugins/document/application/share_service.dart';+import 'package:appflowy/plugins/document/presentation/plugins/parsers/divider_node_parser.dart';+import 'package:appflowy/plugins/document/presentation/plugins/parsers/math_equation_node_parser.dart';import 'package:appflowy_backend/protobuf/flowy-document/entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/document/application/share_service.dart b/frontend/appflowy_flutter/lib/plugins/document/application/share_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/application/share_service.dartrename to frontend/appflowy_flutter/lib/plugins/document/application/share_service.dartdiff --git a/frontend/app_flowy/lib/plugins/document/document.dart b/frontend/appflowy_flutter/lib/plugins/document/document.dartsimilarity index 80%rename from frontend/app_flowy/lib/plugins/document/document.dartrename to frontend/appflowy_flutter/lib/plugins/document/document.dartindex c33e62b5b4..30a9aa688d 100644--- a/frontend/app_flowy/lib/plugins/document/document.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/document.dart@@ -1,14 +1,14 @@library document_plugin;-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/document/document_page.dart';-import 'package:app_flowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';-import 'package:app_flowy/plugins/document/presentation/more/more_button.dart';-import 'package:app_flowy/plugins/document/presentation/share/share_button.dart';-import 'package:app_flowy/plugins/util.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/widgets/left_bar_item.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/document/document_page.dart';+import 'package:appflowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';+import 'package:appflowy/plugins/document/presentation/more/more_button.dart';+import 'package:appflowy/plugins/document/presentation/share/share_button.dart';+import 'package:appflowy/plugins/util.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/workspace/presentation/widgets/left_bar_item.dart';import 'package:easy_localization/easy_localization.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flutter/material.dart';@@ -34,7 +34,7 @@ class DocumentPluginBuilder extends PluginBuilder {PluginType get pluginType => PluginType.editor;@override- ViewDataFormatPB get dataFormatType => ViewDataFormatPB.NodeFormat;+ ViewLayoutTypePB? get layoutType => ViewLayoutTypePB.Document;}class DocumentPlugin extends Plugin<int> {diff --git a/frontend/app_flowy/lib/plugins/document/document_page.dart b/frontend/appflowy_flutter/lib/plugins/document/document_page.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/document/document_page.dartrename to frontend/appflowy_flutter/lib/plugins/document/document_page.dartindex e89896df54..31d425f20e 100644--- a/frontend/app_flowy/lib/plugins/document/document_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/document_page.dart@@ -1,9 +1,9 @@-import 'package:app_flowy/plugins/document/presentation/plugins/board/board_menu_item.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/board/board_node_widget.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/grid/grid_menu_item.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/grid/grid_node_widget.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/openai/widgets/auto_completion_node_widget.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/openai/widgets/auto_completion_plugins.dart';+import 'package:appflowy/plugins/document/presentation/plugins/board/board_menu_item.dart';+import 'package:appflowy/plugins/document/presentation/plugins/board/board_node_widget.dart';+import 'package:appflowy/plugins/document/presentation/plugins/grid/grid_menu_item.dart';+import 'package:appflowy/plugins/document/presentation/plugins/grid/grid_node_widget.dart';+import 'package:appflowy/plugins/document/presentation/plugins/openai/widgets/auto_completion_node_widget.dart';+import 'package:appflowy/plugins/document/presentation/plugins/openai/widgets/auto_completion_plugins.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy_editor_plugins/appflowy_editor_plugins.dart';diff --git a/frontend/app_flowy/lib/plugins/document/editor_styles.dart b/frontend/appflowy_flutter/lib/plugins/document/editor_styles.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/document/editor_styles.dartrename to frontend/appflowy_flutter/lib/plugins/document/editor_styles.dartindex 816b76d5c6..a623db872b 100644--- a/frontend/app_flowy/lib/plugins/document/editor_styles.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/editor_styles.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';+import 'package:appflowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';import 'package:provider/provider.dart';diff --git a/frontend/app_flowy/lib/plugins/document/presentation/banner.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/banner.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/document/presentation/banner.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/banner.dartindex bfa5130f21..0e85ff85db 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/banner.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/banner.dart@@ -4,7 +4,7 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/buttons/base_styled_button.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';class DocumentBanner extends StatelessWidget {final void Function() onRestore;diff --git a/frontend/app_flowy/lib/plugins/document/presentation/more/cubit/document_appearance_cubit.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/more/cubit/document_appearance_cubit.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/presentation/more/cubit/document_appearance_cubit.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/more/cubit/document_appearance_cubit.dartdiff --git a/frontend/app_flowy/lib/plugins/document/presentation/more/font_size_switcher.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/more/font_size_switcher.dartsimilarity index 93%rename from frontend/app_flowy/lib/plugins/document/presentation/more/font_size_switcher.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/more/font_size_switcher.dartindex 7e716a87a8..37d6434e4d 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/more/font_size_switcher.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/more/font_size_switcher.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';+import 'package:appflowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';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:appflowy/generated/locale_keys.g.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:tuple/tuple.dart';import 'package:easy_localization/easy_localization.dart';diff --git a/frontend/app_flowy/lib/plugins/document/presentation/more/more_button.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/more/more_button.dartsimilarity index 81%rename from frontend/app_flowy/lib/plugins/document/presentation/more/more_button.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/more/more_button.dartindex eef697b0be..5ed6219319 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/more/more_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/more/more_button.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';-import 'package:app_flowy/plugins/document/presentation/more/font_size_switcher.dart';+import 'package:appflowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';+import 'package:appflowy/plugins/document/presentation/more/font_size_switcher.dart';import 'package:flowy_infra/image.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/base/built_in_page_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/built_in_page_widget.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/base/built_in_page_widget.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/built_in_page_widget.dartindex cdbfe7b6ad..a940e4d712 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/plugins/base/built_in_page_widget.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/built_in_page_widget.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/plugins/document/presentation/plugins/base/insert_page_command.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/app/app_service.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/plugins/document/presentation/plugins/base/insert_page_command.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/application/app/app_service.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';@@ -9,12 +9,12 @@ import 'package:dartz/dartz.dart' as dartz;import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';-import 'package:app_flowy/workspace/application/view/view_ext.dart';-import 'package:app_flowy/workspace/presentation/home/home_stack.dart';-import 'package:app_flowy/workspace/presentation/home/menu/menu.dart';+import 'package:appflowy/workspace/application/view/view_ext.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/workspace/presentation/home/menu/menu.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';diff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/base/insert_page_command.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/insert_page_command.dartsimilarity index 85%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/base/insert_page_command.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/insert_page_command.dartindex e07122da66..8d4afd917e 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/plugins/base/insert_page_command.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/insert_page_command.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/document/presentation/plugins/board/board_node_widget.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/grid/grid_node_widget.dart';+import 'package:appflowy/plugins/document/presentation/plugins/board/board_node_widget.dart';+import 'package:appflowy/plugins/document/presentation/plugins/grid/grid_node_widget.dart';import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';diff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/base/link_to_page_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/link_to_page_widget.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/base/link_to_page_widget.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/link_to_page_widget.dartindex 96f0dd45eb..c30b7ddc16 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/plugins/base/link_to_page_widget.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/base/link_to_page_widget.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/app/app_service.dart';+import 'package:appflowy/workspace/application/app/app_service.dart';import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';@@ -8,7 +8,7 @@ import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';import 'insert_page_command.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';EditorState? _editorState;diff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/board/board_menu_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_menu_item.dartsimilarity index 85%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/board/board_menu_item.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_menu_item.dartindex 60f305d39e..a368951f30 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/plugins/board/board_menu_item.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_menu_item.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/base/link_to_page_widget.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/document/presentation/plugins/base/link_to_page_widget.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart';diff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/board/board_node_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_node_widget.dartsimilarity index 81%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/board/board_node_widget.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_node_widget.dartindex d21fe6cb43..32dcba0aca 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/plugins/board/board_node_widget.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/board/board_node_widget.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/board/presentation/board_page.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/base/built_in_page_widget.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/base/insert_page_command.dart';+import 'package:appflowy/plugins/database_view/board/presentation/board_page.dart';+import 'package:appflowy/plugins/document/presentation/plugins/base/built_in_page_widget.dart';+import 'package:appflowy/plugins/document/presentation/plugins/base/insert_page_command.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/grid/grid_menu_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_menu_item.dartsimilarity index 84%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/grid/grid_menu_item.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_menu_item.dartindex 2d879c1f91..e69b406c7c 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/plugins/grid/grid_menu_item.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_menu_item.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/base/link_to_page_widget.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/document/presentation/plugins/base/link_to_page_widget.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart';diff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/grid/grid_node_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_node_widget.dartsimilarity index 81%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/grid/grid_node_widget.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_node_widget.dartindex 04288bced4..f209293101 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/plugins/grid/grid_node_widget.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/grid/grid_node_widget.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/document/presentation/plugins/base/built_in_page_widget.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/base/insert_page_command.dart';-import 'package:app_flowy/plugins/grid/presentation/grid_page.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/grid_page.dart';+import 'package:appflowy/plugins/document/presentation/plugins/base/built_in_page_widget.dart';+import 'package:appflowy/plugins/document/presentation/plugins/base/insert_page_command.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/horizontal_rule_node_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/horizontal_rule_node_widget.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/horizontal_rule_node_widget.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/horizontal_rule_node_widget.dartdiff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/service/error.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/service/error.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/service/error.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/service/error.dartdiff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/service/openai_client.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/service/openai_client.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/service/openai_client.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/service/openai_client.dartdiff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/service/text_completion.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/service/text_completion.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/service/text_completion.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/service/text_completion.dartdiff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/util/editor_extension.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/util/editor_extension.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/util/editor_extension.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/util/editor_extension.dartdiff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_node_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_node_widget.dartsimilarity index 96%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_node_widget.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_node_widget.dartindex 5284db71a3..911e8c5294 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_node_widget.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_node_widget.dart@@ -1,8 +1,8 @@import 'dart:convert';-import 'package:app_flowy/plugins/document/presentation/plugins/openai/service/openai_client.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/openai/widgets/loading.dart';-import 'package:app_flowy/user/application/user_service.dart';+import 'package:appflowy/plugins/document/presentation/plugins/openai/service/openai_client.dart';+import 'package:appflowy/plugins/document/presentation/plugins/openai/widgets/loading.dart';+import 'package:appflowy/user/application/user_service.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flowy_infra_ui/style_widget/text.dart';@@ -11,7 +11,7 @@ import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';import 'package:http/http.dart' as http;-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';import '../util/editor_extension.dart';@@ -242,7 +242,7 @@ class _AutoCompletionInputState extends State<_AutoCompletionInput> {final loading = Loading(context);loading.start();await _updateEditingText();- final result = await UserService.getCurrentUserProfile();+ final result = await UserBackendService.getCurrentUserProfile();result.fold((userProfile) async {final openAIRepository = HttpOpenAIRepository(client: http.Client(),diff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_plugins.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_plugins.dartsimilarity index 82%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_plugins.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_plugins.dartindex 732db442bf..88ba17b47d 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_plugins.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/widgets/auto_completion_plugins.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/document/presentation/plugins/openai/widgets/auto_completion_node_widget.dart';+import 'package:appflowy/plugins/document/presentation/plugins/openai/widgets/auto_completion_node_widget.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/widgets/loading.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/widgets/loading.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/openai/widgets/loading.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/widgets/loading.dartdiff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/parsers/divider_node_parser.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/parsers/divider_node_parser.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/parsers/divider_node_parser.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/parsers/divider_node_parser.dartdiff --git a/frontend/app_flowy/lib/plugins/document/presentation/plugins/parsers/math_equation_node_parser.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/parsers/math_equation_node_parser.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/document/presentation/plugins/parsers/math_equation_node_parser.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/parsers/math_equation_node_parser.dartdiff --git a/frontend/app_flowy/lib/plugins/document/presentation/share/share_button.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/share/share_button.dartsimilarity index 90%rename from frontend/app_flowy/lib/plugins/document/presentation/share/share_button.dartrename to frontend/appflowy_flutter/lib/plugins/document/presentation/share/share_button.dartindex d89e2dfc47..042b9e9492 100644--- a/frontend/app_flowy/lib/plugins/document/presentation/share/share_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/share/share_button.dart@@ -1,11 +1,11 @@library document_plugin;-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/plugins/document/application/share_bloc.dart';-import 'package:app_flowy/workspace/presentation/home/toast.dart';-import 'package:app_flowy/workspace/presentation/widgets/dialogs.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/plugins/document/application/share_bloc.dart';+import 'package:appflowy/workspace/presentation/home/toast.dart';+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:clipboard/clipboard.dart';import 'package:easy_localization/easy_localization.dart';diff --git a/frontend/app_flowy/lib/plugins/trash/application/prelude.dart b/frontend/appflowy_flutter/lib/plugins/trash/application/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/trash/application/prelude.dartrename to frontend/appflowy_flutter/lib/plugins/trash/application/prelude.dartdiff --git a/frontend/app_flowy/lib/plugins/trash/application/trash_bloc.dart b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_bloc.dartsimilarity index 95%rename from frontend/app_flowy/lib/plugins/trash/application/trash_bloc.dartrename to frontend/appflowy_flutter/lib/plugins/trash/application/trash_bloc.dartindex bb90a2d59b..2a744817e4 100644--- a/frontend/app_flowy/lib/plugins/trash/application/trash_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_bloc.dart@@ -4,8 +4,8 @@ import 'package:appflowy_backend/protobuf/flowy-folder/trash.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'package:app_flowy/plugins/trash/application/trash_service.dart';-import 'package:app_flowy/plugins/trash/application/trash_listener.dart';+import 'package:appflowy/plugins/trash/application/trash_service.dart';+import 'package:appflowy/plugins/trash/application/trash_listener.dart';part 'trash_bloc.freezed.dart';diff --git a/frontend/app_flowy/lib/plugins/trash/application/trash_listener.dart b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_listener.dartsimilarity index 96%rename from frontend/app_flowy/lib/plugins/trash/application/trash_listener.dartrename to frontend/appflowy_flutter/lib/plugins/trash/application/trash_listener.dartindex 032dac38aa..5df20b27e9 100644--- a/frontend/app_flowy/lib/plugins/trash/application/trash_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_listener.dart@@ -1,6 +1,6 @@import 'dart:async';import 'dart:typed_data';-import 'package:app_flowy/core/folder_notification.dart';+import 'package:appflowy/core/folder_notification.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-notification/subject.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/notification.pb.dart';diff --git a/frontend/app_flowy/lib/plugins/trash/application/trash_service.dart b/frontend/appflowy_flutter/lib/plugins/trash/application/trash_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/trash/application/trash_service.dartrename to frontend/appflowy_flutter/lib/plugins/trash/application/trash_service.dartdiff --git a/frontend/app_flowy/lib/plugins/trash/menu.dart b/frontend/appflowy_flutter/lib/plugins/trash/menu.dartsimilarity index 85%rename from frontend/app_flowy/lib/plugins/trash/menu.dartrename to frontend/appflowy_flutter/lib/plugins/trash/menu.dartindex 38b31538e8..f3b73e5404 100644--- a/frontend/app_flowy/lib/plugins/trash/menu.dart+++ b/frontend/appflowy_flutter/lib/plugins/trash/menu.dart@@ -1,7 +1,7 @@-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:app_flowy/workspace/presentation/home/menu/menu.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/workspace/presentation/home/menu/menu.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra/image.dart';@@ -11,7 +11,7 @@ import 'package:flowy_infra_ui/style_widget/hover.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';class MenuTrash extends StatelessWidget {const MenuTrash({Key? key}) : super(key: key);diff --git a/frontend/app_flowy/lib/plugins/trash/src/sizes.dart b/frontend/appflowy_flutter/lib/plugins/trash/src/sizes.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/trash/src/sizes.dartrename to frontend/appflowy_flutter/lib/plugins/trash/src/sizes.dartdiff --git a/frontend/app_flowy/lib/plugins/trash/src/trash_cell.dart b/frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dartsimilarity index 100%rename from frontend/app_flowy/lib/plugins/trash/src/trash_cell.dartrename to frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dartdiff --git a/frontend/app_flowy/lib/plugins/trash/src/trash_header.dart b/frontend/appflowy_flutter/lib/plugins/trash/src/trash_header.dartsimilarity index 97%rename from frontend/app_flowy/lib/plugins/trash/src/trash_header.dartrename to frontend/appflowy_flutter/lib/plugins/trash/src/trash_header.dartindex 7173a92bb2..a691e8bb61 100644--- a/frontend/app_flowy/lib/plugins/trash/src/trash_header.dart+++ b/frontend/appflowy_flutter/lib/plugins/trash/src/trash_header.dart@@ -1,7 +1,7 @@import 'package:easy_localization/easy_localization.dart';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:appflowy/generated/locale_keys.g.dart';import 'sizes.dart';diff --git a/frontend/app_flowy/lib/plugins/trash/trash.dart b/frontend/appflowy_flutter/lib/plugins/trash/trash.dartsimilarity index 88%rename from frontend/app_flowy/lib/plugins/trash/trash.dartrename to frontend/appflowy_flutter/lib/plugins/trash/trash.dartindex 0b774deb82..a305fca5ae 100644--- a/frontend/app_flowy/lib/plugins/trash/trash.dart+++ b/frontend/appflowy_flutter/lib/plugins/trash/trash.dart@@ -2,12 +2,12 @@ export "./src/sizes.dart";export "./src/trash_cell.dart";export "./src/trash_header.dart";-import 'package:app_flowy/startup/plugin/plugin.dart';-import 'package:app_flowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:easy_localization/easy_localization.dart';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:appflowy/generated/locale_keys.g.dart';import 'trash_page.dart';diff --git a/frontend/app_flowy/lib/plugins/trash/trash_page.dart b/frontend/appflowy_flutter/lib/plugins/trash/trash_page.dartsimilarity index 95%rename from frontend/app_flowy/lib/plugins/trash/trash_page.dartrename to frontend/appflowy_flutter/lib/plugins/trash/trash_page.dartindex 13771c5a73..a0947a2de3 100644--- a/frontend/app_flowy/lib/plugins/trash/trash_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/trash/trash_page.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/trash/src/sizes.dart';-import 'package:app_flowy/plugins/trash/src/trash_header.dart';-import 'package:app_flowy/startup/startup.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/trash/src/sizes.dart';+import 'package:appflowy/plugins/trash/src/trash_header.dart';+import 'package:appflowy/startup/startup.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/size.dart';diff --git a/frontend/app_flowy/lib/plugins/util.dart b/frontend/appflowy_flutter/lib/plugins/util.dartsimilarity index 89%rename from frontend/app_flowy/lib/plugins/util.dartrename to frontend/appflowy_flutter/lib/plugins/util.dartindex 773c0466d0..f689511c44 100644--- a/frontend/app_flowy/lib/plugins/util.dart+++ b/frontend/appflowy_flutter/lib/plugins/util.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/startup/plugin/plugin.dart';-import 'package:app_flowy/workspace/application/view/view_listener.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/workspace/application/view/view_listener.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';diff --git a/frontend/app_flowy/lib/startup/deps_resolver.dart b/frontend/appflowy_flutter/lib/startup/deps_resolver.dartsimilarity index 56%rename from frontend/app_flowy/lib/startup/deps_resolver.dartrename to frontend/appflowy_flutter/lib/startup/deps_resolver.dartindex 6628b913f8..ab0ed1a092 100644--- a/frontend/app_flowy/lib/startup/deps_resolver.dart+++ b/frontend/appflowy_flutter/lib/startup/deps_resolver.dart@@ -1,31 +1,39 @@-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/util/file_picker/file_picker_impl.dart';-import 'package:app_flowy/util/file_picker/file_picker_service.dart';-import 'package:app_flowy/workspace/application/app/prelude.dart';-import 'package:app_flowy/plugins/document/application/prelude.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';-import 'package:app_flowy/workspace/application/settings/settings_location_cubit.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_panel/edit_panel_bloc.dart';-import 'package:app_flowy/workspace/application/view/prelude.dart';-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:appflowy/core/network_monitor.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/field/field_action_sheet_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_service.dart';+import 'package:appflowy/plugins/database_view/application/setting/property_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/checkbox_cell_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/date_cell_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/number_cell_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/select_option_cell_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/text_cell_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_header_bloc.dart';+import 'package:appflowy/user/application/user_listener.dart';+import 'package:appflowy/user/application/user_service.dart';+import 'package:appflowy/util/file_picker/file_picker_impl.dart';+import 'package:appflowy/util/file_picker/file_picker_service.dart';+import 'package:appflowy/workspace/application/app/prelude.dart';+import 'package:appflowy/plugins/document/application/prelude.dart';+import 'package:appflowy/workspace/application/settings/settings_location_cubit.dart';+import 'package:appflowy/workspace/application/user/prelude.dart';+import 'package:appflowy/workspace/application/workspace/prelude.dart';+import 'package:appflowy/workspace/application/edit_panel/edit_panel_bloc.dart';+import 'package:appflowy/workspace/application/view/prelude.dart';+import 'package:appflowy/workspace/application/menu/prelude.dart';+import 'package:appflowy/workspace/application/settings/prelude.dart';+import 'package:appflowy/user/application/prelude.dart';+import 'package:appflowy/user/presentation/router.dart';+import 'package:appflowy/plugins/trash/application/prelude.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/workspace/presentation/home/menu/menu.dart';import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:get_it/get_it.dart';-import '../plugins/grid/application/field/field_controller.dart';-class DependencyResolver {static Future<void> resolve(GetIt getIt) async {_resolveUserDeps(getIt);@@ -73,7 +81,7 @@ void _resolveHomeDeps(GetIt getIt) {getIt.registerFactoryParam<WelcomeBloc, UserProfilePB, void>((user, _) => WelcomeBloc(- userService: UserService(userId: user.id),+ userService: UserBackendService(userId: user.id),userWorkspaceListener: UserWorkspaceListener(userProfile: user),),);@@ -141,51 +149,51 @@ void _resolveDocDeps(GetIt getIt) {}void _resolveGridDeps(GetIt getIt) {- getIt.registerFactoryParam<GridHeaderBloc, String, GridFieldController>(- (databaseId, fieldController) => GridHeaderBloc(- databaseId: databaseId,+ getIt.registerFactoryParam<GridHeaderBloc, String, FieldController>(+ (viewId, fieldController) => GridHeaderBloc(+ viewId: viewId,fieldController: fieldController,),);- getIt.registerFactoryParam<FieldActionSheetBloc, GridFieldCellContext, void>(+ getIt.registerFactoryParam<FieldActionSheetBloc, FieldCellContext, void>((data, _) => FieldActionSheetBloc(fieldCellContext: data),);- getIt.registerFactoryParam<TextCellBloc, GridTextCellController, void>(+ getIt.registerFactoryParam<TextCellBloc, TextCellController, void>((context, _) => TextCellBloc(cellController: context,),);- getIt.registerFactoryParam<SelectOptionCellBloc,- GridSelectOptionCellController, void>(+ getIt.registerFactoryParam<SelectOptionCellBloc, SelectOptionCellController,+ void>((context, _) => SelectOptionCellBloc(cellController: context,),);- getIt.registerFactoryParam<NumberCellBloc, GridTextCellController, void>(+ getIt.registerFactoryParam<NumberCellBloc, TextCellController, void>((context, _) => NumberCellBloc(cellController: context,),);- getIt.registerFactoryParam<DateCellBloc, GridDateCellController, void>(+ getIt.registerFactoryParam<DateCellBloc, DateCellController, void>((context, _) => DateCellBloc(cellController: context,),);- getIt.registerFactoryParam<CheckboxCellBloc, GridTextCellController, void>(+ getIt.registerFactoryParam<CheckboxCellBloc, TextCellController, void>((cellData, _) => CheckboxCellBloc(- service: CellService(),+ service: CellBackendService(),cellController: cellData,),);- getIt.registerFactoryParam<GridPropertyBloc, String, GridFieldController>(- (databaseId, cache) =>- GridPropertyBloc(databaseId: databaseId, fieldController: cache),+ getIt.registerFactoryParam<DatabasePropertyBloc, String, FieldController>(+ (viewId, cache) =>+ DatabasePropertyBloc(viewId: viewId, fieldController: cache),);}diff --git a/frontend/app_flowy/lib/startup/launch_configuration.dart b/frontend/appflowy_flutter/lib/startup/launch_configuration.dartsimilarity index 100%rename from frontend/app_flowy/lib/startup/launch_configuration.dartrename to frontend/appflowy_flutter/lib/startup/launch_configuration.dartdiff --git a/frontend/app_flowy/lib/startup/plugin/plugin.dart b/frontend/appflowy_flutter/lib/startup/plugin/plugin.dartsimilarity index 89%rename from frontend/app_flowy/lib/startup/plugin/plugin.dartrename to frontend/appflowy_flutter/lib/startup/plugin/plugin.dartindex d199f78783..2a50dda5e0 100644--- a/frontend/app_flowy/lib/startup/plugin/plugin.dart+++ b/frontend/appflowy_flutter/lib/startup/plugin/plugin.dart@@ -1,8 +1,8 @@library flowy_plugin;-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:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flutter/widgets.dart';@@ -52,8 +52,6 @@ abstract class PluginBuilder {PluginType get pluginType;- ViewDataFormatPB get dataFormatType => ViewDataFormatPB.NodeFormat;-ViewLayoutTypePB? get layoutType => ViewLayoutTypePB.Document;}diff --git a/frontend/app_flowy/lib/startup/plugin/src/runner.dart b/frontend/appflowy_flutter/lib/startup/plugin/src/runner.dartsimilarity index 100%rename from frontend/app_flowy/lib/startup/plugin/src/runner.dartrename to frontend/appflowy_flutter/lib/startup/plugin/src/runner.dartdiff --git a/frontend/app_flowy/lib/startup/plugin/src/sandbox.dart b/frontend/appflowy_flutter/lib/startup/plugin/src/sandbox.dartsimilarity index 100%rename from frontend/app_flowy/lib/startup/plugin/src/sandbox.dartrename to frontend/appflowy_flutter/lib/startup/plugin/src/sandbox.dartdiff --git a/frontend/app_flowy/lib/startup/startup.dart b/frontend/appflowy_flutter/lib/startup/startup.dartsimilarity index 100%rename from frontend/app_flowy/lib/startup/startup.dartrename to frontend/appflowy_flutter/lib/startup/startup.dartdiff --git a/frontend/app_flowy/lib/startup/tasks/app_widget.dart b/frontend/appflowy_flutter/lib/startup/tasks/app_widget.dartsimilarity index 97%rename from frontend/app_flowy/lib/startup/tasks/app_widget.dartrename to frontend/appflowy_flutter/lib/startup/tasks/app_widget.dartindex a0c173a01d..9def64f8a5 100644--- a/frontend/app_flowy/lib/startup/tasks/app_widget.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart@@ -17,7 +17,8 @@ class InitAppWidgetTask extends LaunchTask {@overrideFuture<void> initialize(LaunchContext context) async {final widget = context.getIt<EntryPoint>().create(context.config);- final appearanceSetting = await SettingsFFIService().getAppearanceSetting();+ final appearanceSetting =+ await UserSettingsBackendService().getAppearanceSetting();final app = ApplicationWidget(appearanceSetting: appearanceSetting,child: widget,diff --git a/frontend/app_flowy/lib/startup/tasks/load_plugin.dart b/frontend/appflowy_flutter/lib/startup/tasks/load_plugin.dartsimilarity index 58%rename from frontend/app_flowy/lib/startup/tasks/load_plugin.dartrename to frontend/appflowy_flutter/lib/startup/tasks/load_plugin.dartindex 55cdbf4ef5..4ced403fa9 100644--- a/frontend/app_flowy/lib/startup/tasks/load_plugin.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/load_plugin.dart@@ -1,11 +1,11 @@-import 'package:app_flowy/plugins/calendar/calendar.dart';-import 'package:app_flowy/startup/plugin/plugin.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/plugins/blank/blank.dart';-import 'package:app_flowy/plugins/board/board.dart';-import 'package:app_flowy/plugins/document/document.dart';-import 'package:app_flowy/plugins/grid/grid.dart';-import 'package:app_flowy/plugins/trash/trash.dart';+import 'package:appflowy/plugins/database_view/calendar/calendar.dart';+import 'package:appflowy/plugins/database_view/board/board.dart';+import 'package:appflowy/plugins/database_view/grid/grid.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/plugins/blank/blank.dart';+import 'package:appflowy/plugins/document/document.dart';+import 'package:appflowy/plugins/trash/trash.dart';class PluginLoadTask extends LaunchTask {@overridediff --git a/frontend/app_flowy/lib/startup/tasks/platform_service.dart b/frontend/appflowy_flutter/lib/startup/tasks/platform_service.dartsimilarity index 83%rename from frontend/app_flowy/lib/startup/tasks/platform_service.dartrename to frontend/appflowy_flutter/lib/startup/tasks/platform_service.dartindex 55a59c186a..d9a1ab4319 100644--- a/frontend/app_flowy/lib/startup/tasks/platform_service.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/platform_service.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/core/network_monitor.dart';+import 'package:appflowy/core/network_monitor.dart';import '../startup.dart';class InitPlatformServiceTask extends LaunchTask {diff --git a/frontend/app_flowy/lib/startup/tasks/prelude.dart b/frontend/appflowy_flutter/lib/startup/tasks/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/startup/tasks/prelude.dartrename to frontend/appflowy_flutter/lib/startup/tasks/prelude.dartdiff --git a/frontend/app_flowy/lib/startup/tasks/rust_sdk.dart b/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dartsimilarity index 100%rename from frontend/app_flowy/lib/startup/tasks/rust_sdk.dartrename to frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dartdiff --git a/frontend/app_flowy/lib/user/application/auth_service.dart b/frontend/appflowy_flutter/lib/user/application/auth_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/user/application/auth_service.dartrename to frontend/appflowy_flutter/lib/user/application/auth_service.dartdiff --git a/frontend/app_flowy/lib/user/application/prelude.dart b/frontend/appflowy_flutter/lib/user/application/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/user/application/prelude.dartrename to frontend/appflowy_flutter/lib/user/application/prelude.dartdiff --git a/frontend/app_flowy/lib/user/application/sign_in_bloc.dart b/frontend/appflowy_flutter/lib/user/application/sign_in_bloc.dartsimilarity index 98%rename from frontend/app_flowy/lib/user/application/sign_in_bloc.dartrename to frontend/appflowy_flutter/lib/user/application/sign_in_bloc.dartindex 0772afd6ab..714f1c3307 100644--- a/frontend/app_flowy/lib/user/application/sign_in_bloc.dart+++ b/frontend/appflowy_flutter/lib/user/application/sign_in_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/user/application/auth_service.dart';+import 'package:appflowy/user/application/auth_service.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-error/code.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';diff --git a/frontend/app_flowy/lib/user/application/sign_up_bloc.dart b/frontend/appflowy_flutter/lib/user/application/sign_up_bloc.dartsimilarity index 97%rename from frontend/app_flowy/lib/user/application/sign_up_bloc.dartrename to frontend/appflowy_flutter/lib/user/application/sign_up_bloc.dartindex 795cec21fa..964baeb952 100644--- a/frontend/app_flowy/lib/user/application/sign_up_bloc.dart+++ b/frontend/appflowy_flutter/lib/user/application/sign_up_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/user/application/auth_service.dart';+import 'package:appflowy/user/application/auth_service.dart';import 'package:dartz/dartz.dart';import 'package:easy_localization/easy_localization.dart';import 'package:appflowy_backend/protobuf/flowy-error/code.pb.dart';@@ -7,7 +7,7 @@ import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';part 'sign_up_bloc.freezed.dart';diff --git a/frontend/app_flowy/lib/user/application/splash_bloc.dart b/frontend/appflowy_flutter/lib/user/application/splash_bloc.dartsimilarity index 95%rename from frontend/app_flowy/lib/user/application/splash_bloc.dartrename to frontend/appflowy_flutter/lib/user/application/splash_bloc.dartindex 670e1ea2b3..56448ad538 100644--- a/frontend/app_flowy/lib/user/application/splash_bloc.dart+++ b/frontend/appflowy_flutter/lib/user/application/splash_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/user/domain/auth_state.dart';+import 'package:appflowy/user/domain/auth_state.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';diff --git a/frontend/app_flowy/lib/user/application/user_listener.dart b/frontend/appflowy_flutter/lib/user/application/user_listener.dartsimilarity index 97%rename from frontend/app_flowy/lib/user/application/user_listener.dartrename to frontend/appflowy_flutter/lib/user/application/user_listener.dartindex aff5c18531..595669bda9 100644--- a/frontend/app_flowy/lib/user/application/user_listener.dart+++ b/frontend/appflowy_flutter/lib/user/application/user_listener.dart@@ -1,6 +1,6 @@import 'dart:async';-import 'package:app_flowy/core/folder_notification.dart';-import 'package:app_flowy/core/user_notification.dart';+import 'package:appflowy/core/folder_notification.dart';+import 'package:appflowy/core/user_notification.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';diff --git a/frontend/app_flowy/lib/user/application/user_service.dart b/frontend/appflowy_flutter/lib/user/application/user_service.dartsimilarity index 98%rename from frontend/app_flowy/lib/user/application/user_service.dartrename to frontend/appflowy_flutter/lib/user/application/user_service.dartindex 50d0713938..295c1c4f01 100644--- a/frontend/app_flowy/lib/user/application/user_service.dart+++ b/frontend/appflowy_flutter/lib/user/application/user_service.dart@@ -6,8 +6,8 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';-class UserService {- UserService({+class UserBackendService {+ UserBackendService({required this.userId,});diff --git a/frontend/app_flowy/lib/user/application/user_settings_service.dart b/frontend/appflowy_flutter/lib/user/application/user_settings_service.dartsimilarity index 96%rename from frontend/app_flowy/lib/user/application/user_settings_service.dartrename to frontend/appflowy_flutter/lib/user/application/user_settings_service.dartindex 74af466ce0..bdf9b54747 100644--- a/frontend/app_flowy/lib/user/application/user_settings_service.dart+++ b/frontend/appflowy_flutter/lib/user/application/user_settings_service.dart@@ -5,7 +5,7 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_setting.pb.dart';-class SettingsFFIService {+class UserSettingsBackendService {Future<AppearanceSettingsPB> getAppearanceSetting() async {final result = await UserEventGetAppearanceSetting().send();diff --git a/frontend/app_flowy/lib/user/domain/auth_state.dart b/frontend/appflowy_flutter/lib/user/domain/auth_state.dartsimilarity index 100%rename from frontend/app_flowy/lib/user/domain/auth_state.dartrename to frontend/appflowy_flutter/lib/user/domain/auth_state.dartdiff --git a/frontend/app_flowy/lib/user/presentation/folder/folder_widget.dart b/frontend/appflowy_flutter/lib/user/presentation/folder/folder_widget.dartsimilarity index 98%rename from frontend/app_flowy/lib/user/presentation/folder/folder_widget.dartrename to frontend/appflowy_flutter/lib/user/presentation/folder/folder_widget.dartindex 9cbe5b7c51..8a34c04b14 100644--- a/frontend/app_flowy/lib/user/presentation/folder/folder_widget.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/folder/folder_widget.dart@@ -1,6 +1,6 @@import 'dart:io';-import 'package:app_flowy/util/file_picker/file_picker_service.dart';+import 'package:appflowy/util/file_picker/file_picker_service.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/style_widget/text_field.dart';diff --git a/frontend/app_flowy/lib/user/presentation/router.dart b/frontend/appflowy_flutter/lib/user/presentation/router.dartsimilarity index 85%rename from frontend/app_flowy/lib/user/presentation/router.dartrename to frontend/appflowy_flutter/lib/user/presentation/router.dartindex a59f854ae7..665b261b66 100644--- a/frontend/app_flowy/lib/user/presentation/router.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/router.dart@@ -1,10 +1,10 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/user/application/auth_service.dart';-import 'package:app_flowy/user/presentation/sign_in_screen.dart';-import 'package:app_flowy/user/presentation/sign_up_screen.dart';-import 'package:app_flowy/user/presentation/skip_log_in_screen.dart';-import 'package:app_flowy/user/presentation/welcome_screen.dart';-import 'package:app_flowy/workspace/presentation/home/home_screen.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/user/application/auth_service.dart';+import 'package:appflowy/user/presentation/sign_in_screen.dart';+import 'package:appflowy/user/presentation/sign_up_screen.dart';+import 'package:appflowy/user/presentation/skip_log_in_screen.dart';+import 'package:appflowy/user/presentation/welcome_screen.dart';+import 'package:appflowy/workspace/presentation/home/home_screen.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:flowy_infra/time/duration.dart';import 'package:flowy_infra_ui/widget/route/animation.dart';diff --git a/frontend/app_flowy/lib/user/presentation/sign_in_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/sign_in_screen.dartsimilarity index 95%rename from frontend/app_flowy/lib/user/presentation/sign_in_screen.dartrename to frontend/appflowy_flutter/lib/user/presentation/sign_in_screen.dartindex 7dc39c58f8..f6a6ca290f 100644--- a/frontend/app_flowy/lib/user/presentation/sign_in_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/sign_in_screen.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/user/application/sign_in_bloc.dart';-import 'package:app_flowy/user/presentation/router.dart';-import 'package:app_flowy/user/presentation/widgets/background.dart';+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/user/presentation/widgets/background.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/style_widget/text.dart';@@ -16,7 +16,7 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:dartz/dartz.dart';import 'package:flowy_infra/image.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';class SignInScreen extends StatelessWidget {final AuthRouter router;diff --git a/frontend/app_flowy/lib/user/presentation/sign_up_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/sign_up_screen.dartsimilarity index 95%rename from frontend/app_flowy/lib/user/presentation/sign_up_screen.dartrename to frontend/appflowy_flutter/lib/user/presentation/sign_up_screen.dartindex 1cce5bc3c1..5d7eceefeb 100644--- a/frontend/app_flowy/lib/user/presentation/sign_up_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/sign_up_screen.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/user/application/sign_up_bloc.dart';-import 'package:app_flowy/user/presentation/router.dart';-import 'package:app_flowy/user/presentation/widgets/background.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/user/application/sign_up_bloc.dart';+import 'package:appflowy/user/presentation/router.dart';+import 'package:appflowy/user/presentation/widgets/background.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/rounded_button.dart';@@ -15,7 +15,7 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:dartz/dartz.dart';import 'package:flowy_infra/image.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';class SignUpScreen extends StatelessWidget {final AuthRouter router;diff --git a/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/skip_log_in_screen.dartsimilarity index 100%rename from frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dartrename to frontend/appflowy_flutter/lib/user/presentation/skip_log_in_screen.dartdiff --git a/frontend/app_flowy/lib/user/presentation/splash_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/splash_screen.dartsimilarity index 100%rename from frontend/app_flowy/lib/user/presentation/splash_screen.dartrename to frontend/appflowy_flutter/lib/user/presentation/splash_screen.dartdiff --git a/frontend/app_flowy/lib/user/presentation/welcome_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/welcome_screen.dartsimilarity index 94%rename from frontend/app_flowy/lib/user/presentation/welcome_screen.dartrename to frontend/appflowy_flutter/lib/user/presentation/welcome_screen.dartindex 32b0052767..5e21d4c69d 100644--- a/frontend/app_flowy/lib/user/presentation/welcome_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/welcome_screen.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/workspace/welcome_bloc.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/application/workspace/welcome_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';@@ -9,7 +9,7 @@ import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';class WelcomeScreen extends StatelessWidget {final UserProfilePB userProfile;diff --git a/frontend/app_flowy/lib/user/presentation/widgets/background.dart b/frontend/appflowy_flutter/lib/user/presentation/widgets/background.dartsimilarity index 100%rename from frontend/app_flowy/lib/user/presentation/widgets/background.dartrename to frontend/appflowy_flutter/lib/user/presentation/widgets/background.dartdiff --git a/frontend/app_flowy/lib/util/either_extension.dart b/frontend/appflowy_flutter/lib/util/either_extension.dartsimilarity index 100%rename from frontend/app_flowy/lib/util/either_extension.dartrename to frontend/appflowy_flutter/lib/util/either_extension.dartdiff --git a/frontend/app_flowy/lib/util/file_picker/file_picker_impl.dart b/frontend/appflowy_flutter/lib/util/file_picker/file_picker_impl.dartsimilarity index 94%rename from frontend/app_flowy/lib/util/file_picker/file_picker_impl.dartrename to frontend/appflowy_flutter/lib/util/file_picker/file_picker_impl.dartindex 0b027224fd..07edd7b012 100644--- a/frontend/app_flowy/lib/util/file_picker/file_picker_impl.dart+++ b/frontend/appflowy_flutter/lib/util/file_picker/file_picker_impl.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/util/file_picker/file_picker_service.dart';+import 'package:appflowy/util/file_picker/file_picker_service.dart';import 'package:file_picker/file_picker.dart' as fp;class FilePicker implements FilePickerService {diff --git a/frontend/app_flowy/lib/util/file_picker/file_picker_service.dart b/frontend/appflowy_flutter/lib/util/file_picker/file_picker_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/util/file_picker/file_picker_service.dartrename to frontend/appflowy_flutter/lib/util/file_picker/file_picker_service.dartdiff --git a/frontend/app_flowy/lib/window/app_window.dart b/frontend/appflowy_flutter/lib/window/app_window.dartsimilarity index 93%rename from frontend/app_flowy/lib/window/app_window.dartrename to frontend/appflowy_flutter/lib/window/app_window.dartindex 5d45af0d27..89ccb9f018 100644--- a/frontend/app_flowy/lib/window/app_window.dart+++ b/frontend/appflowy_flutter/lib/window/app_window.dart@@ -1,6 +1,6 @@import 'dart:ui';-import 'package:app_flowy/core/helpers/helpers.dart';+import 'package:appflowy/core/helpers/helpers.dart';import 'package:flutter/foundation.dart';import 'package:window_manager/window_manager.dart';diff --git a/frontend/app_flowy/lib/window/window.dart b/frontend/appflowy_flutter/lib/window/window.dartsimilarity index 100%rename from frontend/app_flowy/lib/window/window.dartrename to frontend/appflowy_flutter/lib/window/window.dartdiff --git a/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/app/app_bloc.dartsimilarity index 95%rename from frontend/app_flowy/lib/workspace/application/app/app_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/app/app_bloc.dartindex 08ff21601d..97a7d3f645 100644--- a/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/app/app_bloc.dart@@ -1,10 +1,10 @@import 'dart:collection';-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';-import 'package:app_flowy/workspace/presentation/home/menu/menu.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/application/app/app_listener.dart';+import 'package:appflowy/workspace/application/app/app_service.dart';+import 'package:appflowy/workspace/presentation/home/menu/menu.dart';import 'package:expandable/expandable.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';@@ -99,9 +99,9 @@ class AppBloc extends Bloc<AppEvent, AppState> {appId: state.app.id,name: value.name,desc: value.desc ?? "",- dataFormatType: value.pluginBuilder.dataFormatType,layoutType: value.pluginBuilder.layoutType!,initialData: value.initialData,+ ext: value.ext ?? {},);result.fold((view) => emit(state.copyWith(@@ -144,6 +144,7 @@ class AppEvent with _$AppEvent {/// The initial data should be the JSON of the doucment/// For example: {"document":{"type":"editor","children":[]}}String? initialData,+ Map<String, String>? ext,}) = CreateView;const factory AppEvent.loadViews() = LoadApp;const factory AppEvent.delete() = DeleteApp;diff --git a/frontend/app_flowy/lib/workspace/application/app/app_listener.dart b/frontend/appflowy_flutter/lib/workspace/application/app/app_listener.dartsimilarity index 96%rename from frontend/app_flowy/lib/workspace/application/app/app_listener.dartrename to frontend/appflowy_flutter/lib/workspace/application/app/app_listener.dartindex 1f718e8d1c..1186068c75 100644--- a/frontend/app_flowy/lib/workspace/application/app/app_listener.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/app/app_listener.dart@@ -1,6 +1,6 @@import 'dart:async';import 'dart:typed_data';-import 'package:app_flowy/core/folder_notification.dart';+import 'package:appflowy/core/folder_notification.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-notification/subject.pb.dart';diff --git a/frontend/app_flowy/lib/workspace/application/app/app_service.dart b/frontend/appflowy_flutter/lib/workspace/application/app/app_service.dartsimilarity index 97%rename from frontend/app_flowy/lib/workspace/application/app/app_service.dartrename to frontend/appflowy_flutter/lib/workspace/application/app/app_service.dartindex 31c7170a21..3be08aa78c 100644--- a/frontend/app_flowy/lib/workspace/application/app/app_service.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/app/app_service.dart@@ -19,23 +19,26 @@ class AppService {required String appId,required String name,String? desc,- required ViewDataFormatPB dataFormatType,required ViewLayoutTypePB layoutType,/// The initial data should be the JSON of the doucment/// For example: {"document":{"type":"editor","children":[]}}String? initialData,+ Map<String, String> ext = const {},}) {final payload = CreateViewPayloadPB.create()..belongToId = appId..name = name..desc = desc ?? ""- ..dataFormat = dataFormatType..layout = layoutType..initialData = utf8.encode(initialData ?? "",);+ if (ext.isNotEmpty) {+ payload.ext.addAll(ext);+ }+return FolderEventCreateView(payload).send();}diff --git a/frontend/app_flowy/lib/workspace/application/app/prelude.dart b/frontend/appflowy_flutter/lib/workspace/application/app/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/app/prelude.dartrename to frontend/appflowy_flutter/lib/workspace/application/app/prelude.dartdiff --git a/frontend/app_flowy/lib/workspace/application/appearance.dart b/frontend/appflowy_flutter/lib/workspace/application/appearance.dartsimilarity index 98%rename from frontend/app_flowy/lib/workspace/application/appearance.dartrename to frontend/appflowy_flutter/lib/workspace/application/appearance.dartindex 36e356dfa4..b5c3ecb9bf 100644--- a/frontend/app_flowy/lib/workspace/application/appearance.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/appearance.dart@@ -1,6 +1,6 @@import 'dart:async';-import 'package:app_flowy/user/application/user_settings_service.dart';+import 'package:appflowy/user/application/user_settings_service.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_setting.pb.dart';import 'package:easy_localization/easy_localization.dart';@@ -122,7 +122,7 @@ class AppearanceSettingsCubit extends Cubit<AppearanceSettingsState> {}Future<void> _saveAppearanceSettings() async {- SettingsFFIService().setAppearanceSetting(_setting).then((result) {+ UserSettingsBackendService().setAppearanceSetting(_setting).then((result) {result.fold((l) => null,(error) => Log.error(error),diff --git a/frontend/app_flowy/lib/workspace/application/edit_panel/edit_context.dart b/frontend/appflowy_flutter/lib/workspace/application/edit_panel/edit_context.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/edit_panel/edit_context.dartrename to frontend/appflowy_flutter/lib/workspace/application/edit_panel/edit_context.dartdiff --git a/frontend/app_flowy/lib/workspace/application/edit_panel/edit_panel_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/edit_panel/edit_panel_bloc.dartsimilarity index 93%rename from frontend/app_flowy/lib/workspace/application/edit_panel/edit_panel_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/edit_panel/edit_panel_bloc.dartindex d739c25559..4935530732 100644--- a/frontend/app_flowy/lib/workspace/application/edit_panel/edit_panel_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/edit_panel/edit_panel_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/edit_panel/edit_context.dart';+import 'package:appflowy/workspace/application/edit_panel/edit_context.dart';import 'package:dartz/dartz.dart';import 'package:freezed_annotation/freezed_annotation.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/app_flowy/lib/workspace/application/home/home_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dartsimilarity index 98%rename from frontend/app_flowy/lib/workspace/application/home/home_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dartindex 0d3f5a5f20..9163710b96 100644--- a/frontend/app_flowy/lib/workspace/application/home/home_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/user/application/user_listener.dart';+import 'package:appflowy/user/application/user_listener.dart';import 'package:flowy_infra/time/duration.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/code.pb.dart';diff --git a/frontend/app_flowy/lib/workspace/application/home/home_service.dart b/frontend/appflowy_flutter/lib/workspace/application/home/home_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/home/home_service.dartrename to frontend/appflowy_flutter/lib/workspace/application/home/home_service.dartdiff --git a/frontend/app_flowy/lib/workspace/application/home/home_setting_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dartsimilarity index 95%rename from frontend/app_flowy/lib/workspace/application/home/home_setting_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dartindex 12c953323c..44e8518760 100644--- a/frontend/app_flowy/lib/workspace/application/home/home_setting_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/user/application/user_listener.dart';-import 'package:app_flowy/workspace/application/appearance.dart';-import 'package:app_flowy/workspace/application/edit_panel/edit_context.dart';+import 'package:appflowy/user/application/user_listener.dart';+import 'package:appflowy/workspace/application/appearance.dart';+import 'package:appflowy/workspace/application/edit_panel/edit_context.dart';import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart'show WorkspaceSettingPB;import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';diff --git a/frontend/app_flowy/lib/workspace/application/home/prelude.dart b/frontend/appflowy_flutter/lib/workspace/application/home/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/home/prelude.dartrename to frontend/appflowy_flutter/lib/workspace/application/home/prelude.dartdiff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dartsimilarity index 94%rename from frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dartindex 6a43d7a1ba..c687938652 100644--- a/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dart@@ -1,7 +1,7 @@import 'dart:async';-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:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/workspace/application/workspace/workspace_listener.dart';+import 'package:appflowy/workspace/application/workspace/workspace_service.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';diff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_user_bloc.dartsimilarity index 93%rename from frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/menu/menu_user_bloc.dartindex 2830f9523b..f12627dca9 100644--- a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_user_bloc.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/user/application/user_listener.dart';-import 'package:app_flowy/user/application/user_service.dart';+import 'package:appflowy/user/application/user_listener.dart';+import 'package:appflowy/user/application/user_service.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';@@ -11,7 +11,7 @@ import 'package:dartz/dartz.dart';part 'menu_user_bloc.freezed.dart';class MenuUserBloc extends Bloc<MenuUserEvent, MenuUserState> {- final UserService _userService;+ final UserBackendService _userService;final UserListener _userListener;final UserWorkspaceListener _userWorkspaceListener;final UserProfilePB userProfile;@@ -20,7 +20,7 @@ class MenuUserBloc extends Bloc<MenuUserEvent, MenuUserState> {: _userListener = UserListener(userProfile: userProfile),_userWorkspaceListener =UserWorkspaceListener(userProfile: userProfile),- _userService = UserService(userId: userProfile.id),+ _userService = UserBackendService(userId: userProfile.id),super(MenuUserState.initial(userProfile)) {on<MenuUserEvent>((event, emit) async {await event.when(diff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_view_section_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_view_section_bloc.dartsimilarity index 96%rename from frontend/app_flowy/lib/workspace/application/menu/menu_view_section_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/menu/menu_view_section_bloc.dartindex 05b3d410c4..42fdc4c361 100644--- a/frontend/app_flowy/lib/workspace/application/menu/menu_view_section_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_view_section_bloc.dart@@ -1,7 +1,7 @@import 'dart:async';-import 'package:app_flowy/workspace/application/app/app_bloc.dart';-import 'package:app_flowy/workspace/application/app/app_service.dart';+import 'package:appflowy/workspace/application/app/app_bloc.dart';+import 'package:appflowy/workspace/application/app/app_service.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:freezed_annotation/freezed_annotation.dart';diff --git a/frontend/app_flowy/lib/workspace/application/menu/prelude.dart b/frontend/appflowy_flutter/lib/workspace/application/menu/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/menu/prelude.dartrename to frontend/appflowy_flutter/lib/workspace/application/menu/prelude.dartdiff --git a/frontend/app_flowy/lib/workspace/application/settings/prelude.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/settings/prelude.dartrename to frontend/appflowy_flutter/lib/workspace/application/settings/prelude.dartdiff --git a/frontend/app_flowy/lib/workspace/application/settings/settings_dialog_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dartsimilarity index 97%rename from frontend/app_flowy/lib/workspace/application/settings/settings_dialog_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dartindex af2a8a45ba..e74158af30 100644--- a/frontend/app_flowy/lib/workspace/application/settings/settings_dialog_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/user/application/user_listener.dart';+import 'package:appflowy/user/application/user_listener.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';diff --git a/frontend/app_flowy/lib/workspace/application/settings/settings_file_exporter_cubit.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/settings_file_exporter_cubit.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/settings/settings_file_exporter_cubit.dartrename to frontend/appflowy_flutter/lib/workspace/application/settings/settings_file_exporter_cubit.dartdiff --git a/frontend/app_flowy/lib/workspace/application/settings/settings_location_cubit.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/settings_location_cubit.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/settings/settings_location_cubit.dartrename to frontend/appflowy_flutter/lib/workspace/application/settings/settings_location_cubit.dartdiff --git a/frontend/app_flowy/lib/workspace/application/user/prelude.dart b/frontend/appflowy_flutter/lib/workspace/application/user/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/user/prelude.dartrename to frontend/appflowy_flutter/lib/workspace/application/user/prelude.dartdiff --git a/frontend/app_flowy/lib/workspace/application/user/settings_user_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/user/settings_user_bloc.dartsimilarity index 93%rename from frontend/app_flowy/lib/workspace/application/user/settings_user_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/user/settings_user_bloc.dartindex e56b11d6d8..afd3f02c6a 100644--- a/frontend/app_flowy/lib/workspace/application/user/settings_user_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/user/settings_user_bloc.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/user/application/user_listener.dart';-import 'package:app_flowy/user/application/user_service.dart';+import 'package:appflowy/user/application/user_listener.dart';+import 'package:appflowy/user/application/user_service.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';@@ -10,13 +10,13 @@ import 'package:dartz/dartz.dart';part 'settings_user_bloc.freezed.dart';class SettingsUserViewBloc extends Bloc<SettingsUserEvent, SettingsUserState> {- final UserService _userService;+ final UserBackendService _userService;final UserListener _userListener;final UserProfilePB userProfile;SettingsUserViewBloc(this.userProfile): _userListener = UserListener(userProfile: userProfile),- _userService = UserService(userId: userProfile.id),+ _userService = UserBackendService(userId: userProfile.id),super(SettingsUserState.initial(userProfile)) {on<SettingsUserEvent>((event, emit) async {await event.when(diff --git a/frontend/app_flowy/lib/workspace/application/view/prelude.dart b/frontend/appflowy_flutter/lib/workspace/application/view/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/view/prelude.dartrename to frontend/appflowy_flutter/lib/workspace/application/view/prelude.dartdiff --git a/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dartsimilarity index 95%rename from frontend/app_flowy/lib/workspace/application/view/view_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dartindex e9912ec175..1951fd0a88 100644--- a/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/workspace/application/view/view_listener.dart';-import 'package:app_flowy/workspace/application/view/view_service.dart';+import 'package:appflowy/workspace/application/view/view_listener.dart';+import 'package:appflowy/workspace/application/view/view_service.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';diff --git a/frontend/app_flowy/lib/workspace/application/view/view_ext.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dartsimilarity index 96%rename from frontend/app_flowy/lib/workspace/application/view/view_ext.dartrename to frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dartindex 149682b6f0..c666d77b2d 100644--- a/frontend/app_flowy/lib/workspace/application/view/view_ext.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/startup/plugin/plugin.dart';+import 'package:appflowy/startup/plugin/plugin.dart';import 'package:flowy_infra/image.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/workspace/application/view/view_listener.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_listener.dartsimilarity index 98%rename from frontend/app_flowy/lib/workspace/application/view/view_listener.dartrename to frontend/appflowy_flutter/lib/workspace/application/view/view_listener.dartindex 0ce6547b2f..1af4a8e57b 100644--- a/frontend/app_flowy/lib/workspace/application/view/view_listener.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_listener.dart@@ -1,6 +1,6 @@import 'dart:async';import 'dart:typed_data';-import 'package:app_flowy/core/folder_notification.dart';+import 'package:appflowy/core/folder_notification.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-notification/subject.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';diff --git a/frontend/app_flowy/lib/workspace/application/view/view_service.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_service.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/view/view_service.dartrename to frontend/appflowy_flutter/lib/workspace/application/view/view_service.dartdiff --git a/frontend/app_flowy/lib/workspace/application/workspace/prelude.dart b/frontend/appflowy_flutter/lib/workspace/application/workspace/prelude.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/application/workspace/prelude.dartrename to frontend/appflowy_flutter/lib/workspace/application/workspace/prelude.dartdiff --git a/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/workspace/welcome_bloc.dartsimilarity index 95%rename from frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dartrename to frontend/appflowy_flutter/lib/workspace/application/workspace/welcome_bloc.dartindex 442c803ddd..aef0464cee 100644--- a/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/workspace/welcome_bloc.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/user/application/user_listener.dart';-import 'package:app_flowy/user/application/user_service.dart';+import 'package:appflowy/user/application/user_listener.dart';+import 'package:appflowy/user/application/user_service.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';@@ -10,7 +10,7 @@ import 'package:dartz/dartz.dart';part 'welcome_bloc.freezed.dart';class WelcomeBloc extends Bloc<WelcomeEvent, WelcomeState> {- final UserService userService;+ final UserBackendService userService;final UserWorkspaceListener userWorkspaceListener;WelcomeBloc({required this.userService, required this.userWorkspaceListener}): super(WelcomeState.initial()) {diff --git a/frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dart b/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_listener.dartsimilarity index 97%rename from frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dartrename to frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_listener.dartindex 2d034e604d..73019c34e1 100644--- a/frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_listener.dart@@ -1,6 +1,6 @@import 'dart:async';import 'dart:typed_data';-import 'package:app_flowy/core/folder_notification.dart';+import 'package:appflowy/core/folder_notification.dart';import 'package:dartz/dartz.dart';import 'package:flowy_infra/notifier.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'diff --git a/frontend/app_flowy/lib/workspace/application/workspace/workspace_service.dart b/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dartsimilarity index 97%rename from frontend/app_flowy/lib/workspace/application/workspace/workspace_service.dartrename to frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dartindex 3f32e4e9e3..425154f353 100644--- a/frontend/app_flowy/lib/workspace/application/workspace/workspace_service.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart@@ -9,7 +9,7 @@ import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart'show MoveFolderItemPayloadPB, MoveFolderItemType;import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';class WorkspaceService {final String workspaceId;diff --git a/frontend/app_flowy/lib/workspace/presentation/home/home_layout.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_layout.dartsimilarity index 94%rename from frontend/app_flowy/lib/workspace/presentation/home/home_layout.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/home_layout.dartindex 2c3f99f537..63b397176f 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/home_layout.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_layout.dart@@ -1,6 +1,6 @@import 'dart:io' show Platform;-import 'package:app_flowy/workspace/application/home/home_setting_bloc.dart';+import 'package:appflowy/workspace/application/home/home_setting_bloc.dart';import 'package:flowy_infra/size.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_screen.dartsimilarity index 92%rename from frontend/app_flowy/lib/workspace/presentation/home/home_screen.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/home_screen.dartindex 01d407baa4..46f4f92cd2 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_screen.dart@@ -1,14 +1,14 @@-import 'package:app_flowy/plugins/blank/blank.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/home/home_bloc.dart';-import 'package:app_flowy/workspace/application/home/home_service.dart';-import 'package:app_flowy/workspace/application/home/home_setting_bloc.dart';-import 'package:app_flowy/workspace/application/view/view_ext.dart';-import 'package:app_flowy/workspace/presentation/home/hotkeys.dart';-import 'package:app_flowy/workspace/presentation/widgets/edit_panel/panel_animation.dart';-import 'package:app_flowy/workspace/presentation/widgets/float_bubble/question_bubble.dart';+import 'package:appflowy/plugins/blank/blank.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/application/appearance.dart';+import 'package:appflowy/workspace/application/home/home_bloc.dart';+import 'package:appflowy/workspace/application/home/home_service.dart';+import 'package:appflowy/workspace/application/home/home_setting_bloc.dart';+import 'package:appflowy/workspace/application/view/view_ext.dart';+import 'package:appflowy/workspace/presentation/home/hotkeys.dart';+import 'package:appflowy/workspace/presentation/widgets/edit_panel/panel_animation.dart';+import 'package:appflowy/workspace/presentation/widgets/float_bubble/question_bubble.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'diff --git a/frontend/app_flowy/lib/workspace/presentation/home/home_sizes.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_sizes.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/home/home_sizes.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/home_sizes.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/home/home_stack.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_stack.dartsimilarity index 93%rename from frontend/app_flowy/lib/workspace/presentation/home/home_stack.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/home_stack.dartindex 7d1cd4e249..6a5bc0e1d4 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/home_stack.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/home_stack.dart@@ -1,10 +1,10 @@-import 'package:app_flowy/core/frameless_window.dart';-import 'package:app_flowy/plugins/blank/blank.dart';-import 'package:app_flowy/startup/plugin/plugin.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/presentation/home/home_sizes.dart';-import 'package:app_flowy/workspace/presentation/home/navigation.dart';-import 'package:app_flowy/workspace/presentation/home/toast.dart';+import 'package:appflowy/core/frameless_window.dart';+import 'package:appflowy/plugins/blank/blank.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/presentation/home/home_sizes.dart';+import 'package:appflowy/workspace/presentation/home/navigation.dart';+import 'package:appflowy/workspace/presentation/home/toast.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flowy_infra_ui/style_widget/extension.dart';import 'package:flowy_infra_ui/widget/spacing.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/hotkeys.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/hotkeys.dartsimilarity index 91%rename from frontend/app_flowy/lib/workspace/presentation/home/hotkeys.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/hotkeys.dartindex 1d04c97d20..fefa220948 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/hotkeys.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/hotkeys.dart@@ -1,6 +1,6 @@import 'dart:io';-import 'package:app_flowy/workspace/application/home/home_setting_bloc.dart';+import 'package:appflowy/workspace/application/home/home_setting_bloc.dart';import 'package:flutter/material.dart';import 'package:hotkey_manager/hotkey_manager.dart';import 'package:provider/provider.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/create_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/create_button.dartsimilarity index 87%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/app/create_button.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/create_button.dartindex 4903c79543..d5584173bd 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/create_button.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/create_button.dart@@ -1,12 +1,12 @@-import 'package:app_flowy/workspace/presentation/home/home_sizes.dart';-import 'package:app_flowy/workspace/presentation/widgets/dialogs.dart';+import 'package:appflowy/workspace/presentation/home/home_sizes.dart';+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flutter/material.dart';import 'package:flowy_infra_ui/style_widget/extension.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';class NewAppButton extends StatelessWidget {final Function(String)? press;diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/add_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/add_button.dartsimilarity index 87%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/add_button.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/add_button.dartindex 9f52cc5337..5c6c7aa32f 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/add_button.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/add_button.dart@@ -1,15 +1,15 @@-import 'package:app_flowy/plugins/document/document.dart';-import 'package:app_flowy/startup/plugin/plugin.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/presentation/home/menu/app/header/import/import_panel.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/plugins/document/document.dart';+import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/presentation/home/menu/app/header/import/import_panel.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_editor/appflowy_editor.dart' show Document;import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flutter/material.dart';import 'package:styled_widget/styled_widget.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';class AddButton extends StatelessWidget {diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/header.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/header.dartsimilarity index 95%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/header.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/header.dartindex 4b670b437e..e94f7380ea 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/header.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/header.dart@@ -1,7 +1,7 @@import 'dart:convert';-import 'package:app_flowy/workspace/presentation/widgets/dialogs.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:expandable/expandable.dart';@@ -11,9 +11,9 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/workspace/application/app/app_bloc.dart';+import 'package:appflowy/workspace/application/app/app_bloc.dart';import 'package:styled_widget/styled_widget.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:flowy_infra/image.dart';import 'package:textstyle_extensions/textstyle_extensions.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/import/import_panel.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/import/import_panel.dartsimilarity index 95%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/import/import_panel.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/import/import_panel.dartindex c1d1498d8f..7314a09749 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/header/import/import_panel.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/import/import_panel.dart@@ -1,7 +1,7 @@import 'dart:io';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/util/file_picker/file_picker_service.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/util/file_picker/file_picker_service.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:file_picker/file_picker.dart';import 'package:flowy_infra/image.dart';@@ -9,7 +9,7 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/button.dart';import 'package:flowy_infra_ui/style_widget/container.dart';import 'package:flutter/material.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';typedef ImportCallback = void Function(Document? document);diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/menu_app.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/menu_app.dartsimilarity index 94%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/app/menu_app.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/menu_app.dartindex 371c66194b..653f67fa5a 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/menu_app.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/menu_app.dart@@ -1,10 +1,10 @@-import 'package:app_flowy/workspace/presentation/home/menu/menu.dart';+import 'package:appflowy/workspace/presentation/home/menu/menu.dart';import 'package:expandable/expandable.dart';import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';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/app/app_bloc.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/application/app/app_bloc.dart';import 'package:provider/provider.dart';import 'section/section.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/section/item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/item.dartsimilarity index 93%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/app/section/item.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/item.dartindex 3e28034762..f261a946a9 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/section/item.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/item.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/view/view_bloc.dart';-import 'package:app_flowy/workspace/application/view/view_ext.dart';-import 'package:app_flowy/workspace/presentation/home/menu/menu.dart';-import 'package:app_flowy/workspace/presentation/widgets/dialogs.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/application/view/view_bloc.dart';+import 'package:appflowy/workspace/application/view/view_ext.dart';+import 'package:appflowy/workspace/presentation/home/menu/menu.dart';+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/style_widget/hover.dart';@@ -12,10 +12,10 @@ import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:styled_widget/styled_widget.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:flowy_infra/image.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/section/section.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/section.dartsimilarity index 83%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/app/section/section.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/section.dartindex 8eecd6f73e..e91d046ded 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/app/section/section.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/section.dart@@ -1,9 +1,9 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/app/app_bloc.dart';-import 'package:app_flowy/workspace/application/menu/menu_view_section_bloc.dart';-import 'package:app_flowy/workspace/application/view/view_ext.dart';-import 'package:app_flowy/workspace/presentation/home/home_stack.dart';-import 'package:app_flowy/workspace/presentation/home/menu/menu.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/application/app/app_bloc.dart';+import 'package:appflowy/workspace/application/menu/menu_view_section_bloc.dart';+import 'package:appflowy/workspace/application/view/view_ext.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/workspace/presentation/home/menu/menu.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:reorderables/reorderables.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/favorite/favorite.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/favorite/favorite.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/favorite/favorite.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/favorite/favorite.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/favorite/header.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/favorite/header.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/favorite/header.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/favorite/header.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/favorite/section.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/favorite/section.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/favorite/section.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/favorite/section.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu.dartsimilarity index 92%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu.dartindex c067aa5d91..92f5f4621b 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu.dart@@ -1,20 +1,20 @@import 'dart:io' show Platform;-import 'package:app_flowy/core/frameless_window.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/plugins/trash/menu.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/home/home_setting_bloc.dart';-import 'package:app_flowy/workspace/application/menu/menu_bloc.dart';-import 'package:app_flowy/workspace/presentation/home/home_sizes.dart';-import 'package:app_flowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/core/frameless_window.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/trash/menu.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/application/home/home_setting_bloc.dart';+import 'package:appflowy/workspace/application/menu/menu_bloc.dart';+import 'package:appflowy/workspace/presentation/home/home_sizes.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'show UserProfilePB;import 'package:easy_localization/easy_localization.dart';import 'package:expandable/expandable.dart';-// import 'package:app_flowy/workspace/presentation/home/home_sizes.dart';+// import 'package:appflowy/workspace/presentation/home/home_sizes.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra/time/duration.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/menu_user.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu_user.dartsimilarity index 90%rename from frontend/app_flowy/lib/workspace/presentation/home/menu/menu_user.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu_user.dartindex 0085bc52bc..21cc90a04e 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/menu/menu_user.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu_user.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/application/menu/menu_user_bloc.dart';-import 'package:app_flowy/workspace/presentation/settings/settings_dialog.dart';-import 'package:app_flowy/workspace/presentation/settings/widgets/settings_user_view.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/application/menu/menu_user_bloc.dart';+import 'package:appflowy/workspace/presentation/settings/settings_dialog.dart';+import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/size.dart';@@ -11,7 +11,7 @@ import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'show UserProfilePB;import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';import 'package:textstyle_extensions/textstyle_extensions.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/navigation.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/navigation.dartsimilarity index 96%rename from frontend/app_flowy/lib/workspace/presentation/home/navigation.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/navigation.dartindex 8956e3d3dd..f1818fc162 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/navigation.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/navigation.dart@@ -1,8 +1,8 @@import 'dart:io';-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/application/home/home_setting_bloc.dart';-import 'package:app_flowy/workspace/presentation/home/home_stack.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/application/home/home_setting_bloc.dart';+import 'package:appflowy/workspace/presentation/home/home_stack.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/size.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/home/toast.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dartsimilarity index 95%rename from frontend/app_flowy/lib/workspace/presentation/home/toast.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dartindex 57ebf4636a..dd9ee4fc67 100644--- a/frontend/app_flowy/lib/workspace/presentation/home/toast.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/startup/startup.dart';+import 'package:appflowy/startup/startup.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/settings_dialog.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dartsimilarity index 77%rename from frontend/app_flowy/lib/workspace/presentation/settings/settings_dialog.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dartindex ca67a96ab8..6f89f77a37 100644--- a/frontend/app_flowy/lib/workspace/presentation/settings/settings_dialog.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart@@ -1,11 +1,11 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/presentation/settings/widgets/settings_appearance_view.dart';-import 'package:app_flowy/workspace/presentation/settings/widgets/settings_file_system_view.dart';-import 'package:app_flowy/workspace/presentation/settings/widgets/settings_language_view.dart';-import 'package:app_flowy/workspace/presentation/settings/widgets/settings_user_view.dart';-import 'package:app_flowy/workspace/presentation/settings/widgets/settings_menu.dart';-import 'package:app_flowy/workspace/application/settings/settings_dialog_bloc.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/presentation/settings/widgets/settings_appearance_view.dart';+import 'package:appflowy/workspace/presentation/settings/widgets/settings_file_system_view.dart';+import 'package:appflowy/workspace/presentation/settings/widgets/settings_language_view.dart';+import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';+import 'package:appflowy/workspace/presentation/settings/widgets/settings_menu.dart';+import 'package:appflowy/workspace/application/settings/settings_dialog_bloc.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:easy_localization/easy_localization.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_appearance_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_appearance_view.dartsimilarity index 97%rename from frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_appearance_view.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_appearance_view.dartindex 60bc84809c..edef7928ff 100644--- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_appearance_view.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_appearance_view.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/application/appearance.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/application/appearance.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dartsimilarity index 96%rename from frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dartindex 5df13b9ac5..45cac7b6cb 100644--- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/util/file_picker/file_picker_service.dart';-import 'package:app_flowy/workspace/application/settings/settings_location_cubit.dart';+import 'package:appflowy/util/file_picker/file_picker_service.dart';+import 'package:appflowy/workspace/application/settings/settings_location_cubit.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dartsimilarity index 96%rename from frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dartindex 613e1ec2be..f861b35a08 100644--- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_exporter_widget.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/util/file_picker/file_picker_service.dart';-import 'package:app_flowy/workspace/application/settings/settings_file_exporter_cubit.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/util/file_picker/file_picker_service.dart';+import 'package:appflowy/workspace/application/settings/settings_file_exporter_cubit.dart';import 'package:dartz/dartz.dart' as dartz;import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_system_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_system_view.dartsimilarity index 89%rename from frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_system_view.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_system_view.dartindex ee861a3e49..c90793fbfd 100644--- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_system_view.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_file_system_view.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/presentation/settings/widgets/settings_file_customize_location_view.dart';+import 'package:appflowy/workspace/presentation/settings/widgets/settings_file_customize_location_view.dart';import 'package:flutter/material.dart';import '../../../application/settings/settings_location_cubit.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_language_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_language_view.dartsimilarity index 95%rename from frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_language_view.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_language_view.dartindex 2beca2105e..ffb16a2f41 100644--- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_language_view.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_language_view.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/application/appearance.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/application/appearance.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dartsimilarity index 87%rename from frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_menu.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dartindex e03be43b09..ecdb4c6696 100644--- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_menu.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/generated/locale_keys.g.dart';-import 'package:app_flowy/workspace/application/settings/settings_dialog_bloc.dart';-import 'package:app_flowy/workspace/presentation/settings/widgets/settings_menu_element.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/application/settings/settings_dialog_bloc.dart';+import 'package:appflowy/workspace/presentation/settings/widgets/settings_menu_element.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_menu_element.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu_element.dartsimilarity index 94%rename from frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_menu_element.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu_element.dartindex facf487e53..7e6f4e7060 100644--- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_menu_element.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu_element.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/settings/settings_dialog_bloc.dart';+import 'package:appflowy/workspace/application/settings/settings_dialog_bloc.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_user_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_user_view.dartsimilarity index 97%rename from frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_user_view.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_user_view.dartindex fdd6614565..8eb2664ca1 100644--- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_user_view.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_user_view.dart@@ -1,13 +1,13 @@-import 'package:app_flowy/startup/startup.dart';+import 'package:appflowy/startup/startup.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';-import 'package:app_flowy/workspace/application/user/settings_user_bloc.dart';+import 'package:appflowy/workspace/application/user/settings_user_bloc.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';import 'package:flowy_infra/image.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:easy_localization/easy_localization.dart';import 'dart:convert';diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/dialogs.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/dialogs.dartsimilarity index 98%rename from frontend/app_flowy/lib/workspace/presentation/widgets/dialogs.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/dialogs.dartindex 2a0241692b..681bd58cf3 100644--- a/frontend/app_flowy/lib/workspace/presentation/widgets/dialogs.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/dialogs.dart@@ -4,12 +4,12 @@ import 'package:flowy_infra_ui/widget/buttons/primary_button.dart';import 'package:flowy_infra_ui/widget/buttons/secondary_button.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';-import 'package:app_flowy/startup/tasks/app_widget.dart';+import 'package:appflowy/startup/tasks/app_widget.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/style_widget/text_input.dart';import 'package:flowy_infra_ui/widget/dialog/styled_dialogs.dart';export 'package:flowy_infra_ui/widget/dialog/styled_dialogs.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:textstyle_extensions/textstyle_extensions.dart';class NavigatorTextFieldDialog extends StatefulWidget {diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/edit_panel/edit_panel.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/edit_panel/edit_panel.dartsimilarity index 83%rename from frontend/app_flowy/lib/workspace/presentation/widgets/edit_panel/edit_panel.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/edit_panel/edit_panel.dartindex ef0b61865e..588af73592 100644--- a/frontend/app_flowy/lib/workspace/presentation/widgets/edit_panel/edit_panel.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/edit_panel/edit_panel.dart@@ -1,13 +1,13 @@-import 'package:app_flowy/workspace/application/edit_panel/edit_panel_bloc.dart';-import 'package:app_flowy/workspace/application/edit_panel/edit_context.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/workspace/presentation/home/home_sizes.dart';+import 'package:appflowy/workspace/application/edit_panel/edit_panel_bloc.dart';+import 'package:appflowy/workspace/application/edit_panel/edit_context.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/presentation/home/home_sizes.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/style_widget/bar_title.dart';import 'package:flowy_infra_ui/style_widget/close_button.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';class EditPanel extends StatelessWidget {final EditPanelContext panelContext;diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/edit_panel/panel_animation.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/edit_panel/panel_animation.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/edit_panel/panel_animation.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/edit_panel/panel_animation.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/emoji_picker.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/emoji_picker.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/emoji_picker.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/emoji_picker.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/config.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/config.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/config.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/config.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/default_emoji_picker_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/default_emoji_picker_view.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/default_emoji_picker_view.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/default_emoji_picker_view.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_lists.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/emoji_lists.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_lists.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/emoji_lists.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_picker.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/emoji_picker.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_picker.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/emoji_picker.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_picker_builder.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/emoji_picker_builder.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_picker_builder.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/emoji_picker_builder.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_view_state.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/emoji_view_state.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/emoji_view_state.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/emoji_view_state.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/models/category_models.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/models/category_models.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/models/category_models.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/models/category_models.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/models/emoji_model.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/models/emoji_model.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/models/emoji_model.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/models/emoji_model.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/models/recent_emoji_model.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/models/recent_emoji_model.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/emoji_picker/src/models/recent_emoji_model.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/emoji_picker/src/models/recent_emoji_model.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/float_bubble/question_bubble.dartsimilarity index 95%rename from frontend/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/float_bubble/question_bubble.dartindex 0020ca4004..054af91c79 100644--- a/frontend/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/startup/tasks/rust_sdk.dart';-import 'package:app_flowy/workspace/presentation/home/toast.dart';-import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';+import 'package:appflowy/startup/tasks/rust_sdk.dart';+import 'package:appflowy/workspace/presentation/home/toast.dart';+import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/size.dart';@@ -12,7 +12,7 @@ import 'package:flutter/services.dart';import 'package:styled_widget/styled_widget.dart';import 'package:package_info_plus/package_info_plus.dart';import 'package:url_launcher/url_launcher.dart';-import 'package:app_flowy/generated/locale_keys.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';import 'package:device_info_plus/device_info_plus.dart';class QuestionBubble extends StatelessWidget {diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/left_bar_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/left_bar_item.dartsimilarity index 93%rename from frontend/app_flowy/lib/workspace/presentation/widgets/left_bar_item.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/left_bar_item.dartindex d71c75034e..29788a8a32 100644--- a/frontend/app_flowy/lib/workspace/presentation/widgets/left_bar_item.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/left_bar_item.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/workspace/application/view/view_listener.dart';-import 'package:app_flowy/workspace/application/view/view_service.dart';+import 'package:appflowy/workspace/application/view/view_listener.dart';+import 'package:appflowy/workspace/application/view/view_service.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/pop_up_action.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/pop_up_action.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/pop_up_action.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/pop_up_action.dartdiff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/toggle/toggle.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/toggle/toggle.dartsimilarity index 95%rename from frontend/app_flowy/lib/workspace/presentation/widgets/toggle/toggle.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/toggle/toggle.dartindex 8df73f5ecb..80335c66fe 100644--- a/frontend/app_flowy/lib/workspace/presentation/widgets/toggle/toggle.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/toggle/toggle.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/presentation/widgets/toggle/toggle_style.dart';+import 'package:appflowy/workspace/presentation/widgets/toggle/toggle_style.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flutter/material.dart';diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/toggle/toggle_style.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/toggle/toggle_style.dartsimilarity index 100%rename from frontend/app_flowy/lib/workspace/presentation/widgets/toggle/toggle_style.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/widgets/toggle/toggle_style.dartdiff --git a/frontend/app_flowy/linux/.gitignore b/frontend/appflowy_flutter/linux/.gitignoresimilarity index 100%rename from frontend/app_flowy/linux/.gitignorerename to frontend/appflowy_flutter/linux/.gitignorediff --git a/frontend/app_flowy/linux/CMakeLists.txt b/frontend/appflowy_flutter/linux/CMakeLists.txtsimilarity index 97%rename from frontend/app_flowy/linux/CMakeLists.txtrename to frontend/appflowy_flutter/linux/CMakeLists.txtindex ff7a4c7afa..26146072f2 100644--- a/frontend/app_flowy/linux/CMakeLists.txt+++ b/frontend/appflowy_flutter/linux/CMakeLists.txt@@ -1,8 +1,8 @@cmake_minimum_required(VERSION 3.10)project(runner LANGUAGES CXX)-set(BINARY_NAME "app_flowy")-set(APPLICATION_ID "com.example.app_flowy")+set(BINARY_NAME "appflowy_flutter")+set(APPLICATION_ID "com.example.appflowy_flutter")cmake_policy(SET CMP0063 NEW)diff --git a/frontend/app_flowy/linux/appflowy.desktop.temp b/frontend/appflowy_flutter/linux/appflowy.desktop.tempsimilarity index 72%rename from frontend/app_flowy/linux/appflowy.desktop.temprename to frontend/appflowy_flutter/linux/appflowy.desktop.tempindex 77bd120524..d23fdec42b 100644--- a/frontend/app_flowy/linux/appflowy.desktop.temp+++ b/frontend/appflowy_flutter/linux/appflowy.desktop.temp@@ -2,7 +2,7 @@Name=AppFlowyComment=An Open Source Alternative to NotionIcon=[CHANGE_THIS]/AppFlowy/flowy_logo.svg-Exec=[CHANGE_THIS]/AppFlowy/app_flowy+Exec=[CHANGE_THIS]/AppFlowy/appflowy_flutterCategories=OfficeType=ApplicationTerminal=false\ No newline at end of filediff --git a/frontend/app_flowy/linux/flutter/CMakeLists.txt b/frontend/appflowy_flutter/linux/flutter/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/linux/flutter/CMakeLists.txtrename to frontend/appflowy_flutter/linux/flutter/CMakeLists.txtdiff --git a/frontend/app_flowy/linux/flutter/dart_ffi/binding.h b/frontend/appflowy_flutter/linux/flutter/dart_ffi/binding.hsimilarity index 100%rename from frontend/app_flowy/linux/flutter/dart_ffi/binding.hrename to frontend/appflowy_flutter/linux/flutter/dart_ffi/binding.hdiff --git a/frontend/app_flowy/linux/main.cc b/frontend/appflowy_flutter/linux/main.ccsimilarity index 100%rename from frontend/app_flowy/linux/main.ccrename to frontend/appflowy_flutter/linux/main.ccdiff --git a/frontend/app_flowy/linux/my_application.cc b/frontend/appflowy_flutter/linux/my_application.ccsimilarity index 96%rename from frontend/app_flowy/linux/my_application.ccrename to frontend/appflowy_flutter/linux/my_application.ccindex c3dd73fb75..d262d685a7 100644--- a/frontend/app_flowy/linux/my_application.cc+++ b/frontend/appflowy_flutter/linux/my_application.cc@@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) {if (use_header_bar) {GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());gtk_widget_show(GTK_WIDGET(header_bar));- gtk_header_bar_set_title(header_bar, "app_flowy");+ gtk_header_bar_set_title(header_bar, "appflowy_flutter");gtk_header_bar_set_show_close_button(header_bar, TRUE);gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));} else {- gtk_window_set_title(window, "app_flowy");+ gtk_window_set_title(window, "appflowy_flutter");}gtk_window_set_default_size(window, 1280, 720);diff --git a/frontend/app_flowy/linux/my_application.h b/frontend/appflowy_flutter/linux/my_application.hsimilarity index 100%rename from frontend/app_flowy/linux/my_application.hrename to frontend/appflowy_flutter/linux/my_application.hdiff --git a/frontend/app_flowy/macos/.gitignore b/frontend/appflowy_flutter/macos/.gitignoresimilarity index 100%rename from frontend/app_flowy/macos/.gitignorerename to frontend/appflowy_flutter/macos/.gitignorediff --git a/frontend/app_flowy/macos/Flutter/Flutter-Debug.xcconfig b/frontend/appflowy_flutter/macos/Flutter/Flutter-Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/macos/Flutter/Flutter-Debug.xcconfigrename to frontend/appflowy_flutter/macos/Flutter/Flutter-Debug.xcconfigdiff --git a/frontend/app_flowy/macos/Flutter/Flutter-Release.xcconfig b/frontend/appflowy_flutter/macos/Flutter/Flutter-Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/macos/Flutter/Flutter-Release.xcconfigrename to frontend/appflowy_flutter/macos/Flutter/Flutter-Release.xcconfigdiff --git a/frontend/app_flowy/macos/Podfile b/frontend/appflowy_flutter/macos/Podfilesimilarity index 100%rename from frontend/app_flowy/macos/Podfilerename to frontend/appflowy_flutter/macos/Podfilediff --git a/frontend/app_flowy/macos/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxprojsimilarity index 100%rename from frontend/app_flowy/macos/Runner.xcodeproj/project.pbxprojrename to frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxprojdiff --git a/frontend/app_flowy/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/appflowy_flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemesimilarity index 100%rename from frontend/app_flowy/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemerename to frontend/appflowy_flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemediff --git a/frontend/app_flowy/macos/Runner.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/macos/Runner.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/macos/Runner.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/macos/Runner.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/macos/Runner/AppDelegate.swift b/frontend/appflowy_flutter/macos/Runner/AppDelegate.swiftsimilarity index 100%rename from frontend/app_flowy/macos/Runner/AppDelegate.swiftrename to frontend/appflowy_flutter/macos/Runner/AppDelegate.swiftdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/100.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/100.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/100.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/100.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/1024.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/1024.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/1024.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/114.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/114.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/114.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/114.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/120.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/120.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/120.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/120.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/128.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/128.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/128.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/128.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/144.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/144.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/144.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/144.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/152.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/152.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/152.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/152.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/16.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/16.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/16.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/16.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/167.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/167.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/167.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/167.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/180.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/180.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/180.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/180.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/20.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/20.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/20.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/20.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/256.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/256.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/256.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/256.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/29.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/29.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/29.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/29.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/32.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/32.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/32.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/32.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/40.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/40.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/40.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/40.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/50.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/50.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/50.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/50.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/512.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/512.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/512.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/512.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/57.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/57.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/57.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/57.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/58.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/58.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/58.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/58.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/60.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/60.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/60.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/60.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/64.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/64.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/64.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/64.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/72.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/72.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/72.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/72.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/76.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/76.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/76.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/76.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/80.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/80.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/80.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/80.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/87.png b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/87.pngsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/87.pngrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/87.pngdiff --git a/frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonrename to frontend/appflowy_flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsondiff --git a/frontend/app_flowy/macos/Runner/Base.lproj/MainMenu.xib b/frontend/appflowy_flutter/macos/Runner/Base.lproj/MainMenu.xibsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Base.lproj/MainMenu.xibrename to frontend/appflowy_flutter/macos/Runner/Base.lproj/MainMenu.xibdiff --git a/frontend/app_flowy/macos/Runner/Configs/AppInfo.xcconfig b/frontend/appflowy_flutter/macos/Runner/Configs/AppInfo.xcconfigsimilarity index 94%rename from frontend/app_flowy/macos/Runner/Configs/AppInfo.xcconfigrename to frontend/appflowy_flutter/macos/Runner/Configs/AppInfo.xcconfigindex b42bbd8f62..d0b1c2acf9 100644--- a/frontend/app_flowy/macos/Runner/Configs/AppInfo.xcconfig+++ b/frontend/appflowy_flutter/macos/Runner/Configs/AppInfo.xcconfig@@ -5,7 +5,7 @@// 'flutter create' template.// The application's name. By default this is also the title of the Flutter window.-PRODUCT_NAME = app_flowy+PRODUCT_NAME = appflowy_flutter// The application's bundle identifierPRODUCT_BUNDLE_IDENTIFIER = com.example.appFlowydiff --git a/frontend/app_flowy/macos/Runner/Configs/Debug.xcconfig b/frontend/appflowy_flutter/macos/Runner/Configs/Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Configs/Debug.xcconfigrename to frontend/appflowy_flutter/macos/Runner/Configs/Debug.xcconfigdiff --git a/frontend/app_flowy/macos/Runner/Configs/Release.xcconfig b/frontend/appflowy_flutter/macos/Runner/Configs/Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Configs/Release.xcconfigrename to frontend/appflowy_flutter/macos/Runner/Configs/Release.xcconfigdiff --git a/frontend/app_flowy/macos/Runner/Configs/Warnings.xcconfig b/frontend/appflowy_flutter/macos/Runner/Configs/Warnings.xcconfigsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Configs/Warnings.xcconfigrename to frontend/appflowy_flutter/macos/Runner/Configs/Warnings.xcconfigdiff --git a/frontend/app_flowy/macos/Runner/DebugProfile.entitlements b/frontend/appflowy_flutter/macos/Runner/DebugProfile.entitlementssimilarity index 100%rename from frontend/app_flowy/macos/Runner/DebugProfile.entitlementsrename to frontend/appflowy_flutter/macos/Runner/DebugProfile.entitlementsdiff --git a/frontend/app_flowy/macos/Runner/Info.plist b/frontend/appflowy_flutter/macos/Runner/Info.plistsimilarity index 100%rename from frontend/app_flowy/macos/Runner/Info.plistrename to frontend/appflowy_flutter/macos/Runner/Info.plistdiff --git a/frontend/app_flowy/macos/Runner/MainFlutterWindow.swift b/frontend/appflowy_flutter/macos/Runner/MainFlutterWindow.swiftsimilarity index 100%rename from frontend/app_flowy/macos/Runner/MainFlutterWindow.swiftrename to frontend/appflowy_flutter/macos/Runner/MainFlutterWindow.swiftdiff --git a/frontend/app_flowy/macos/Runner/Release.entitlements b/frontend/appflowy_flutter/macos/Runner/Release.entitlementssimilarity index 100%rename from frontend/app_flowy/macos/Runner/Release.entitlementsrename to frontend/appflowy_flutter/macos/Runner/Release.entitlementsdiff --git a/frontend/app_flowy/packages/appflowy_backend/.gitignore b/frontend/appflowy_flutter/packages/appflowy_backend/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_backend/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_backend/.metadata b/frontend/appflowy_flutter/packages/appflowy_backend/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/.metadatarename to frontend/appflowy_flutter/packages/appflowy_backend/.metadatadiff --git a/frontend/app_flowy/packages/appflowy_backend/CHANGELOG.md b/frontend/appflowy_flutter/packages/appflowy_backend/CHANGELOG.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/CHANGELOG.mdrename to frontend/appflowy_flutter/packages/appflowy_backend/CHANGELOG.mddiff --git a/frontend/app_flowy/packages/appflowy_backend/LICENSE b/frontend/appflowy_flutter/packages/appflowy_backend/LICENSEsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/LICENSErename to frontend/appflowy_flutter/packages/appflowy_backend/LICENSEdiff --git a/frontend/app_flowy/packages/appflowy_backend/README.md b/frontend/appflowy_flutter/packages/appflowy_backend/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/README.mdrename to frontend/appflowy_flutter/packages/appflowy_backend/README.mddiff --git a/frontend/app_flowy/packages/appflowy_backend/analysis_options.yaml b/frontend/appflowy_flutter/packages/appflowy_backend/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/analysis_options.yamlrename to frontend/appflowy_flutter/packages/appflowy_backend/analysis_options.yamldiff --git a/frontend/app_flowy/packages/appflowy_backend/android/.gitignore b/frontend/appflowy_flutter/packages/appflowy_backend/android/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/android/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_backend/android/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_backend/android/build.gradle b/frontend/appflowy_flutter/packages/appflowy_backend/android/build.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/android/build.gradlerename to frontend/appflowy_flutter/packages/appflowy_backend/android/build.gradlediff --git a/frontend/app_flowy/packages/appflowy_backend/android/gradle.properties b/frontend/appflowy_flutter/packages/appflowy_backend/android/gradle.propertiessimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/android/gradle.propertiesrename to frontend/appflowy_flutter/packages/appflowy_backend/android/gradle.propertiesdiff --git a/frontend/app_flowy/packages/appflowy_backend/android/gradle/wrapper/gradle-wrapper.properties b/frontend/appflowy_flutter/packages/appflowy_backend/android/gradle/wrapper/gradle-wrapper.propertiessimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/android/gradle/wrapper/gradle-wrapper.propertiesrename to frontend/appflowy_flutter/packages/appflowy_backend/android/gradle/wrapper/gradle-wrapper.propertiesdiff --git a/frontend/app_flowy/packages/appflowy_backend/android/settings.gradle b/frontend/appflowy_flutter/packages/appflowy_backend/android/settings.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/android/settings.gradlerename to frontend/appflowy_flutter/packages/appflowy_backend/android/settings.gradlediff --git a/frontend/app_flowy/packages/appflowy_backend/android/src/main/AndroidManifest.xml b/frontend/appflowy_flutter/packages/appflowy_backend/android/src/main/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/android/src/main/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/appflowy_backend/android/src/main/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/appflowy_backend/android/src/main/kotlin/com/plugin/appflowy_backend/AppFlowyBackendPlugin.kt b/frontend/appflowy_flutter/packages/appflowy_backend/android/src/main/kotlin/com/plugin/appflowy_backend/AppFlowyBackendPlugin.ktsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/android/src/main/kotlin/com/plugin/appflowy_backend/AppFlowyBackendPlugin.ktrename to frontend/appflowy_flutter/packages/appflowy_backend/android/src/main/kotlin/com/plugin/appflowy_backend/AppFlowyBackendPlugin.ktdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/.gitignore b/frontend/appflowy_flutter/packages/appflowy_backend/example/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_backend/example/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_backend/example/.metadata b/frontend/appflowy_flutter/packages/appflowy_backend/example/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/.metadatarename to frontend/appflowy_flutter/packages/appflowy_backend/example/.metadatadiff --git a/frontend/app_flowy/packages/appflowy_backend/example/README.md b/frontend/appflowy_flutter/packages/appflowy_backend/example/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/README.mdrename to frontend/appflowy_flutter/packages/appflowy_backend/example/README.mddiff --git a/frontend/app_flowy/packages/appflowy_backend/example/analysis_options.yaml b/frontend/appflowy_flutter/packages/appflowy_backend/example/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/analysis_options.yamlrename to frontend/appflowy_flutter/packages/appflowy_backend/example/analysis_options.yamldiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/.gitignore b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/build.gradle b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/build.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/build.gradlerename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/build.gradlediff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/debug/AndroidManifest.xml b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/debug/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/debug/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/debug/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/AndroidManifest.xml b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/kotlin/com/plugin/flowy_sdk_example/MainActivity.kt b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/kotlin/com/plugin/flowy_sdk_example/MainActivity.ktsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/kotlin/com/plugin/flowy_sdk_example/MainActivity.ktrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/kotlin/com/plugin/flowy_sdk_example/MainActivity.ktdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/drawable-v21/launch_background.xml b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/drawable-v21/launch_background.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/drawable-v21/launch_background.xmlrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/drawable-v21/launch_background.xmldiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/drawable/launch_background.xml b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/drawable/launch_background.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/drawable/launch_background.xmlrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/drawable/launch_background.xmldiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/values-night/styles.xml b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/values-night/styles.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/values-night/styles.xmlrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/values-night/styles.xmldiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/values/styles.xml b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/values/styles.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/main/res/values/styles.xmlrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/main/res/values/styles.xmldiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/app/src/profile/AndroidManifest.xml b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/profile/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/app/src/profile/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/app/src/profile/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/build.gradle b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/build.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/build.gradlerename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/build.gradlediff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/gradle.properties b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/gradle.propertiessimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/gradle.propertiesrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/gradle.propertiesdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/gradle/wrapper/gradle-wrapper.properties b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/gradle/wrapper/gradle-wrapper.propertiessimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/gradle/wrapper/gradle-wrapper.propertiesrename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/gradle/wrapper/gradle-wrapper.propertiesdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/android/settings.gradle b/frontend/appflowy_flutter/packages/appflowy_backend/example/android/settings.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/android/settings.gradlerename to frontend/appflowy_flutter/packages/appflowy_backend/example/android/settings.gradlediff --git a/frontend/app_flowy/packages/appflowy_backend/example/integration_test/app_test.dart b/frontend/appflowy_flutter/packages/appflowy_backend/example/integration_test/app_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/integration_test/app_test.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/example/integration_test/app_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/integration_test/driver.dart b/frontend/appflowy_flutter/packages/appflowy_backend/example/integration_test/driver.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/integration_test/driver.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/example/integration_test/driver.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/.gitignore b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Flutter/AppFrameworkInfo.plist b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Flutter/AppFrameworkInfo.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Flutter/AppFrameworkInfo.plistrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Flutter/AppFrameworkInfo.plistdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Flutter/Debug.xcconfig b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Flutter/Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Flutter/Debug.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Flutter/Debug.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Flutter/Release.xcconfig b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Flutter/Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Flutter/Release.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Flutter/Release.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Podfile b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Podfilesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Podfilerename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Podfilediff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.pbxprojsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.pbxprojrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.pbxprojdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemerename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemediff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/AppDelegate.swift b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/AppDelegate.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/AppDelegate.swiftrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/AppDelegate.swiftdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsondiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsondiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mdrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mddiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Base.lproj/LaunchScreen.storyboardsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Base.lproj/LaunchScreen.storyboardrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Base.lproj/LaunchScreen.storyboarddiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Base.lproj/Main.storyboard b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Base.lproj/Main.storyboardsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Base.lproj/Main.storyboardrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Base.lproj/Main.storyboarddiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Info.plist b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Info.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Info.plistrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Info.plistdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Runner-Bridging-Header.h b/frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Runner-Bridging-Header.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/ios/Runner/Runner-Bridging-Header.hrename to frontend/appflowy_flutter/packages/appflowy_backend/example/ios/Runner/Runner-Bridging-Header.hdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/lib/main.dart b/frontend/appflowy_flutter/packages/appflowy_backend/example/lib/main.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/lib/main.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/example/lib/main.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/.gitignore b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Flutter/Flutter-Debug.xcconfig b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Flutter/Flutter-Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Flutter/Flutter-Debug.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Flutter/Flutter-Debug.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Flutter/Flutter-Release.xcconfig b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Flutter/Flutter-Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Flutter/Flutter-Release.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Flutter/Flutter-Release.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Podfile b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Podfilesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Podfilerename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Podfilediff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Podfile.lock b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Podfile.locksimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Podfile.lockrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Podfile.lockdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner.xcodeproj/project.pbxprojsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner.xcodeproj/project.pbxprojrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner.xcodeproj/project.pbxprojdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemerename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemediff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/AppDelegate.swift b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/AppDelegate.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/AppDelegate.swiftrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/AppDelegate.swiftdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsondiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Base.lproj/MainMenu.xib b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Base.lproj/MainMenu.xibsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Base.lproj/MainMenu.xibrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Base.lproj/MainMenu.xibdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Configs/AppInfo.xcconfig b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Configs/AppInfo.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Configs/AppInfo.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Configs/AppInfo.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Configs/Debug.xcconfig b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Configs/Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Configs/Debug.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Configs/Debug.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Configs/Release.xcconfig b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Configs/Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Configs/Release.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Configs/Release.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Configs/Warnings.xcconfig b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Configs/Warnings.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Configs/Warnings.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Configs/Warnings.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/DebugProfile.entitlements b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/DebugProfile.entitlementssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/DebugProfile.entitlementsrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/DebugProfile.entitlementsdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Info.plist b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Info.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Info.plistrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Info.plistdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/MainFlutterWindow.swift b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/MainFlutterWindow.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/MainFlutterWindow.swiftrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/MainFlutterWindow.swiftdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Release.entitlements b/frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Release.entitlementssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/macos/Runner/Release.entitlementsrename to frontend/appflowy_flutter/packages/appflowy_backend/example/macos/Runner/Release.entitlementsdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/pubspec.yaml b/frontend/appflowy_flutter/packages/appflowy_backend/example/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/pubspec.yamlrename to frontend/appflowy_flutter/packages/appflowy_backend/example/pubspec.yamldiff --git a/frontend/app_flowy/packages/appflowy_backend/example/test/widget_test.dart b/frontend/appflowy_flutter/packages/appflowy_backend/example/test/widget_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/test/widget_test.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/example/test/widget_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/.gitignore b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/flutter/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/flutter/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/flutter/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/flutter/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/Runner.rc b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/Runner.rcsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/Runner.rcrename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/Runner.rcdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/flutter_window.cpp b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/flutter_window.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/flutter_window.cpprename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/flutter_window.cppdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/flutter_window.h b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/flutter_window.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/flutter_window.hrename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/flutter_window.hdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/main.cpp b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/main.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/main.cpprename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/main.cppdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/resource.h b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/resource.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/resource.hrename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/resource.hdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/resources/app_icon.ico b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/resources/app_icon.icosimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/resources/app_icon.icorename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/resources/app_icon.icodiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/runner.exe.manifest b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/runner.exe.manifestsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/runner.exe.manifestrename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/runner.exe.manifestdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/utils.cpp b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/utils.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/utils.cpprename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/utils.cppdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/utils.h b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/utils.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/utils.hrename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/utils.hdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/win32_window.cpp b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/win32_window.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/win32_window.cpprename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/win32_window.cppdiff --git a/frontend/app_flowy/packages/appflowy_backend/example/windows/runner/win32_window.h b/frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/win32_window.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/example/windows/runner/win32_window.hrename to frontend/appflowy_flutter/packages/appflowy_backend/example/windows/runner/win32_window.hdiff --git a/frontend/app_flowy/packages/appflowy_backend/ios/.gitignore b/frontend/appflowy_flutter/packages/appflowy_backend/ios/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/ios/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_backend/ios/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_backend/ios/Assets/.gitkeep b/frontend/appflowy_flutter/packages/appflowy_backend/ios/Assets/.gitkeepsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/ios/Assets/.gitkeeprename to frontend/appflowy_flutter/packages/appflowy_backend/ios/Assets/.gitkeepdiff --git a/frontend/app_flowy/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.h b/frontend/appflowy_flutter/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.hrename to frontend/appflowy_flutter/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.hdiff --git a/frontend/app_flowy/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.m b/frontend/appflowy_flutter/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.msimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.mrename to frontend/appflowy_flutter/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.mdiff --git a/frontend/app_flowy/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.swift b/frontend/appflowy_flutter/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.swiftrename to frontend/appflowy_flutter/packages/appflowy_backend/ios/Classes/AppFlowyBackendPlugin.swiftdiff --git a/frontend/app_flowy/packages/appflowy_backend/ios/appflowy_backend.podspec b/frontend/appflowy_flutter/packages/appflowy_backend/ios/appflowy_backend.podspecsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/ios/appflowy_backend.podspecrename to frontend/appflowy_flutter/packages/appflowy_backend/ios/appflowy_backend.podspecdiff --git a/frontend/app_flowy/packages/appflowy_backend/lib/appflowy_backend.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/appflowy_backend.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/lib/appflowy_backend.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/lib/appflowy_backend.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/lib/appflowy_backend_method_channel.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/appflowy_backend_method_channel.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/lib/appflowy_backend_method_channel.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/lib/appflowy_backend_method_channel.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/lib/appflowy_backend_platform_interface.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/appflowy_backend_platform_interface.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/lib/appflowy_backend_platform_interface.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/lib/appflowy_backend_platform_interface.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/lib/dispatch/dispatch.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/dispatch.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/lib/dispatch/dispatch.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/dispatch.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/lib/dispatch/error.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/error.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/lib/dispatch/error.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/error.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/lib/ffi.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/ffi.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/lib/ffi.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/lib/ffi.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/lib/log.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/log.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/lib/log.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/lib/log.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/lib/rust_stream.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/rust_stream.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/lib/rust_stream.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/lib/rust_stream.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/linux/Classes/binding.h b/frontend/appflowy_flutter/packages/appflowy_backend/linux/Classes/binding.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/linux/Classes/binding.hrename to frontend/appflowy_flutter/packages/appflowy_backend/linux/Classes/binding.hdiff --git a/frontend/app_flowy/packages/appflowy_backend/macos/Classes/AppFlowyBackendPlugin.swift b/frontend/appflowy_flutter/packages/appflowy_backend/macos/Classes/AppFlowyBackendPlugin.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/macos/Classes/AppFlowyBackendPlugin.swiftrename to frontend/appflowy_flutter/packages/appflowy_backend/macos/Classes/AppFlowyBackendPlugin.swiftdiff --git a/frontend/app_flowy/packages/appflowy_backend/macos/Classes/binding.h b/frontend/appflowy_flutter/packages/appflowy_backend/macos/Classes/binding.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/macos/Classes/binding.hrename to frontend/appflowy_flutter/packages/appflowy_backend/macos/Classes/binding.hdiff --git a/frontend/app_flowy/packages/appflowy_backend/macos/appflowy_backend.podspec b/frontend/appflowy_flutter/packages/appflowy_backend/macos/appflowy_backend.podspecsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/macos/appflowy_backend.podspecrename to frontend/appflowy_flutter/packages/appflowy_backend/macos/appflowy_backend.podspecdiff --git a/frontend/app_flowy/packages/appflowy_backend/pubspec.yaml b/frontend/appflowy_flutter/packages/appflowy_backend/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/pubspec.yamlrename to frontend/appflowy_flutter/packages/appflowy_backend/pubspec.yamldiff --git a/frontend/app_flowy/packages/appflowy_backend/test/appflowy_backend_method_channel_test.dart b/frontend/appflowy_flutter/packages/appflowy_backend/test/appflowy_backend_method_channel_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/test/appflowy_backend_method_channel_test.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/test/appflowy_backend_method_channel_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/test/appflowy_backend_test.dart b/frontend/appflowy_flutter/packages/appflowy_backend/test/appflowy_backend_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/test/appflowy_backend_test.dartrename to frontend/appflowy_flutter/packages/appflowy_backend/test/appflowy_backend_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_backend/windows/.gitignore b/frontend/appflowy_flutter/packages/appflowy_backend/windows/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/windows/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_backend/windows/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_backend/windows/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_backend/windows/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/windows/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_backend/windows/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_backend/windows/app_flowy_backend_plugin.h b/frontend/appflowy_flutter/packages/appflowy_backend/windows/app_flowy_backend_plugin.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/windows/app_flowy_backend_plugin.hrename to frontend/appflowy_flutter/packages/appflowy_backend/windows/app_flowy_backend_plugin.hdiff --git a/frontend/app_flowy/packages/appflowy_backend/windows/appflowy_backend_plugin.cpp b/frontend/appflowy_flutter/packages/appflowy_backend/windows/appflowy_backend_plugin.cppsimilarity index 97%rename from frontend/app_flowy/packages/appflowy_backend/windows/appflowy_backend_plugin.cpprename to frontend/appflowy_flutter/packages/appflowy_backend/windows/appflowy_backend_plugin.cppindex 3b9f8859ac..a7928b31e1 100644--- a/frontend/app_flowy/packages/appflowy_backend/windows/appflowy_backend_plugin.cpp+++ b/frontend/appflowy_flutter/packages/appflowy_backend/windows/appflowy_backend_plugin.cpp@@ -1,4 +1,4 @@-#include "include/appflowy_backend/app_flowy_backend_plugin.h"+#include "include/appflowy_backend/appflowy_flutter_backend_plugin.h"// This must be included before many other Windows headers.#include <windows.h>diff --git a/frontend/app_flowy/packages/appflowy_backend/windows/appflowy_backend_plugin_c_api.cpp b/frontend/appflowy_flutter/packages/appflowy_backend/windows/appflowy_backend_plugin_c_api.cppsimilarity index 90%rename from frontend/app_flowy/packages/appflowy_backend/windows/appflowy_backend_plugin_c_api.cpprename to frontend/appflowy_flutter/packages/appflowy_backend/windows/appflowy_backend_plugin_c_api.cppindex d1aee82845..1902de1c91 100644--- a/frontend/app_flowy/packages/appflowy_backend/windows/appflowy_backend_plugin_c_api.cpp+++ b/frontend/appflowy_flutter/packages/appflowy_backend/windows/appflowy_backend_plugin_c_api.cpp@@ -2,7 +2,7 @@#include <flutter/plugin_registrar_windows.h>-#include "app_flowy_backend_plugin.h"+#include "appflowy_flutter_backend_plugin.h"void AppFlowyBackendPluginCApiRegisterWithRegistrar(FlutterDesktopPluginRegistrarRef registrar) {diff --git a/frontend/app_flowy/packages/appflowy_backend/windows/include/appflowy_backend/app_flowy_backend_plugin.h b/frontend/appflowy_flutter/packages/appflowy_backend/windows/include/appflowy_backend/app_flowy_backend_plugin.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/windows/include/appflowy_backend/app_flowy_backend_plugin.hrename to frontend/appflowy_flutter/packages/appflowy_backend/windows/include/appflowy_backend/app_flowy_backend_plugin.hdiff --git a/frontend/app_flowy/packages/appflowy_backend/windows/include/appflowy_backend/appflowy_backend_plugin_c_api.h b/frontend/appflowy_flutter/packages/appflowy_backend/windows/include/appflowy_backend/appflowy_backend_plugin_c_api.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_backend/windows/include/appflowy_backend/appflowy_backend_plugin_c_api.hrename to frontend/appflowy_flutter/packages/appflowy_backend/windows/include/appflowy_backend/appflowy_backend_plugin_c_api.hdiff --git a/frontend/app_flowy/packages/appflowy_editor/.gitignore b/frontend/appflowy_flutter/packages/appflowy_editor/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_editor/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_editor/.metadata b/frontend/appflowy_flutter/packages/appflowy_editor/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/.metadatarename to frontend/appflowy_flutter/packages/appflowy_editor/.metadatadiff --git a/frontend/app_flowy/packages/appflowy_editor/CHANGELOG.md b/frontend/appflowy_flutter/packages/appflowy_editor/CHANGELOG.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/CHANGELOG.mdrename to frontend/appflowy_flutter/packages/appflowy_editor/CHANGELOG.mddiff --git a/frontend/app_flowy/packages/appflowy_editor/LICENSE b/frontend/appflowy_flutter/packages/appflowy_editor/LICENSEsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/LICENSErename to frontend/appflowy_flutter/packages/appflowy_editor/LICENSEdiff --git a/frontend/app_flowy/packages/appflowy_editor/README.md b/frontend/appflowy_flutter/packages/appflowy_editor/README.mdsimilarity index 69%rename from frontend/app_flowy/packages/appflowy_editor/README.mdrename to frontend/appflowy_flutter/packages/appflowy_editor/README.mdindex cdeec94dec..65144cda59 100644--- a/frontend/app_flowy/packages/appflowy_editor/README.md+++ b/frontend/appflowy_flutter/packages/appflowy_editor/README.md@@ -27,7 +27,7 @@ and the Flutter guide for</p><div align="center">- <img src="https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/documentation/images/appflowy_editor_example.mp4?raw=true" width = "700" style = "padding: 100"/>+ <img src="https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/appflowy_editor_example.mp4?raw=true" width = "700" style = "padding: 100"/></div>## Key Features@@ -38,7 +38,7 @@ and the Flutter guide for* shortcut events* themes* menu options (**coming soon!**)-* [Test-coverage](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/documentation/testing.md) and ongoing maintenance by AppFlowy's core team and community of more than 1,000 builders+* [Test-coverage](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/documentation/testing.md) and ongoing maintenance by AppFlowy's core team and community of more than 1,000 builders## Getting Started@@ -60,7 +60,7 @@ final editor = AppFlowyEditor();```-You can also create an editor from a JSON object in order to configure your initial state. Or you can [create an editor from Markdown or Quill Delta](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/documentation/importing.md).+You can also create an editor from a JSON object in order to configure your initial state. Or you can [create an editor from Markdown or Quill Delta](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/documentation/importing.md).```dartfinal json = ...;@@ -83,7 +83,7 @@ To get a sense of how the AppFlowy Editor works, run our example:```shellgit clone https://github.com/AppFlowy-IO/AppFlowy.git-cd frontend/app_flowy/packages/appflowy_editor/example+cd frontend/appflowy_flutter/packages/appflowy_editor/exampleflutter run```@@ -91,23 +91,23 @@ flutter run### Customizing Components-Please refer to our documentation on customizing AppFlowy for a detailed discussion about [customizing components](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/documentation/customizing.md#customize-a-component).+Please refer to our documentation on customizing AppFlowy for a detailed discussion about [customizing components](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/documentation/customizing.md#customize-a-component).Below are some examples of component customizations:- * [Checkbox Text](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/checkbox_text.dart) demonstrates how to extend new styles based on existing rich text components- * [Image](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/network_image_node_widget.dart) demonstrates how to extend a new node and render it- * See further examples of [rich-text plugins](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text)+ * [Checkbox Text](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/checkbox_text.dart) demonstrates how to extend new styles based on existing rich text components+ * [Image](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/network_image_node_widget.dart) demonstrates how to extend a new node and render it+ * See further examples of [rich-text plugins](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text)### Customizing Shortcut Events-Please refer to our documentation on customizing AppFlowy for a detailed discussion about [customizing shortcut events](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/documentation/customizing.md#customize-a-shortcut-event).+Please refer to our documentation on customizing AppFlowy for a detailed discussion about [customizing shortcut events](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/documentation/customizing.md#customize-a-shortcut-event).Below are some examples of shortcut event customizations:- * [BIUS](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/format_style_handler.dart) demonstrates how to make text bold/italic/underline/strikethrough through shortcut keys- * [Paste HTML](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/copy_paste_handler.dart) gives you an idea on how to handle pasted styles through shortcut keys- * Need more examples? Check out [Internal key event handlers](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers)+ * [BIUS](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/format_style_handler.dart) demonstrates how to make text bold/italic/underline/strikethrough through shortcut keys+ * [Paste HTML](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/copy_paste_handler.dart) gives you an idea on how to handle pasted styles through shortcut keys+ * Need more examples? Check out [Internal key event handlers](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers)## GlossaryPlease refer to the API documentation.diff --git a/frontend/app_flowy/packages/appflowy_editor/analysis_options.yaml b/frontend/appflowy_flutter/packages/appflowy_editor/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/analysis_options.yamlrename to frontend/appflowy_flutter/packages/appflowy_editor/analysis_options.yamldiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/check.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/check.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/check.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/check.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/checkmark.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/checkmark.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/checkmark.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/checkmark.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/clear.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/clear.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/clear.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/clear.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/copy.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/copy.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/copy.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/copy.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/delete.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/delete.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/delete.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/delete.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/align_center.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/align_center.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/align_center.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/align_center.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/align_left.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/align_left.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/align_left.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/align_left.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/align_right.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/align_right.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/align_right.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/align_right.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/copy.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/copy.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/copy.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/copy.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/delete.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/delete.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/delete.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/delete.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/divider.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/divider.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/divider.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/divider.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/share.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/share.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/image_toolbar/share.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/image_toolbar/share.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/link.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/link.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/link.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/link.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/point.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/point.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/point.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/point.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/quote.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/quote.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/quote.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/quote.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/bulleted_list.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/bulleted_list.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/bulleted_list.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/bulleted_list.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/checkbox.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/checkbox.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/checkbox.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/checkbox.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/h1.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/h1.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/h1.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/h1.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/h2.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/h2.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/h2.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/h2.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/h3.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/h3.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/h3.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/h3.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/image.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/image.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/image.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/image.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/number.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/number.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/number.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/number.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/quote.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/quote.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/quote.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/quote.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/text.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/text.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/selection_menu/text.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/selection_menu/text.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/bold.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/bold.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/bold.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/bold.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/bulleted_list.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/bulleted_list.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/bulleted_list.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/bulleted_list.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/center.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/center.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/center.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/center.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/code.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/code.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/code.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/code.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/divider.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/divider.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/divider.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/divider.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/h1.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/h1.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/h1.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/h1.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/h2.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/h2.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/h2.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/h2.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/h3.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/h3.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/h3.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/h3.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/highlight.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/highlight.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/highlight.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/highlight.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/italic.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/italic.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/italic.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/italic.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/left.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/left.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/left.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/left.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/link.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/link.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/link.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/link.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/number_list.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/number_list.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/number_list.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/number_list.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/quote.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/quote.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/quote.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/quote.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/right.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/right.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/right.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/right.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/strikethrough.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/strikethrough.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/strikethrough.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/strikethrough.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/underline.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/underline.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/toolbar/underline.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/toolbar/underline.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/assets/images/uncheck.svg b/frontend/appflowy_flutter/packages/appflowy_editor/assets/images/uncheck.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/assets/images/uncheck.svgrename to frontend/appflowy_flutter/packages/appflowy_editor/assets/images/uncheck.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/customizing.md b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/customizing.mdsimilarity index 96%rename from frontend/app_flowy/packages/appflowy_editor/documentation/customizing.mdrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/customizing.mdindex 2733a79472..30926b3d50 100644--- a/frontend/app_flowy/packages/appflowy_editor/documentation/customizing.md+++ b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/customizing.md@@ -136,7 +136,7 @@ Widget build(BuildContext context) {-Check out the [complete code](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/markdown_syntax_to_styled_text.dart) file of this example.+Check out the [complete code](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/markdown_syntax_to_styled_text.dart) file of this example.## Customizing a Component@@ -302,7 +302,7 @@ return AppFlowyEditor(-Check out the [complete code](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/network_image_node_widget.dart) file of this example.+Check out the [complete code](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/network_image_node_widget.dart) file of this example.## Customizing a Theme (New Feature in 0.0.7)diff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/images/appflowy_editor_example.mp4 b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/appflowy_editor_example.mp4similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/documentation/images/appflowy_editor_example.mp4rename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/appflowy_editor_example.mp4diff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/images/customize_a_component.gif b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/customize_a_component.gifsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/documentation/images/customize_a_component.gifrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/customize_a_component.gifdiff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/images/customize_a_shortcut_event_after.gif b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/customize_a_shortcut_event_after.gifsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/documentation/images/customize_a_shortcut_event_after.gifrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/customize_a_shortcut_event_after.gifdiff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/images/customize_a_shortcut_event_before.gif b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/customize_a_shortcut_event_before.gifsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/documentation/images/customize_a_shortcut_event_before.gifrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/customize_a_shortcut_event_before.gifdiff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/images/customizing_a_theme_after.png b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/customizing_a_theme_after.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/documentation/images/customizing_a_theme_after.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/customizing_a_theme_after.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/images/customizing_a_theme_before.png b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/customizing_a_theme_before.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/documentation/images/customizing_a_theme_before.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/customizing_a_theme_before.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/images/example.png b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/example.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/documentation/images/example.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/example.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/images/reporting_bugs.png b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/reporting_bugs.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/documentation/images/reporting_bugs.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/images/reporting_bugs.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/importing.md b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/importing.mdsimilarity index 92%rename from frontend/app_flowy/packages/appflowy_editor/documentation/importing.mdrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/importing.mdindex abe682adef..393f4dc62e 100644--- a/frontend/app_flowy/packages/appflowy_editor/documentation/importing.md+++ b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/importing.md@@ -33,4 +33,4 @@ final editorState = EditorState();```-For more details, please refer to the function `_importFile` through this [link](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/example/lib/home_page.dart).\ No newline at end of file+For more details, please refer to the function `_importFile` through this [link](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/home_page.dart).\ No newline at end of filediff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/testing.md b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/testing.mdsimilarity index 95%rename from frontend/app_flowy/packages/appflowy_editor/documentation/testing.mdrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/testing.mdindex c721510844..7e356d9f83 100644--- a/frontend/app_flowy/packages/appflowy_editor/documentation/testing.md+++ b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/testing.md@@ -58,7 +58,7 @@ Get the node of a defined path. In this case we are getting the first node of thfinal firstTextNode = editor.nodeAtPath([0]) as TextNode;```-Update the [Selection](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/app_flowy/packages/appflowy_editor/lib/src/document/selection.dart) so that our text "Welcome to Appflowy π" is selected. We will start our selection from the beginning of the string.+Update the [Selection](https://github.com/AppFlowy-IO/AppFlowy/blob/main/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/document/selection.dart) so that our text "Welcome to Appflowy π" is selected. We will start our selection from the beginning of the string.```dartawait editor.updateSelection(diff --git a/frontend/app_flowy/packages/appflowy_editor/documentation/translation.md b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/translation.mdsimilarity index 80%rename from frontend/app_flowy/packages/appflowy_editor/documentation/translation.mdrename to frontend/appflowy_flutter/packages/appflowy_editor/documentation/translation.mdindex 54c5900bc3..8fc26d8012 100644--- a/frontend/app_flowy/packages/appflowy_editor/documentation/translation.md+++ b/frontend/appflowy_flutter/packages/appflowy_editor/documentation/translation.md@@ -3,13 +3,13 @@You can help Appflowy Editor in supporting various languages by contributing. Follow the steps below sequentially to contribute translations.## Steps to modify an existing translation-Translation files are located in: `frontend/app_flowy/packages/appflowy_editor/lib/l10n/`+Translation files are located in: `frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/`1. Install the Visual Studio Code plugin: [Flutter intl](https://marketplace.visualstudio.com/items?itemName=localizely.flutter-intl)2. Modify the specific translation file.3. Save the file and the translation will be generated automatically.## Steps to add new language-Translation files are located in: `frontend/app_flowy/packages/appflowy_editor/lib/l10n/`+Translation files are located in: `frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/`1. Install the Visual Studio Code plugin: [Flutter intl](https://marketplace.visualstudio.com/items?itemName=localizely.flutter-intl)2. Copy the `intl_en.arb` as a base translation and rename the new file to `intl_<new_locale>.arb`3. Modify the new translation file.diff --git a/frontend/app_flowy/packages/appflowy_editor/example/.firebaserc b/frontend/appflowy_flutter/packages/appflowy_editor/example/.firebasercsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/.firebasercrename to frontend/appflowy_flutter/packages/appflowy_editor/example/.firebasercdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/.gitignore b/frontend/appflowy_flutter/packages/appflowy_editor/example/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_editor/example/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_editor/example/.metadata b/frontend/appflowy_flutter/packages/appflowy_editor/example/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/.metadatarename to frontend/appflowy_flutter/packages/appflowy_editor/example/.metadatadiff --git a/frontend/app_flowy/packages/appflowy_editor/example/README.md b/frontend/appflowy_flutter/packages/appflowy_editor/example/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/README.mdrename to frontend/appflowy_flutter/packages/appflowy_editor/example/README.mddiff --git a/frontend/app_flowy/packages/appflowy_editor/example/analysis_options.yaml b/frontend/appflowy_flutter/packages/appflowy_editor/example/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/analysis_options.yamlrename to frontend/appflowy_flutter/packages/appflowy_editor/example/analysis_options.yamldiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/.gitignore b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/build.gradle b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/build.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/build.gradlerename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/build.gradlediff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/debug/AndroidManifest.xml b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/debug/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/debug/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/debug/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/AndroidManifest.xml b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/kotlin/com/example/example/MainActivity.ktsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/kotlin/com/example/example/MainActivity.ktrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/kotlin/com/example/example/MainActivity.ktdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/drawable-v21/launch_background.xml b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/drawable-v21/launch_background.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/drawable-v21/launch_background.xmlrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/drawable-v21/launch_background.xmldiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/drawable/launch_background.xml b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/drawable/launch_background.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/drawable/launch_background.xmlrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/drawable/launch_background.xmldiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/values-night/styles.xml b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/values-night/styles.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/values-night/styles.xmlrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/values-night/styles.xmldiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/values/styles.xml b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/values/styles.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/main/res/values/styles.xmlrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/main/res/values/styles.xmldiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/app/src/profile/AndroidManifest.xml b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/profile/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/app/src/profile/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/app/src/profile/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/build.gradle b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/build.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/build.gradlerename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/build.gradlediff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/gradle.properties b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/gradle.propertiessimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/gradle.propertiesrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/gradle.propertiesdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/gradle/wrapper/gradle-wrapper.properties b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/gradle/wrapper/gradle-wrapper.propertiessimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/gradle/wrapper/gradle-wrapper.propertiesrename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/gradle/wrapper/gradle-wrapper.propertiesdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/android/settings.gradle b/frontend/appflowy_flutter/packages/appflowy_editor/example/android/settings.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/android/settings.gradlerename to frontend/appflowy_flutter/packages/appflowy_editor/example/android/settings.gradlediff --git a/frontend/app_flowy/packages/appflowy_editor/example/assets/example.json b/frontend/appflowy_flutter/packages/appflowy_editor/example/assets/example.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/assets/example.jsonrename to frontend/appflowy_flutter/packages/appflowy_editor/example/assets/example.jsondiff --git a/frontend/app_flowy/packages/appflowy_editor/example/assets/images/icon.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/assets/images/icon.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/assets/images/icon.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/assets/images/icon.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/firebase.json b/frontend/appflowy_flutter/packages/appflowy_editor/example/firebase.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/firebase.jsonrename to frontend/appflowy_flutter/packages/appflowy_editor/example/firebase.jsondiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/.gitignore b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Flutter/AppFrameworkInfo.plist b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Flutter/AppFrameworkInfo.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Flutter/AppFrameworkInfo.plistrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Flutter/AppFrameworkInfo.plistdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Flutter/Debug.xcconfig b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Flutter/Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Flutter/Debug.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Flutter/Debug.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Flutter/Release.xcconfig b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Flutter/Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Flutter/Release.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Flutter/Release.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Podfile b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Podfilesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Podfilerename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Podfilediff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.pbxprojsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.pbxprojrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.pbxprojdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemerename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemediff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/AppDelegate.swift b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/AppDelegate.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/AppDelegate.swiftrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/AppDelegate.swiftdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsondiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsondiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mdrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mddiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Base.lproj/LaunchScreen.storyboardsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Base.lproj/LaunchScreen.storyboardrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Base.lproj/LaunchScreen.storyboarddiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Base.lproj/Main.storyboard b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Base.lproj/Main.storyboardsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Base.lproj/Main.storyboardrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Base.lproj/Main.storyboarddiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Info.plist b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Info.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Info.plistrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Info.plistdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Runner-Bridging-Header.h b/frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Runner-Bridging-Header.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/ios/Runner/Runner-Bridging-Header.hrename to frontend/appflowy_flutter/packages/appflowy_editor/example/ios/Runner/Runner-Bridging-Header.hdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/expandable_floating_action_button.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/expandable_floating_action_button.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/expandable_floating_action_button.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/expandable_floating_action_button.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/home_page.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/home_page.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/home_page.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/home_page.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/main.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/main.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/main.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/main.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/pages/simple_editor.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/pages/simple_editor.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/pages/simple_editor.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/pages/simple_editor.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/AI/auto_completion.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/AI/auto_completion.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/AI/auto_completion.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/AI/auto_completion.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/AI/continue_to_write.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/AI/continue_to_write.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/AI/continue_to_write.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/AI/continue_to_write.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/AI/gpt3.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/AI/gpt3.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/AI/gpt3.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/AI/gpt3.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/AI/smart_edit.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/AI/smart_edit.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/AI/smart_edit.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/AI/smart_edit.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/AI/text_robot.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/AI/text_robot.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/AI/text_robot.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/AI/text_robot.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/editor_theme.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/editor_theme.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/editor_theme.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/editor_theme.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/network_image_node_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/network_image_node_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/network_image_node_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/lib/plugin/network_image_node_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/linux/.gitignore b/frontend/appflowy_flutter/packages/appflowy_editor/example/linux/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/linux/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_editor/example/linux/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_editor/example/linux/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_editor/example/linux/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/linux/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_editor/example/linux/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/linux/flutter/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_editor/example/linux/flutter/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/linux/flutter/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_editor/example/linux/flutter/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/linux/main.cc b/frontend/appflowy_flutter/packages/appflowy_editor/example/linux/main.ccsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/linux/main.ccrename to frontend/appflowy_flutter/packages/appflowy_editor/example/linux/main.ccdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/linux/my_application.cc b/frontend/appflowy_flutter/packages/appflowy_editor/example/linux/my_application.ccsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/linux/my_application.ccrename to frontend/appflowy_flutter/packages/appflowy_editor/example/linux/my_application.ccdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/linux/my_application.h b/frontend/appflowy_flutter/packages/appflowy_editor/example/linux/my_application.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/linux/my_application.hrename to frontend/appflowy_flutter/packages/appflowy_editor/example/linux/my_application.hdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/.gitignore b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Flutter/Flutter-Debug.xcconfig b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Flutter/Flutter-Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Flutter/Flutter-Debug.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Flutter/Flutter-Debug.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Flutter/Flutter-Release.xcconfig b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Flutter/Flutter-Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Flutter/Flutter-Release.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Flutter/Flutter-Release.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Podfile b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Podfilesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Podfilerename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Podfilediff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Podfile.lock b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Podfile.locksimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Podfile.lockrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Podfile.lockdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner.xcodeproj/project.pbxprojsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner.xcodeproj/project.pbxprojrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner.xcodeproj/project.pbxprojdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemerename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemediff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/AppDelegate.swift b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/AppDelegate.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/AppDelegate.swiftrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/AppDelegate.swiftdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsondiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Base.lproj/MainMenu.xib b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Base.lproj/MainMenu.xibsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Base.lproj/MainMenu.xibrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Base.lproj/MainMenu.xibdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Configs/AppInfo.xcconfig b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Configs/AppInfo.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Configs/AppInfo.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Configs/AppInfo.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Configs/Debug.xcconfig b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Configs/Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Configs/Debug.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Configs/Debug.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Configs/Release.xcconfig b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Configs/Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Configs/Release.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Configs/Release.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Configs/Warnings.xcconfig b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Configs/Warnings.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Configs/Warnings.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Configs/Warnings.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/DebugProfile.entitlements b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/DebugProfile.entitlementssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/DebugProfile.entitlementsrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/DebugProfile.entitlementsdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Info.plist b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Info.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Info.plistrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Info.plistdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/MainFlutterWindow.swift b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/MainFlutterWindow.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/MainFlutterWindow.swiftrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/MainFlutterWindow.swiftdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Release.entitlements b/frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Release.entitlementssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/macos/Runner/Release.entitlementsrename to frontend/appflowy_flutter/packages/appflowy_editor/example/macos/Runner/Release.entitlementsdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/pubspec.yaml b/frontend/appflowy_flutter/packages/appflowy_editor/example/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/pubspec.yamlrename to frontend/appflowy_flutter/packages/appflowy_editor/example/pubspec.yamldiff --git a/frontend/app_flowy/packages/appflowy_editor/example/test/widget_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/example/test/widget_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/test/widget_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/example/test/widget_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/web/favicon.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/web/favicon.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/web/favicon.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/web/favicon.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/web/icons/Icon-192.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/web/icons/Icon-192.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/web/icons/Icon-192.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/web/icons/Icon-192.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/web/icons/Icon-512.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/web/icons/Icon-512.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/web/icons/Icon-512.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/web/icons/Icon-512.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/web/icons/Icon-maskable-192.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/web/icons/Icon-maskable-192.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/web/icons/Icon-maskable-192.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/web/icons/Icon-maskable-192.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/web/icons/Icon-maskable-512.png b/frontend/appflowy_flutter/packages/appflowy_editor/example/web/icons/Icon-maskable-512.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/web/icons/Icon-maskable-512.pngrename to frontend/appflowy_flutter/packages/appflowy_editor/example/web/icons/Icon-maskable-512.pngdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/web/index.html b/frontend/appflowy_flutter/packages/appflowy_editor/example/web/index.htmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/web/index.htmlrename to frontend/appflowy_flutter/packages/appflowy_editor/example/web/index.htmldiff --git a/frontend/app_flowy/packages/appflowy_editor/example/web/manifest.json b/frontend/appflowy_flutter/packages/appflowy_editor/example/web/manifest.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/web/manifest.jsonrename to frontend/appflowy_flutter/packages/appflowy_editor/example/web/manifest.jsondiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/.gitignore b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/flutter/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/flutter/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/flutter/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/flutter/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/Runner.rc b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/Runner.rcsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/Runner.rcrename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/Runner.rcdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/flutter_window.cpp b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/flutter_window.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/flutter_window.cpprename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/flutter_window.cppdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/flutter_window.h b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/flutter_window.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/flutter_window.hrename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/flutter_window.hdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/main.cpp b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/main.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/main.cpprename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/main.cppdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/resource.h b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/resource.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/resource.hrename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/resource.hdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/resources/app_icon.ico b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/resources/app_icon.icosimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/resources/app_icon.icorename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/resources/app_icon.icodiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/runner.exe.manifest b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/runner.exe.manifestsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/runner.exe.manifestrename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/runner.exe.manifestdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/utils.cpp b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/utils.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/utils.cpprename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/utils.cppdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/utils.h b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/utils.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/utils.hrename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/utils.hdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/win32_window.cpp b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/win32_window.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/win32_window.cpprename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/win32_window.cppdiff --git a/frontend/app_flowy/packages/appflowy_editor/example/windows/runner/win32_window.h b/frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/win32_window.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/example/windows/runner/win32_window.hrename to frontend/appflowy_flutter/packages/appflowy_editor/example/windows/runner/win32_window.hdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/appflowy_editor.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/appflowy_editor.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/appflowy_editor.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/appflowy_editor.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_bn_BN.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_bn_BN.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_bn_BN.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_bn_BN.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_ca.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_ca.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_ca.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_ca.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_cs_CZ.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_cs_CZ.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_cs_CZ.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_cs_CZ.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_de_DE.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_de_DE.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_de_DE.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_de_DE.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_en.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_en.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_en.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_en.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_es_VE.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_es_VE.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_es_VE.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_es_VE.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_fr_CA.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_fr_CA.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_fr_CA.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_fr_CA.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_fr_FR.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_fr_FR.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_fr_FR.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_fr_FR.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_hi_IN.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_hi_IN.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_hi_IN.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_hi_IN.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_hu_HU.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_hu_HU.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_hu_HU.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_hu_HU.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_id_ID.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_id_ID.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_id_ID.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_id_ID.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_it_IT.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_it_IT.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_it_IT.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_it_IT.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_ja_JP.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_ja_JP.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_ja_JP.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_ja_JP.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_ml_IN.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_ml_IN.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_ml_IN.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_ml_IN.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_nl_NL.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_nl_NL.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_nl_NL.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_nl_NL.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_pl_PL.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_pl_PL.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_pl_PL.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_pl_PL.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_pt_BR.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_pt_BR.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_pt_BR.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_pt_BR.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_pt_PT.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_pt_PT.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_pt_PT.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_pt_PT.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_ru_RU.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_ru_RU.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_ru_RU.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_ru_RU.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_tr_TR.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_tr_TR.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_tr_TR.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_tr_TR.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_zh_CN.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_zh_CN.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_zh_CN.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_zh_CN.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_zh_TW.arb b/frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_zh_TW.arbsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/l10n/intl_zh_TW.arbrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/l10n/intl_zh_TW.arbdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/commands/attributes_commands.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/commands/attributes_commands.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/commands/attributes_commands.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/commands/attributes_commands.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/commands/command_extension.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/commands/command_extension.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/commands/command_extension.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/commands/command_extension.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/commands/text/text_commands.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/commands/text/text_commands.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/commands/text/text_commands.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/commands/text/text_commands.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/attributes.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/attributes.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/attributes.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/attributes.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/document.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/document.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/document.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/document.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/node.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/node.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/node.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/node.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/node_iterator.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/node_iterator.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/node_iterator.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/node_iterator.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/path.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/path.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/path.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/path.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/text_delta.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/text_delta.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/document/text_delta.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/document/text_delta.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/legacy/built_in_attribute_keys.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/legacy/built_in_attribute_keys.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/legacy/built_in_attribute_keys.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/legacy/built_in_attribute_keys.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/location/position.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/location/position.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/location/position.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/location/position.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/location/selection.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/location/selection.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/location/selection.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/location/selection.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/transform/operation.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/transform/operation.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/transform/operation.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/transform/operation.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/core/transform/transaction.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/transform/transaction.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/core/transform/transaction.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/core/transform/transaction.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/editor_state.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/editor_state.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/editor_state.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/editor_state.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/attributes_extension.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/attributes_extension.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/attributes_extension.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/attributes_extension.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/color_extension.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/color_extension.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/color_extension.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/color_extension.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/editor_state_extensions.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/editor_state_extensions.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/editor_state_extensions.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/editor_state_extensions.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/node_extensions.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/node_extensions.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/node_extensions.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/node_extensions.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/object_extensions.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/object_extensions.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/object_extensions.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/object_extensions.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/text_node_extensions.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/text_node_extensions.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/text_node_extensions.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/text_node_extensions.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/text_style_extension.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/text_style_extension.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/text_style_extension.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/text_style_extension.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/theme_extension.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/theme_extension.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/theme_extension.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/theme_extension.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/url_launcher_extension.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/url_launcher_extension.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/url_launcher_extension.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/extensions/url_launcher_extension.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/flutter/overlay.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/flutter/overlay.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/flutter/overlay.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/flutter/overlay.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/history/undo_manager.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/history/undo_manager.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/history/undo_manager.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/history/undo_manager.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/infra/clipboard.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/infra/clipboard.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/infra/clipboard.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/infra/clipboard.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/infra/flowy_svg.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/infra/flowy_svg.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/infra/flowy_svg.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/infra/flowy_svg.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/infra/html_converter.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/infra/html_converter.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/infra/html_converter.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/infra/html_converter.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/infra/infra.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/infra/infra.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/infra/infra.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/infra/infra.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/infra/log.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/infra/log.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/infra/log.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/infra/log.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_all.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_all.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_all.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_all.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_bn_BN.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_bn_BN.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_bn_BN.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_bn_BN.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_ca.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_ca.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_ca.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_ca.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_cs-CZ.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_cs-CZ.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_cs-CZ.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_cs-CZ.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_de-DE.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_de-DE.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_de-DE.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_de-DE.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_en.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_en.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_en.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_en.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_es-VE.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_es-VE.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_es-VE.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_es-VE.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_fr-CA.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_fr-CA.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_fr-CA.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_fr-CA.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_fr-FR.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_fr-FR.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_fr-FR.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_fr-FR.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_hi-IN.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_hi-IN.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_hi-IN.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_hi-IN.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_hu-HU.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_hu-HU.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_hu-HU.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_hu-HU.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_id-ID.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_id-ID.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_id-ID.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_id-ID.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_it-IT.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_it-IT.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_it-IT.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_it-IT.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_ja-JP.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_ja-JP.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_ja-JP.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_ja-JP.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_ml_IN.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_ml_IN.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_ml_IN.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_ml_IN.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_nl-NL.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_nl-NL.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_nl-NL.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_nl-NL.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_pl-PL.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_pl-PL.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_pl-PL.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_pl-PL.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_pt-BR.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_pt-BR.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_pt-BR.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_pt-BR.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_pt-PT.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_pt-PT.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_pt-PT.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_pt-PT.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_ru-RU.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_ru-RU.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_ru-RU.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_ru-RU.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_tr-TR.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_tr-TR.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_tr-TR.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_tr-TR.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_zh-CN.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_zh-CN.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_zh-CN.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_zh-CN.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_zh-TW.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_zh-TW.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/intl/messages_zh-TW.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/intl/messages_zh-TW.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/l10n.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/l10n.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/l10n/l10n.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/l10n/l10n.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/decoder/delta_markdown_decoder.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/decoder/delta_markdown_decoder.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/decoder/delta_markdown_decoder.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/decoder/delta_markdown_decoder.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/decoder/document_markdown_decoder.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/decoder/document_markdown_decoder.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/decoder/document_markdown_decoder.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/decoder/document_markdown_decoder.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/document_markdown.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/document_markdown.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/document_markdown.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/document_markdown.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/encoder/delta_markdown_encoder.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/encoder/delta_markdown_encoder.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/encoder/delta_markdown_encoder.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/encoder/delta_markdown_encoder.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/encoder/document_markdown_encoder.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/encoder/document_markdown_encoder.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/encoder/document_markdown_encoder.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/encoder/document_markdown_encoder.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/image_node_parser.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/image_node_parser.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/image_node_parser.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/image_node_parser.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/node_parser.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/node_parser.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/node_parser.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/node_parser.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/text_node_parser.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/text_node_parser.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/text_node_parser.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/markdown/encoder/parser/text_node_parser.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/quill_delta/delta_document_encoder.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/quill_delta/delta_document_encoder.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/plugins/quill_delta/delta_document_encoder.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/plugins/quill_delta/delta_document_encoder.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/action_menu/action_menu.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/action_menu/action_menu.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/action_menu/action_menu.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/action_menu/action_menu.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/action_menu/action_menu_item.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/action_menu/action_menu_item.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/action_menu/action_menu_item.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/action_menu/action_menu_item.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/color_menu/color_picker.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/color_menu/color_picker.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/color_menu/color_picker.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/color_menu/color_picker.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/editor/editor_entry.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/editor/editor_entry.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/editor/editor_entry.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/editor/editor_entry.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_node_builder.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/image/image_node_builder.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_node_builder.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/image/image_node_builder.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_node_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/image/image_node_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_node_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/image/image_node_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_upload_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/image/image_upload_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_upload_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/image/image_upload_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/link_menu/link_menu.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/link_menu/link_menu.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/link_menu/link_menu.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/link_menu/link_menu.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/built_in_text_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/built_in_text_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/built_in_text_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/built_in_text_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/bulleted_list_text.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/bulleted_list_text.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/bulleted_list_text.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/bulleted_list_text.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/checkbox_text.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/checkbox_text.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/checkbox_text.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/checkbox_text.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/default_selectable.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/default_selectable.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/default_selectable.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/default_selectable.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/flowy_rich_text.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/flowy_rich_text.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/flowy_rich_text.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/flowy_rich_text.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/heading_text.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/heading_text.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/heading_text.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/heading_text.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/number_list_text.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/number_list_text.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/number_list_text.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/number_list_text.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/quoted_text.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/quoted_text.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/quoted_text.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/quoted_text.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/rich_text.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/rich_text.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/rich_text.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/rich_text/rich_text.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection/cursor_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection/cursor_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection/cursor_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection/cursor_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection/selectable.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection/selectable.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection/selectable.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection/selectable.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection/selection_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection/selection_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection/selection_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection/selection_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_item_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_item_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_item_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_item_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_service.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_service.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_service.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_service.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/style/editor_style.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/style/editor_style.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/style/editor_style.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/style/editor_style.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/style/plugin_styles.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/style/plugin_styles.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/style/plugin_styles.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/style/plugin_styles.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/toolbar/toolbar_item.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/toolbar/toolbar_item.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/toolbar/toolbar_item.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/toolbar/toolbar_item.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/toolbar/toolbar_item_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/toolbar/toolbar_item_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/toolbar/toolbar_item_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/toolbar/toolbar_item_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/toolbar/toolbar_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/toolbar/toolbar_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/render/toolbar/toolbar_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/render/toolbar/toolbar_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/context_menu/built_in_context_menu_item.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/context_menu/built_in_context_menu_item.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/context_menu/built_in_context_menu_item.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/context_menu/built_in_context_menu_item.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/context_menu/context_menu.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/context_menu/context_menu.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/context_menu/context_menu.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/context_menu/context_menu.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/default_text_operations/format_rich_text_style.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/default_text_operations/format_rich_text_style.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/default_text_operations/format_rich_text_style.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/default_text_operations/format_rich_text_style.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/editor_service.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/editor_service.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/editor_service.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/editor_service.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/input_service.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/input_service.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/input_service.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/input_service.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/arrow_keys_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/arrow_keys_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/arrow_keys_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/arrow_keys_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/backspace_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/backspace_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/backspace_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/backspace_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/checkbox_event_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/checkbox_event_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/checkbox_event_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/checkbox_event_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/copy_paste_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/copy_paste_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/copy_paste_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/copy_paste_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/exit_editing_mode_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/exit_editing_mode_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/exit_editing_mode_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/exit_editing_mode_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/format_style_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/format_style_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/format_style_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/format_style_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/markdown_syntax_to_styled_text.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/markdown_syntax_to_styled_text.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/markdown_syntax_to_styled_text.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/markdown_syntax_to_styled_text.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/number_list_helper.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/number_list_helper.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/number_list_helper.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/number_list_helper.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/page_up_down_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/page_up_down_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/page_up_down_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/page_up_down_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/redo_undo_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/redo_undo_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/redo_undo_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/redo_undo_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/select_all_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/select_all_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/select_all_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/select_all_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/slash_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/slash_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/slash_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/slash_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/space_on_web_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/space_on_web_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/space_on_web_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/space_on_web_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/tab_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/tab_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/tab_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/tab_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/whitespace_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/whitespace_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/whitespace_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/internal_key_event_handlers/whitespace_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/keyboard_service.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/keyboard_service.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/keyboard_service.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/keyboard_service.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/render_plugin_service.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/render_plugin_service.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/render_plugin_service.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/render_plugin_service.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/scroll_service.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/scroll_service.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/scroll_service.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/scroll_service.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/selection/selection_gesture.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/selection/selection_gesture.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/selection/selection_gesture.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/selection/selection_gesture.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/selection_service.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/selection_service.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/selection_service.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/selection_service.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/service.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/service.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/service.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/service.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/shortcut_event/built_in_shortcut_events.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/shortcut_event/built_in_shortcut_events.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/shortcut_event/built_in_shortcut_events.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/shortcut_event/built_in_shortcut_events.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/shortcut_event/key_mapping.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/shortcut_event/key_mapping.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/shortcut_event/key_mapping.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/shortcut_event/key_mapping.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/shortcut_event/keybinding.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/shortcut_event/keybinding.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/shortcut_event/keybinding.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/shortcut_event/keybinding.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/shortcut_event/shortcut_event.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/shortcut_event/shortcut_event.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/shortcut_event/shortcut_event.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/shortcut_event/shortcut_event.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/shortcut_event/shortcut_event_handler.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/shortcut_event/shortcut_event_handler.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/shortcut_event/shortcut_event_handler.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/shortcut_event/shortcut_event_handler.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/service/toolbar_service.dart b/frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/toolbar_service.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/lib/src/service/toolbar_service.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/lib/src/service/toolbar_service.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/pubspec.yaml b/frontend/appflowy_flutter/packages/appflowy_editor/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/pubspec.yamlrename to frontend/appflowy_flutter/packages/appflowy_editor/pubspec.yamldiff --git a/frontend/app_flowy/packages/appflowy_editor/test/core/document/attributes_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/attributes_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/core/document/attributes_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/attributes_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/core/document/document_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/document_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/core/document/document_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/document_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/core/document/node_iterator_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/node_iterator_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/core/document/node_iterator_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/node_iterator_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/core/document/node_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/node_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/core/document/node_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/node_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/core/document/path_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/path_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/core/document/path_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/path_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/core/document/text_delta_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/text_delta_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/core/document/text_delta_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/core/document/text_delta_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/core/location/position_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/core/location/position_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/core/location/position_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/core/location/position_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/core/location/selection_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/core/location/selection_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/core/location/selection_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/core/location/selection_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/core/transform/operation_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/core/transform/operation_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/core/transform/operation_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/core/transform/operation_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/extensions/attributes_extension_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/attributes_extension_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/extensions/attributes_extension_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/attributes_extension_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/extensions/color_extension_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/color_extension_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/extensions/color_extension_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/color_extension_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/extensions/node_extension_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/node_extension_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/extensions/node_extension_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/node_extension_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/extensions/object_extension_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/object_extension_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/extensions/object_extension_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/object_extension_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/extensions/path_extensions_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/path_extensions_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/extensions/path_extensions_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/path_extensions_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/extensions/text_node_extensions_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/text_node_extensions_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/extensions/text_node_extensions_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/text_node_extensions_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/extensions/text_style_extension_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/text_style_extension_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/extensions/text_style_extension_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/text_style_extension_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/extensions/url_launcher_extension_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/url_launcher_extension_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/extensions/url_launcher_extension_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/extensions/url_launcher_extension_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/infra/infra_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/infra/infra_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/infra/infra_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/infra/infra_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/infra/log_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/infra/log_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/infra/log_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/infra/log_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/infra/test_editor.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/infra/test_editor.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/infra/test_editor.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/infra/test_editor.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/infra/test_raw_key_event.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/infra/test_raw_key_event.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/infra/test_raw_key_event.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/infra/test_raw_key_event.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/l10n/l10n_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/l10n/l10n_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/l10n/l10n_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/l10n/l10n_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/legacy/flowy_editor_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/legacy/flowy_editor_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/legacy/flowy_editor_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/legacy/flowy_editor_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/legacy/operation_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/legacy/operation_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/legacy/operation_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/legacy/operation_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/legacy/undo_manager_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/legacy/undo_manager_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/legacy/undo_manager_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/legacy/undo_manager_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/decoder/delta_markdown_decoder_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/decoder/delta_markdown_decoder_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/decoder/delta_markdown_decoder_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/decoder/delta_markdown_decoder_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/decoder/document_markdown_decoder_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/decoder/document_markdown_decoder_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/decoder/document_markdown_decoder_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/decoder/document_markdown_decoder_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/encoder/delta_markdown_encoder_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/encoder/delta_markdown_encoder_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/encoder/delta_markdown_encoder_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/encoder/delta_markdown_encoder_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/encoder/document_markdown_encoder_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/encoder/document_markdown_encoder_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/encoder/document_markdown_encoder_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/encoder/document_markdown_encoder_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/encoder/parser/image_node_parser_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/encoder/parser/image_node_parser_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/encoder/parser/image_node_parser_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/encoder/parser/image_node_parser_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/encoder/parser/text_node_parser_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/encoder/parser/text_node_parser_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/plugins/markdown/encoder/parser/text_node_parser_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/markdown/encoder/parser/text_node_parser_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/plugins/quill_delta/delta_document_encoder_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/quill_delta/delta_document_encoder_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/plugins/quill_delta/delta_document_encoder_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/plugins/quill_delta/delta_document_encoder_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/render/action_menu/action_menu_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/render/action_menu/action_menu_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/render/action_menu/action_menu_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/render/action_menu/action_menu_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/render/image/image_node_builder_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/render/image/image_node_builder_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/render/image/image_node_builder_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/render/image/image_node_builder_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/render/image/image_node_widget_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/render/image/image_node_widget_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/render/image/image_node_widget_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/render/image/image_node_widget_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/render/link_menu/link_menu_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/render/link_menu/link_menu_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/render/link_menu/link_menu_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/render/link_menu/link_menu_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/render/rich_text/checkbox_text_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/render/rich_text/checkbox_text_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/render/rich_text/checkbox_text_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/render/rich_text/checkbox_text_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/render/rich_text/toolbar_rich_text_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/render/rich_text/toolbar_rich_text_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/render/rich_text/toolbar_rich_text_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/render/rich_text/toolbar_rich_text_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/render/selection_menu/selection_menu_widget_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/render/selection_menu/selection_menu_widget_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/render/selection_menu/selection_menu_widget_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/render/selection_menu/selection_menu_widget_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/render/toolbar/toolbar_item_widget_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/render/toolbar/toolbar_item_widget_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/render/toolbar/toolbar_item_widget_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/render/toolbar/toolbar_item_widget_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/render/toolbar/toolbar_widget_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/render/toolbar/toolbar_widget_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/render/toolbar/toolbar_widget_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/render/toolbar/toolbar_widget_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/default_text_operations/format_rich_text_style_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/default_text_operations/format_rich_text_style_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/default_text_operations/format_rich_text_style_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/default_text_operations/format_rich_text_style_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/arrow_keys_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/arrow_keys_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/arrow_keys_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/arrow_keys_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/backspace_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/backspace_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/backspace_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/backspace_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/checkbox_event_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/checkbox_event_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/checkbox_event_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/checkbox_event_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/enter_without_shift_in_text_node_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/exit_editing_mode_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/exit_editing_mode_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/exit_editing_mode_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/exit_editing_mode_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/format_style_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/format_style_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/format_style_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/format_style_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/markdown_syntax_to_styled_text_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/markdown_syntax_to_styled_text_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/markdown_syntax_to_styled_text_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/markdown_syntax_to_styled_text_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/markdown_syntax_to_styled_text_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/markdown_syntax_to_styled_text_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/markdown_syntax_to_styled_text_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/markdown_syntax_to_styled_text_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/page_up_down_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/page_up_down_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/page_up_down_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/page_up_down_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/redo_undo_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/redo_undo_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/redo_undo_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/redo_undo_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/select_all_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/select_all_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/select_all_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/select_all_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/slash_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/slash_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/slash_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/slash_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/space_on_web_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/space_on_web_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/space_on_web_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/space_on_web_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/tab_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/tab_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/tab_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/tab_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/white_space_handler_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/white_space_handler_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/internal_key_event_handlers/white_space_handler_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/internal_key_event_handlers/white_space_handler_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/scroll_service_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/scroll_service_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/scroll_service_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/scroll_service_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/selection_service_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/selection_service_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/selection_service_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/selection_service_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/shortcut_event/keybinding_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/shortcut_event/keybinding_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/shortcut_event/keybinding_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/shortcut_event/keybinding_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/shortcut_event/shortcut_event_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/shortcut_event/shortcut_event_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/shortcut_event/shortcut_event_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/shortcut_event/shortcut_event_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor/test/service/toolbar_service_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor/test/service/toolbar_service_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor/test/service/toolbar_service_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor/test/service/toolbar_service_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/.gitignore b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/.metadata b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/.metadatarename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/.metadatadiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/CHANGELOG.md b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/CHANGELOG.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/CHANGELOG.mdrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/CHANGELOG.mddiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/LICENSE b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/LICENSEsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/LICENSErename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/LICENSEdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/README.md b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/README.mdrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/README.mddiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/analysis_options.yaml b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/analysis_options.yamlrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/analysis_options.yamldiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/assets/images/delete.svg b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/assets/images/delete.svgsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/assets/images/delete.svgrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/assets/images/delete.svgdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/appflowy_editor_plugins.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/appflowy_editor_plugins.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/appflowy_editor_plugins.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/appflowy_editor_plugins.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/callout/callout_node_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/callout/callout_node_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/callout/callout_node_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/callout/callout_node_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/code_block/code_block_node_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/code_block/code_block_node_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/code_block/code_block_node_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/code_block/code_block_node_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/code_block/code_block_shortcut_event.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/code_block/code_block_shortcut_event.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/code_block/code_block_shortcut_event.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/code_block/code_block_shortcut_event.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/divider/divider_node_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/divider/divider_node_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/divider/divider_node_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/divider/divider_node_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/divider/divider_shortcut_event.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/divider/divider_shortcut_event.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/divider/divider_shortcut_event.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/divider/divider_shortcut_event.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/emoji_menu_item.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/emoji_menu_item.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/emoji_menu_item.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/emoji_menu_item.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/emoji_picker.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/emoji_picker.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/emoji_picker.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/emoji_picker.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/config.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/config.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/config.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/config.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/default_emoji_picker_view.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/default_emoji_picker_view.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/default_emoji_picker_view.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/default_emoji_picker_view.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_lists.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_lists.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_lists.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_lists.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_picker.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_picker.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_picker.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_picker.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_picker_builder.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_picker_builder.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_picker_builder.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_picker_builder.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_view_state.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_view_state.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_view_state.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/emoji_view_state.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/category_models.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/category_models.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/category_models.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/category_models.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/emoji_model.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/emoji_model.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/emoji_model.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/emoji_model.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/recent_emoji_model.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/recent_emoji_model.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/recent_emoji_model.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/emoji_picker/src/models/recent_emoji_model.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/extensions/theme_extension.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/extensions/theme_extension.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/extensions/theme_extension.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/extensions/theme_extension.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/infra/svg.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/infra/svg.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/infra/svg.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/infra/svg.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/math_ equation/math_equation_node_widget.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/math_ equation/math_equation_node_widget.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/lib/src/math_ equation/math_equation_node_widget.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/lib/src/math_ equation/math_equation_node_widget.dartdiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/pubspec.yaml b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/pubspec.yamlrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/pubspec.yamldiff --git a/frontend/app_flowy/packages/appflowy_editor_plugins/test/appflowy_editor_plugins_test.dart b/frontend/appflowy_flutter/packages/appflowy_editor_plugins/test/appflowy_editor_plugins_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_editor_plugins/test/appflowy_editor_plugins_test.dartrename to frontend/appflowy_flutter/packages/appflowy_editor_plugins/test/appflowy_editor_plugins_test.dartdiff --git a/frontend/app_flowy/packages/appflowy_popover/.gitignore b/frontend/appflowy_flutter/packages/appflowy_popover/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_popover/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_popover/.metadata b/frontend/appflowy_flutter/packages/appflowy_popover/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/.metadatarename to frontend/appflowy_flutter/packages/appflowy_popover/.metadatadiff --git a/frontend/app_flowy/packages/appflowy_popover/CHANGELOG.md b/frontend/appflowy_flutter/packages/appflowy_popover/CHANGELOG.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/CHANGELOG.mdrename to frontend/appflowy_flutter/packages/appflowy_popover/CHANGELOG.mddiff --git a/frontend/app_flowy/packages/appflowy_popover/LICENSE b/frontend/appflowy_flutter/packages/appflowy_popover/LICENSEsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/LICENSErename to frontend/appflowy_flutter/packages/appflowy_popover/LICENSEdiff --git a/frontend/app_flowy/packages/appflowy_popover/README.md b/frontend/appflowy_flutter/packages/appflowy_popover/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/README.mdrename to frontend/appflowy_flutter/packages/appflowy_popover/README.mddiff --git a/frontend/app_flowy/packages/appflowy_popover/analysis_options.yaml b/frontend/appflowy_flutter/packages/appflowy_popover/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/analysis_options.yamlrename to frontend/appflowy_flutter/packages/appflowy_popover/analysis_options.yamldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/.gitignore b/frontend/appflowy_flutter/packages/appflowy_popover/example/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_popover/example/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_popover/example/.metadata b/frontend/appflowy_flutter/packages/appflowy_popover/example/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/.metadatarename to frontend/appflowy_flutter/packages/appflowy_popover/example/.metadatadiff --git a/frontend/app_flowy/packages/appflowy_popover/example/README.md b/frontend/appflowy_flutter/packages/appflowy_popover/example/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/README.mdrename to frontend/appflowy_flutter/packages/appflowy_popover/example/README.mddiff --git a/frontend/app_flowy/packages/appflowy_popover/example/analysis_options.yaml b/frontend/appflowy_flutter/packages/appflowy_popover/example/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/analysis_options.yamlrename to frontend/appflowy_flutter/packages/appflowy_popover/example/analysis_options.yamldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/.gitignore b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/build.gradle b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/build.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/build.gradlerename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/build.gradlediff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/debug/AndroidManifest.xml b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/debug/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/debug/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/debug/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/AndroidManifest.xml b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/kotlin/com/example/example/MainActivity.ktsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/kotlin/com/example/example/MainActivity.ktrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/kotlin/com/example/example/MainActivity.ktdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/drawable-v21/launch_background.xml b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/drawable-v21/launch_background.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/drawable-v21/launch_background.xmlrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/drawable-v21/launch_background.xmldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/drawable/launch_background.xml b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/drawable/launch_background.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/drawable/launch_background.xmlrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/drawable/launch_background.xmldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/values-night/styles.xml b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/values-night/styles.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/values-night/styles.xmlrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/values-night/styles.xmldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/values/styles.xml b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/values/styles.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/main/res/values/styles.xmlrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/main/res/values/styles.xmldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/app/src/profile/AndroidManifest.xml b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/profile/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/app/src/profile/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/app/src/profile/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/build.gradle b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/build.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/build.gradlerename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/build.gradlediff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/gradle.properties b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/gradle.propertiessimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/gradle.propertiesrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/gradle.propertiesdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/gradle/wrapper/gradle-wrapper.properties b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/gradle/wrapper/gradle-wrapper.propertiessimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/gradle/wrapper/gradle-wrapper.propertiesrename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/gradle/wrapper/gradle-wrapper.propertiesdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/android/settings.gradle b/frontend/appflowy_flutter/packages/appflowy_popover/example/android/settings.gradlesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/android/settings.gradlerename to frontend/appflowy_flutter/packages/appflowy_popover/example/android/settings.gradlediff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/.gitignore b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Flutter/AppFrameworkInfo.plist b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Flutter/AppFrameworkInfo.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Flutter/AppFrameworkInfo.plistrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Flutter/AppFrameworkInfo.plistdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Flutter/Debug.xcconfig b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Flutter/Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Flutter/Debug.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Flutter/Debug.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Flutter/Release.xcconfig b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Flutter/Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Flutter/Release.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Flutter/Release.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.pbxprojsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.pbxprojrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.pbxprojdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemerename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemediff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/AppDelegate.swift b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/AppDelegate.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/AppDelegate.swiftrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/AppDelegate.swiftdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsondiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsondiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]rename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]diff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mdrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mddiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Base.lproj/LaunchScreen.storyboardsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Base.lproj/LaunchScreen.storyboardrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Base.lproj/LaunchScreen.storyboarddiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Base.lproj/Main.storyboard b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Base.lproj/Main.storyboardsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Base.lproj/Main.storyboardrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Base.lproj/Main.storyboarddiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Info.plist b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Info.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Info.plistrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Info.plistdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Runner-Bridging-Header.h b/frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Runner-Bridging-Header.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/ios/Runner/Runner-Bridging-Header.hrename to frontend/appflowy_flutter/packages/appflowy_popover/example/ios/Runner/Runner-Bridging-Header.hdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/lib/example_button.dart b/frontend/appflowy_flutter/packages/appflowy_popover/example/lib/example_button.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/lib/example_button.dartrename to frontend/appflowy_flutter/packages/appflowy_popover/example/lib/example_button.dartdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/lib/main.dart b/frontend/appflowy_flutter/packages/appflowy_popover/example/lib/main.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/lib/main.dartrename to frontend/appflowy_flutter/packages/appflowy_popover/example/lib/main.dartdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/linux/.gitignore b/frontend/appflowy_flutter/packages/appflowy_popover/example/linux/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/linux/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_popover/example/linux/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_popover/example/linux/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_popover/example/linux/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/linux/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_popover/example/linux/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/linux/flutter/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_popover/example/linux/flutter/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/linux/flutter/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_popover/example/linux/flutter/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/linux/main.cc b/frontend/appflowy_flutter/packages/appflowy_popover/example/linux/main.ccsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/linux/main.ccrename to frontend/appflowy_flutter/packages/appflowy_popover/example/linux/main.ccdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/linux/my_application.cc b/frontend/appflowy_flutter/packages/appflowy_popover/example/linux/my_application.ccsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/linux/my_application.ccrename to frontend/appflowy_flutter/packages/appflowy_popover/example/linux/my_application.ccdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/linux/my_application.h b/frontend/appflowy_flutter/packages/appflowy_popover/example/linux/my_application.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/linux/my_application.hrename to frontend/appflowy_flutter/packages/appflowy_popover/example/linux/my_application.hdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/.gitignore b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Flutter/Flutter-Debug.xcconfig b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Flutter/Flutter-Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Flutter/Flutter-Debug.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Flutter/Flutter-Debug.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Flutter/Flutter-Release.xcconfig b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Flutter/Flutter-Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Flutter/Flutter-Release.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Flutter/Flutter-Release.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner.xcodeproj/project.pbxprojsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner.xcodeproj/project.pbxprojrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner.xcodeproj/project.pbxprojdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemesimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemerename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemediff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/AppDelegate.swift b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/AppDelegate.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/AppDelegate.swiftrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/AppDelegate.swiftdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsondiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Base.lproj/MainMenu.xib b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Base.lproj/MainMenu.xibsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Base.lproj/MainMenu.xibrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Base.lproj/MainMenu.xibdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Configs/AppInfo.xcconfig b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Configs/AppInfo.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Configs/AppInfo.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Configs/AppInfo.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Configs/Debug.xcconfig b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Configs/Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Configs/Debug.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Configs/Debug.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Configs/Release.xcconfig b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Configs/Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Configs/Release.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Configs/Release.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Configs/Warnings.xcconfig b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Configs/Warnings.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Configs/Warnings.xcconfigrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Configs/Warnings.xcconfigdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/DebugProfile.entitlements b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/DebugProfile.entitlementssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/DebugProfile.entitlementsrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/DebugProfile.entitlementsdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Info.plist b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Info.plistsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Info.plistrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Info.plistdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/MainFlutterWindow.swift b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/MainFlutterWindow.swiftsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/MainFlutterWindow.swiftrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/MainFlutterWindow.swiftdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Release.entitlements b/frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Release.entitlementssimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/macos/Runner/Release.entitlementsrename to frontend/appflowy_flutter/packages/appflowy_popover/example/macos/Runner/Release.entitlementsdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/pubspec.yaml b/frontend/appflowy_flutter/packages/appflowy_popover/example/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/pubspec.yamlrename to frontend/appflowy_flutter/packages/appflowy_popover/example/pubspec.yamldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/web/favicon.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/web/favicon.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/web/favicon.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/web/favicon.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/web/icons/Icon-192.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/web/icons/Icon-192.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/web/icons/Icon-192.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/web/icons/Icon-192.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/web/icons/Icon-512.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/web/icons/Icon-512.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/web/icons/Icon-512.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/web/icons/Icon-512.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/web/icons/Icon-maskable-192.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/web/icons/Icon-maskable-192.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/web/icons/Icon-maskable-192.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/web/icons/Icon-maskable-192.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/web/icons/Icon-maskable-512.png b/frontend/appflowy_flutter/packages/appflowy_popover/example/web/icons/Icon-maskable-512.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/web/icons/Icon-maskable-512.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/example/web/icons/Icon-maskable-512.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/web/index.html b/frontend/appflowy_flutter/packages/appflowy_popover/example/web/index.htmlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/web/index.htmlrename to frontend/appflowy_flutter/packages/appflowy_popover/example/web/index.htmldiff --git a/frontend/app_flowy/packages/appflowy_popover/example/web/manifest.json b/frontend/appflowy_flutter/packages/appflowy_popover/example/web/manifest.jsonsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/web/manifest.jsonrename to frontend/appflowy_flutter/packages/appflowy_popover/example/web/manifest.jsondiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/.gitignore b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/.gitignorerename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/.gitignorediff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/flutter/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/flutter/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/flutter/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/flutter/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/CMakeLists.txt b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/CMakeLists.txtrename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/Runner.rc b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/Runner.rcsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/Runner.rcrename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/Runner.rcdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/flutter_window.cpp b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/flutter_window.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/flutter_window.cpprename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/flutter_window.cppdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/flutter_window.h b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/flutter_window.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/flutter_window.hrename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/flutter_window.hdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/main.cpp b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/main.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/main.cpprename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/main.cppdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/resource.h b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/resource.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/resource.hrename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/resource.hdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/resources/app_icon.ico b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/resources/app_icon.icosimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/resources/app_icon.icorename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/resources/app_icon.icodiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/runner.exe.manifest b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/runner.exe.manifestsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/runner.exe.manifestrename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/runner.exe.manifestdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/utils.cpp b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/utils.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/utils.cpprename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/utils.cppdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/utils.h b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/utils.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/utils.hrename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/utils.hdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/win32_window.cpp b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/win32_window.cppsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/win32_window.cpprename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/win32_window.cppdiff --git a/frontend/app_flowy/packages/appflowy_popover/example/windows/runner/win32_window.h b/frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/win32_window.hsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/example/windows/runner/win32_window.hrename to frontend/appflowy_flutter/packages/appflowy_popover/example/windows/runner/win32_window.hdiff --git a/frontend/app_flowy/packages/appflowy_popover/lib/appflowy_popover.dart b/frontend/appflowy_flutter/packages/appflowy_popover/lib/appflowy_popover.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/lib/appflowy_popover.dartrename to frontend/appflowy_flutter/packages/appflowy_popover/lib/appflowy_popover.dartdiff --git a/frontend/app_flowy/packages/appflowy_popover/lib/src/follower.dart b/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/follower.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/lib/src/follower.dartrename to frontend/appflowy_flutter/packages/appflowy_popover/lib/src/follower.dartdiff --git a/frontend/app_flowy/packages/appflowy_popover/lib/src/layout.dart b/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/layout.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/lib/src/layout.dartrename to frontend/appflowy_flutter/packages/appflowy_popover/lib/src/layout.dartdiff --git a/frontend/app_flowy/packages/appflowy_popover/lib/src/mask.dart b/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/mask.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/lib/src/mask.dartrename to frontend/appflowy_flutter/packages/appflowy_popover/lib/src/mask.dartdiff --git a/frontend/app_flowy/packages/appflowy_popover/lib/src/mutex.dart b/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/mutex.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/lib/src/mutex.dartrename to frontend/appflowy_flutter/packages/appflowy_popover/lib/src/mutex.dartdiff --git a/frontend/app_flowy/packages/appflowy_popover/lib/src/popover.dart b/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/popover.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/lib/src/popover.dartrename to frontend/appflowy_flutter/packages/appflowy_popover/lib/src/popover.dartdiff --git a/frontend/app_flowy/packages/appflowy_popover/pubspec.yaml b/frontend/appflowy_flutter/packages/appflowy_popover/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/pubspec.yamlrename to frontend/appflowy_flutter/packages/appflowy_popover/pubspec.yamldiff --git a/frontend/app_flowy/packages/appflowy_popover/screenshot.png b/frontend/appflowy_flutter/packages/appflowy_popover/screenshot.pngsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/screenshot.pngrename to frontend/appflowy_flutter/packages/appflowy_popover/screenshot.pngdiff --git a/frontend/app_flowy/packages/appflowy_popover/test/popover_test.dart b/frontend/appflowy_flutter/packages/appflowy_popover/test/popover_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/appflowy_popover/test/popover_test.dartrename to frontend/appflowy_flutter/packages/appflowy_popover/test/popover_test.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra/.metadata b/frontend/appflowy_flutter/packages/flowy_infra/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/.metadatarename to frontend/appflowy_flutter/packages/flowy_infra/.metadatadiff --git a/frontend/app_flowy/packages/flowy_infra/LICENSE b/frontend/appflowy_flutter/packages/flowy_infra/LICENSEsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/LICENSErename to frontend/appflowy_flutter/packages/flowy_infra/LICENSEdiff --git a/frontend/app_flowy/packages/flowy_infra/analysis_options.yaml b/frontend/appflowy_flutter/packages/flowy_infra/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/analysis_options.yamlrename to frontend/appflowy_flutter/packages/flowy_infra/analysis_options.yamldiff --git a/frontend/app_flowy/packages/flowy_infra/lib/colorscheme/colorscheme.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/colorscheme.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/colorscheme/colorscheme.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/colorscheme.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/colorscheme/dandelion.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/colorscheme/dandelion.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/colorscheme/default_colorscheme.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/default_colorscheme.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/colorscheme/default_colorscheme.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/default_colorscheme.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/colorscheme/lavender.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/lavender.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/colorscheme/lavender.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/lavender.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/icon_data.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/icon_data.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/icon_data.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/icon_data.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/image.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/image.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/image.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/image.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/language.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/language.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/language.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/language.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/notifier.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/notifier.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/notifier.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/notifier.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/size.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/size.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/size.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/size.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/theme.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/theme.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/theme.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/theme.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/theme_extension.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/theme_extension.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/theme_extension.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/theme_extension.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/time/duration.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/time/duration.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/time/duration.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/time/duration.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/time/prelude.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/time/prelude.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/time/prelude.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/time/prelude.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/lib/uuid.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/uuid.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/lib/uuid.dartrename to frontend/appflowy_flutter/packages/flowy_infra/lib/uuid.dartdiff --git a/frontend/app_flowy/packages/flowy_infra/pubspec.yaml b/frontend/appflowy_flutter/packages/flowy_infra/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra/pubspec.yamlrename to frontend/appflowy_flutter/packages/flowy_infra/pubspec.yamldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/.metadata b/frontend/appflowy_flutter/packages/flowy_infra_ui/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/.metadatarename to frontend/appflowy_flutter/packages/flowy_infra_ui/.metadatadiff --git a/frontend/app_flowy/packages/flowy_infra_ui/CHANGELOG.md b/frontend/appflowy_flutter/packages/flowy_infra_ui/CHANGELOG.mdsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/CHANGELOG.mdrename to frontend/appflowy_flutter/packages/flowy_infra_ui/CHANGELOG.mddiff --git a/frontend/app_flowy/packages/flowy_infra_ui/LICENSE b/frontend/appflowy_flutter/packages/flowy_infra_ui/LICENSEsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/LICENSErename to frontend/appflowy_flutter/packages/flowy_infra_ui/LICENSEdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/README.md b/frontend/appflowy_flutter/packages/flowy_infra_ui/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/README.mdrename to frontend/appflowy_flutter/packages/flowy_infra_ui/README.mddiff --git a/frontend/app_flowy/packages/flowy_infra_ui/analysis_options.yaml b/frontend/appflowy_flutter/packages/flowy_infra_ui/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/analysis_options.yamlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/analysis_options.yamldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/.classpath b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/.classpathsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/.classpathrename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/.classpathdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/.project b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/.projectsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/.projectrename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/.projectdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/.settings/org.eclipse.buildship.core.prefs b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/.settings/org.eclipse.buildship.core.prefssimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/.settings/org.eclipse.buildship.core.prefsrename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/.settings/org.eclipse.buildship.core.prefsdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/build.gradle b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/build.gradlesimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/build.gradlerename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/build.gradlediff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/gradle.properties b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/gradle.propertiessimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/gradle.propertiesrename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/gradle.propertiesdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/gradle/wrapper/gradle-wrapper.properties b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/gradle/wrapper/gradle-wrapper.propertiessimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/gradle/wrapper/gradle-wrapper.propertiesrename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/gradle/wrapper/gradle-wrapper.propertiesdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/settings.gradle b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/settings.gradlesimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/settings.gradlerename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/settings.gradlediff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/src/main/AndroidManifest.xml b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/src/main/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/src/main/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/src/main/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/src/main/java/com/example/flowy_infra_ui/FlowyInfraUIPlugin.java b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/src/main/java/com/example/flowy_infra_ui/FlowyInfraUIPlugin.javasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/src/main/java/com/example/flowy_infra_ui/FlowyInfraUIPlugin.javarename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/src/main/java/com/example/flowy_infra_ui/FlowyInfraUIPlugin.javadiff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/src/main/java/com/example/flowy_infra_ui/event/KeyboardEventHandler.java b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/src/main/java/com/example/flowy_infra_ui/event/KeyboardEventHandler.javasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/src/main/java/com/example/flowy_infra_ui/event/KeyboardEventHandler.javarename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/src/main/java/com/example/flowy_infra_ui/event/KeyboardEventHandler.javadiff --git a/frontend/app_flowy/packages/flowy_infra_ui/android/src/main/kotlin/com/example/flowy_infra_ui/FlowyInfraUiPlugin.kt b/frontend/appflowy_flutter/packages/flowy_infra_ui/android/src/main/kotlin/com/example/flowy_infra_ui/FlowyInfraUiPlugin.ktsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/android/src/main/kotlin/com/example/flowy_infra_ui/FlowyInfraUiPlugin.ktrename to frontend/appflowy_flutter/packages/flowy_infra_ui/android/src/main/kotlin/com/example/flowy_infra_ui/FlowyInfraUiPlugin.ktdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/.metadata b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/.metadatarename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/.metadatadiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/README.md b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/README.mdrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/README.mddiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/analysis_options.yaml b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/analysis_options.yamlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/analysis_options.yamldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/.project b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/.projectsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/.projectrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/.projectdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/.settings/org.eclipse.buildship.core.prefs b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/.settings/org.eclipse.buildship.core.prefssimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/.settings/org.eclipse.buildship.core.prefsrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/.settings/org.eclipse.buildship.core.prefsdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/.classpath b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/.classpathsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/.classpathrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/.classpathdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/.project b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/.projectsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/.projectrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/.projectdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/.settings/org.eclipse.buildship.core.prefs b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/.settings/org.eclipse.buildship.core.prefssimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/.settings/org.eclipse.buildship.core.prefsrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/.settings/org.eclipse.buildship.core.prefsdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/build.gradle b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/build.gradlesimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/build.gradlerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/build.gradlediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/debug/AndroidManifest.xml b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/debug/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/debug/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/debug/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/AndroidManifest.xml b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/kotlin/com/example/example/MainActivity.ktsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/kotlin/com/example/example/MainActivity.ktrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/kotlin/com/example/example/MainActivity.ktdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/kotlin/com/example/flowy_infra_ui_example/MainActivity.kt b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/kotlin/com/example/flowy_infra_ui_example/MainActivity.ktsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/kotlin/com/example/flowy_infra_ui_example/MainActivity.ktrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/kotlin/com/example/flowy_infra_ui_example/MainActivity.ktdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/drawable-v21/launch_background.xml b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/drawable-v21/launch_background.xmlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/drawable-v21/launch_background.xmlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/drawable-v21/launch_background.xmldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/drawable/launch_background.xml b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/drawable/launch_background.xmlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/drawable/launch_background.xmlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/drawable/launch_background.xmldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/values-night/styles.xml b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/values-night/styles.xmlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/values-night/styles.xmlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/values-night/styles.xmldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/values/styles.xml b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/values/styles.xmlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/main/res/values/styles.xmlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/main/res/values/styles.xmldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/profile/AndroidManifest.xml b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/profile/AndroidManifest.xmlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/app/src/profile/AndroidManifest.xmlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/app/src/profile/AndroidManifest.xmldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/build.gradle b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/build.gradlesimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/build.gradlerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/build.gradlediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/gradle.properties b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/gradle.propertiessimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/gradle.propertiesrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/gradle.propertiesdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/gradle/wrapper/gradle-wrapper.properties b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/gradle/wrapper/gradle-wrapper.propertiessimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/gradle/wrapper/gradle-wrapper.propertiesrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/gradle/wrapper/gradle-wrapper.propertiesdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/android/settings.gradle b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/settings.gradlesimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/android/settings.gradlerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/android/settings.gradlediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/example/android/app/src/main/java/com/example/flowy_infra_ui_example/FlutterActivity.java b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/example/android/app/src/main/java/com/example/flowy_infra_ui_example/FlutterActivity.javasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/example/android/app/src/main/java/com/example/flowy_infra_ui_example/FlutterActivity.javarename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/example/android/app/src/main/java/com/example/flowy_infra_ui_example/FlutterActivity.javadiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Flutter/AppFrameworkInfo.plist b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Flutter/AppFrameworkInfo.plistsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Flutter/AppFrameworkInfo.plistrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Flutter/AppFrameworkInfo.plistdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Flutter/Debug.xcconfig b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Flutter/Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Flutter/Debug.xcconfigrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Flutter/Debug.xcconfigdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Flutter/Release.xcconfig b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Flutter/Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Flutter/Release.xcconfigrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Flutter/Release.xcconfigdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Podfile b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Podfilesimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Podfilerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Podfilediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Podfile.lock b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Podfile.locksimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Podfile.lockrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Podfile.lockdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.pbxprojsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.pbxprojrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.pbxprojdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingssimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemesimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingssimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettingsdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/AppDelegate.swift b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/AppDelegate.swiftsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/AppDelegate.swiftrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/AppDelegate.swiftdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsondiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsondiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]similarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]rename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]diff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mdrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mddiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Base.lproj/LaunchScreen.storyboardsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Base.lproj/LaunchScreen.storyboardrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Base.lproj/LaunchScreen.storyboarddiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Base.lproj/Main.storyboard b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Base.lproj/Main.storyboardsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Base.lproj/Main.storyboardrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Base.lproj/Main.storyboarddiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Info.plist b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Info.plistsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Info.plistrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Info.plistdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Runner-Bridging-Header.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Runner-Bridging-Header.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/ios/Runner/Runner-Bridging-Header.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/ios/Runner/Runner-Bridging-Header.hdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/lib/home/demo_item.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/lib/home/demo_item.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/lib/home/demo_item.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/lib/home/demo_item.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/lib/home/home_screen.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/lib/home/home_screen.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/lib/home/home_screen.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/lib/home/home_screen.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/lib/keyboard/keyboard_screen.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/lib/keyboard/keyboard_screen.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/lib/keyboard/keyboard_screen.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/lib/keyboard/keyboard_screen.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/lib/main.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/lib/main.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/lib/main.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/lib/main.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/lib/overlay/overlay_screen.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/lib/overlay/overlay_screen.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/lib/overlay/overlay_screen.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/lib/overlay/overlay_screen.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/linux/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/linux/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/linux/CMakeLists.txt b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/linux/CMakeLists.txtrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/linux/flutter/CMakeLists.txt b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/flutter/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/linux/flutter/CMakeLists.txtrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/flutter/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/linux/main.cc b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/main.ccsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/linux/main.ccrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/main.ccdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/linux/my_application.cc b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/my_application.ccsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/linux/my_application.ccrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/my_application.ccdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/linux/my_application.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/my_application.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/linux/my_application.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/linux/my_application.hdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Flutter/Flutter-Debug.xcconfig b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Flutter/Flutter-Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Flutter/Flutter-Debug.xcconfigrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Flutter/Flutter-Debug.xcconfigdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Flutter/Flutter-Release.xcconfig b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Flutter/Flutter-Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Flutter/Flutter-Release.xcconfigrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Flutter/Flutter-Release.xcconfigdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Podfile b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Podfilesimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Podfilerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Podfilediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Podfile.lock b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Podfile.locksimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Podfile.lockrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Podfile.lockdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/project.pbxprojsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/project.pbxprojrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/project.pbxprojdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemesimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner.xcworkspace/contents.xcworkspacedatasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner.xcworkspace/contents.xcworkspacedatarename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner.xcworkspace/contents.xcworkspacedatadiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plistdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/AppDelegate.swift b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/AppDelegate.swiftsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/AppDelegate.swiftrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/AppDelegate.swiftdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsondiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Base.lproj/MainMenu.xib b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Base.lproj/MainMenu.xibsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Base.lproj/MainMenu.xibrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Base.lproj/MainMenu.xibdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Configs/AppInfo.xcconfig b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Configs/AppInfo.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Configs/AppInfo.xcconfigrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Configs/AppInfo.xcconfigdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Configs/Debug.xcconfig b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Configs/Debug.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Configs/Debug.xcconfigrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Configs/Debug.xcconfigdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Configs/Release.xcconfig b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Configs/Release.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Configs/Release.xcconfigrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Configs/Release.xcconfigdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Configs/Warnings.xcconfig b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Configs/Warnings.xcconfigsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Configs/Warnings.xcconfigrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Configs/Warnings.xcconfigdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/DebugProfile.entitlements b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/DebugProfile.entitlementssimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/DebugProfile.entitlementsrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/DebugProfile.entitlementsdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Info.plist b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Info.plistsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Info.plistrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Info.plistdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/MainFlutterWindow.swift b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/MainFlutterWindow.swiftsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/MainFlutterWindow.swiftrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/MainFlutterWindow.swiftdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Release.entitlements b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Release.entitlementssimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/macos/Runner/Release.entitlementsrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/macos/Runner/Release.entitlementsdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/pubspec.yaml b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/pubspec.yamlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/pubspec.yamldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/test/widget_test.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/test/widget_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/test/widget_test.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/test/widget_test.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/web/favicon.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/favicon.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/web/favicon.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/favicon.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/web/icons/Icon-192.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/icons/Icon-192.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/web/icons/Icon-192.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/icons/Icon-192.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/web/icons/Icon-512.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/icons/Icon-512.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/web/icons/Icon-512.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/icons/Icon-512.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/web/icons/Icon-maskable-192.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/icons/Icon-maskable-192.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/web/icons/Icon-maskable-192.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/icons/Icon-maskable-192.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/web/icons/Icon-maskable-512.png b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/icons/Icon-maskable-512.pngsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/web/icons/Icon-maskable-512.pngrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/icons/Icon-maskable-512.pngdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/web/index.html b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/index.htmlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/web/index.htmlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/index.htmldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/web/manifest.json b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/manifest.jsonsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/web/manifest.jsonrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/web/manifest.jsondiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/CMakeLists.txt b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/CMakeLists.txtrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/flutter/CMakeLists.txt b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/flutter/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/flutter/CMakeLists.txtrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/flutter/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/CMakeLists.txt b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/CMakeLists.txtrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/Runner.rc b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/Runner.rcsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/Runner.rcrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/Runner.rcdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/flutter_window.cpp b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/flutter_window.cppsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/flutter_window.cpprename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/flutter_window.cppdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/flutter_window.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/flutter_window.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/flutter_window.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/flutter_window.hdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/main.cpp b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/main.cppsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/main.cpprename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/main.cppdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/resource.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/resource.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/resource.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/resource.hdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/resources/app_icon.ico b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/resources/app_icon.icosimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/resources/app_icon.icorename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/resources/app_icon.icodiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/runner.exe.manifest b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/runner.exe.manifestsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/runner.exe.manifestrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/runner.exe.manifestdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/utils.cpp b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/utils.cppsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/utils.cpprename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/utils.cppdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/utils.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/utils.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/utils.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/utils.hdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/win32_window.cpp b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/win32_window.cppsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/win32_window.cpprename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/win32_window.cppdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/win32_window.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/win32_window.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/example/windows/runner/win32_window.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/example/windows/runner/win32_window.hdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/.metadata b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/.metadatarename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/.metadatadiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/CHANGELOG.md b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/CHANGELOG.mdsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/CHANGELOG.mdrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/CHANGELOG.mddiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/LICENSE b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/LICENSEsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/LICENSErename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/LICENSEdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/README.md b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/README.mdrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/README.mddiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/analysis_options.yaml b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/analysis_options.yamlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/analysis_options.yamldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/lib/flowy_infra_ui_platform_interface.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/lib/flowy_infra_ui_platform_interface.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/lib/flowy_infra_ui_platform_interface.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/lib/flowy_infra_ui_platform_interface.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/lib/src/method_channel_flowy_infra_ui.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/lib/src/method_channel_flowy_infra_ui.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/lib/src/method_channel_flowy_infra_ui.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/lib/src/method_channel_flowy_infra_ui.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/pubspec.yaml b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/pubspec.yamlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/pubspec.yamldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/test/flowy_infra_ui_platform_interface_test.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/test/flowy_infra_ui_platform_interface_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/test/flowy_infra_ui_platform_interface_test.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_platform_interface/test/flowy_infra_ui_platform_interface_test.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/.metadata b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/.metadatasimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/.metadatarename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/.metadatadiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/CHANGELOG.md b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/CHANGELOG.mdsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/CHANGELOG.mdrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/CHANGELOG.mddiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/LICENSE b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/LICENSEsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/LICENSErename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/LICENSEdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/README.md b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/README.mdsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/README.mdrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/README.mddiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/analysis_options.yaml b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/analysis_options.yamlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/analysis_options.yamlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/analysis_options.yamldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/lib/flowy_infra_ui_web.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/lib/flowy_infra_ui_web.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/lib/flowy_infra_ui_web.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/lib/flowy_infra_ui_web.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/pubspec.yaml b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/pubspec.yamlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/pubspec.yamldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/test/flowy_infra_ui_web_test.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/test/flowy_infra_ui_web_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/flowy_infra_ui_web/test/flowy_infra_ui_web_test.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/flowy_infra_ui_web/test/flowy_infra_ui_web_test.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/ios/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/ios/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/ios/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/ios/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/ios/Assets/.gitkeep b/frontend/appflowy_flutter/packages/flowy_infra_ui/ios/Assets/.gitkeepsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/ios/Assets/.gitkeeprename to frontend/appflowy_flutter/packages/flowy_infra_ui/ios/Assets/.gitkeepdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/ios/Classes/Event/KeyboardEventHandler.swift b/frontend/appflowy_flutter/packages/flowy_infra_ui/ios/Classes/Event/KeyboardEventHandler.swiftsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/ios/Classes/Event/KeyboardEventHandler.swiftrename to frontend/appflowy_flutter/packages/flowy_infra_ui/ios/Classes/Event/KeyboardEventHandler.swiftdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/ios/Classes/FlowyInfraUiPlugin.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/ios/Classes/FlowyInfraUiPlugin.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/ios/Classes/FlowyInfraUiPlugin.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/ios/Classes/FlowyInfraUiPlugin.hdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/ios/Classes/FlowyInfraUiPlugin.m b/frontend/appflowy_flutter/packages/flowy_infra_ui/ios/Classes/FlowyInfraUiPlugin.msimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/ios/Classes/FlowyInfraUiPlugin.mrename to frontend/appflowy_flutter/packages/flowy_infra_ui/ios/Classes/FlowyInfraUiPlugin.mdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/ios/Classes/SwiftFlowyInfraUiPlugin.swift b/frontend/appflowy_flutter/packages/flowy_infra_ui/ios/Classes/SwiftFlowyInfraUiPlugin.swiftsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/ios/Classes/SwiftFlowyInfraUiPlugin.swiftrename to frontend/appflowy_flutter/packages/flowy_infra_ui/ios/Classes/SwiftFlowyInfraUiPlugin.swiftdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/ios/flowy_infra_ui.podspec b/frontend/appflowy_flutter/packages/flowy_infra_ui/ios/flowy_infra_ui.podspecsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/ios/flowy_infra_ui.podspecrename to frontend/appflowy_flutter/packages/flowy_infra_ui/ios/flowy_infra_ui.podspecdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/basis.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/basis.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/basis.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/basis.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/flowy_infra_ui.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/flowy_infra_ui.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/flowy_infra_ui.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/flowy_infra_ui.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/flowy_infra_ui_web.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/flowy_infra_ui_web.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/flowy_infra_ui_web.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/flowy_infra_ui_web.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_dialog.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_dialog.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_dialog.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_dialog.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_overlay.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_overlay.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_overlay.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_overlay.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_popover_layout.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_popover_layout.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_popover_layout.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_popover_layout.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/layout.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/layout.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/layout.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/layout.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/list_overlay.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/list_overlay.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/list_overlay.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/list_overlay.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/option_overlay.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/option_overlay.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/option_overlay.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/option_overlay.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/focus/auto_unfocus_overlay.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/focus/auto_unfocus_overlay.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/src/focus/auto_unfocus_overlay.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/focus/auto_unfocus_overlay.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/keyboard/keyboard_visibility_detector.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/keyboard/keyboard_visibility_detector.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/src/keyboard/keyboard_visibility_detector.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/keyboard/keyboard_visibility_detector.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/bar_title.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/bar_title.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/bar_title.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/bar_title.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/button.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/close_button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/close_button.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/close_button.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/close_button.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/color_picker.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/color_picker.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/color_picker.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/color_picker.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/container.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/container.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/container.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/container.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/decoration.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/decoration.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/decoration.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/decoration.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/extension.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/extension.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/extension.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/extension.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/hover.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/hover.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/hover.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/hover.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/icon_button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/icon_button.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/icon_button.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/icon_button.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/image_icon.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/image_icon.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/image_icon.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/image_icon.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/progress_indicator.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/progress_indicator.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/progress_indicator.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/progress_indicator.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_list.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_list.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_list.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_list.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_scroll_bar.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_scroll_bar.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_scroll_bar.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_scroll_bar.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_scrollview.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_scrollview.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_scrollview.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/scrolling/styled_scrollview.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/snap_bar.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/snap_bar.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/snap_bar.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/snap_bar.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/text.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/text.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/text_field.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_field.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/text_field.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_field.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/text_input.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_input.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/text_input.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_input.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/base_styled_button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/buttons/base_styled_button.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/base_styled_button.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/buttons/base_styled_button.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/primary_button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/buttons/primary_button.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/primary_button.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/buttons/primary_button.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/secondary_button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/buttons/secondary_button.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/buttons/secondary_button.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/buttons/secondary_button.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/clickable_extension.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/clickable_extension.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/clickable_extension.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/clickable_extension.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/constraint_flex_view.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/constraint_flex_view.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/constraint_flex_view.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/constraint_flex_view.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/dialog/dialog_size.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/dialog/dialog_size.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/dialog/dialog_size.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/dialog/dialog_size.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/dialog/styled_dialogs.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/dialog/styled_dialogs.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/dialog/styled_dialogs.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/dialog/styled_dialogs.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/error_page.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/error_page.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/error_page.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/error_page.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/ignore_parent_gesture.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/ignore_parent_gesture.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/ignore_parent_gesture.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/ignore_parent_gesture.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/mouse_hover_builder.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/mouse_hover_builder.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/mouse_hover_builder.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/mouse_hover_builder.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/rounded_button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/rounded_button.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/rounded_button.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/rounded_button.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/rounded_input_field.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/rounded_input_field.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/rounded_input_field.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/rounded_input_field.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/route/animation.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/route/animation.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/route/animation.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/route/animation.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/seperated_column.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/seperated_column.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/seperated_column.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/seperated_column.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/widget/spacing.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/spacing.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/lib/widget/spacing.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/spacing.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/linux/CMakeLists.txt b/frontend/appflowy_flutter/packages/flowy_infra_ui/linux/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/linux/CMakeLists.txtrename to frontend/appflowy_flutter/packages/flowy_infra_ui/linux/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/linux/flowy_infra_u_i_plugin.cc b/frontend/appflowy_flutter/packages/flowy_infra_ui/linux/flowy_infra_u_i_plugin.ccsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/linux/flowy_infra_u_i_plugin.ccrename to frontend/appflowy_flutter/packages/flowy_infra_ui/linux/flowy_infra_u_i_plugin.ccdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/linux/flowy_infra_ui_plugin.cc b/frontend/appflowy_flutter/packages/flowy_infra_ui/linux/flowy_infra_ui_plugin.ccsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/linux/flowy_infra_ui_plugin.ccrename to frontend/appflowy_flutter/packages/flowy_infra_ui/linux/flowy_infra_ui_plugin.ccdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/linux/include/flowy_infra_ui/flowy_infra_u_i_plugin.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/linux/include/flowy_infra_ui/flowy_infra_u_i_plugin.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/linux/include/flowy_infra_ui/flowy_infra_u_i_plugin.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/linux/include/flowy_infra_ui/flowy_infra_u_i_plugin.hdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/linux/include/flowy_infra_ui/flowy_infra_ui_plugin.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/linux/include/flowy_infra_ui/flowy_infra_ui_plugin.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/linux/include/flowy_infra_ui/flowy_infra_ui_plugin.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/linux/include/flowy_infra_ui/flowy_infra_ui_plugin.hdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/macos/Classes/FlowyInfraUiPlugin.swift b/frontend/appflowy_flutter/packages/flowy_infra_ui/macos/Classes/FlowyInfraUiPlugin.swiftsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/macos/Classes/FlowyInfraUiPlugin.swiftrename to frontend/appflowy_flutter/packages/flowy_infra_ui/macos/Classes/FlowyInfraUiPlugin.swiftdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/macos/flowy_infra_ui.podspec b/frontend/appflowy_flutter/packages/flowy_infra_ui/macos/flowy_infra_ui.podspecsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/macos/flowy_infra_ui.podspecrename to frontend/appflowy_flutter/packages/flowy_infra_ui/macos/flowy_infra_ui.podspecdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/pubspec.yaml b/frontend/appflowy_flutter/packages/flowy_infra_ui/pubspec.yamlsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/pubspec.yamlrename to frontend/appflowy_flutter/packages/flowy_infra_ui/pubspec.yamldiff --git a/frontend/app_flowy/packages/flowy_infra_ui/test/flowy_infra_ui_test.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/test/flowy_infra_ui_test.dartsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/test/flowy_infra_ui_test.dartrename to frontend/appflowy_flutter/packages/flowy_infra_ui/test/flowy_infra_ui_test.dartdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/windows/.gitignore b/frontend/appflowy_flutter/packages/flowy_infra_ui/windows/.gitignoresimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/windows/.gitignorerename to frontend/appflowy_flutter/packages/flowy_infra_ui/windows/.gitignorediff --git a/frontend/app_flowy/packages/flowy_infra_ui/windows/CMakeLists.txt b/frontend/appflowy_flutter/packages/flowy_infra_ui/windows/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/windows/CMakeLists.txtrename to frontend/appflowy_flutter/packages/flowy_infra_ui/windows/CMakeLists.txtdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/windows/flowy_infra_ui_plugin.cpp b/frontend/appflowy_flutter/packages/flowy_infra_ui/windows/flowy_infra_ui_plugin.cppsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/windows/flowy_infra_ui_plugin.cpprename to frontend/appflowy_flutter/packages/flowy_infra_ui/windows/flowy_infra_ui_plugin.cppdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/windows/include/flowy_infra_ui/flowy_infra_u_i_plugin.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/windows/include/flowy_infra_ui/flowy_infra_u_i_plugin.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/windows/include/flowy_infra_ui/flowy_infra_u_i_plugin.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/windows/include/flowy_infra_ui/flowy_infra_u_i_plugin.hdiff --git a/frontend/app_flowy/packages/flowy_infra_ui/windows/include/flowy_infra_ui/flowy_infra_ui_plugin.h b/frontend/appflowy_flutter/packages/flowy_infra_ui/windows/include/flowy_infra_ui/flowy_infra_ui_plugin.hsimilarity index 100%rename from frontend/app_flowy/packages/flowy_infra_ui/windows/include/flowy_infra_ui/flowy_infra_ui_plugin.hrename to frontend/appflowy_flutter/packages/flowy_infra_ui/windows/include/flowy_infra_ui/flowy_infra_ui_plugin.hdiff --git a/frontend/app_flowy/pubspec.lock b/frontend/appflowy_flutter/pubspec.locksimilarity index 100%rename from frontend/app_flowy/pubspec.lockrename to frontend/appflowy_flutter/pubspec.lockdiff --git a/frontend/app_flowy/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yamlsimilarity index 99%rename from frontend/app_flowy/pubspec.yamlrename to frontend/appflowy_flutter/pubspec.yamlindex 33af66d751..56f4ffc0d7 100644--- a/frontend/app_flowy/pubspec.yaml+++ b/frontend/appflowy_flutter/pubspec.yaml@@ -1,4 +1,4 @@-name: app_flowy+name: appflowydescription: A new Flutter project.# The following line prevents the package from being accidentally published todiff --git a/frontend/app_flowy/test/bloc_test/app_setting_test/appearance_test.dart b/frontend/appflowy_flutter/test/bloc_test/app_setting_test/appearance_test.dartsimilarity index 87%rename from frontend/app_flowy/test/bloc_test/app_setting_test/appearance_test.dartrename to frontend/appflowy_flutter/test/bloc_test/app_setting_test/appearance_test.dartindex 93ea3a6f86..c0f66d7e20 100644--- a/frontend/app_flowy/test/bloc_test/app_setting_test/appearance_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/app_setting_test/appearance_test.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/user/application/user_settings_service.dart';-import 'package:app_flowy/workspace/application/appearance.dart';+import 'package:appflowy/user/application/user_settings_service.dart';+import 'package:appflowy/workspace/application/appearance.dart';import 'package:bloc_test/bloc_test.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_setting.pb.dart';import 'package:flutter/material.dart';@@ -17,7 +17,8 @@ void main() {group('$AppearanceSettingsCubit', () {late AppearanceSettingsPB appearanceSetting;setUp(() async {- appearanceSetting = await SettingsFFIService().getAppearanceSetting();+ appearanceSetting =+ await UserSettingsBackendService().getAppearanceSetting();await blocResponseFuture();});diff --git a/frontend/app_flowy/test/bloc_test/board_test/create_card_test.dart b/frontend/appflowy_flutter/test/bloc_test/board_test/create_card_test.dartsimilarity index 92%rename from frontend/app_flowy/test/bloc_test/board_test/create_card_test.dartrename to frontend/appflowy_flutter/test/bloc_test/board_test/create_card_test.dartindex 33168e6a0a..cb7df23187 100644--- a/frontend/app_flowy/test/bloc_test/board_test/create_card_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/board_test/create_card_test.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/board/application/board_bloc.dart';+import 'package:appflowy/plugins/database_view/board/application/board_bloc.dart';import 'package:flutter_test/flutter_test.dart';import 'util.dart';diff --git a/frontend/app_flowy/test/bloc_test/board_test/create_or_edit_field_test.dart b/frontend/appflowy_flutter/test/bloc_test/board_test/create_or_edit_field_test.dartsimilarity index 88%rename from frontend/app_flowy/test/bloc_test/board_test/create_or_edit_field_test.dartrename to frontend/appflowy_flutter/test/bloc_test/board_test/create_or_edit_field_test.dartindex 5a0d3154b5..fdf72e54e0 100644--- a/frontend/app_flowy/test/bloc_test/board_test/create_or_edit_field_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/board_test/create_or_edit_field_test.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/board/application/board_bloc.dart';-import 'package:app_flowy/plugins/grid/application/field/field_editor_bloc.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/field/field_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/board/application/board_bloc.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter_test/flutter_test.dart';import 'util.dart';@@ -35,7 +35,7 @@ void main() {);final editorBloc = FieldEditorBloc(- databaseId: context.gridView.id,+ viewId: context.gridView.id,fieldName: fieldInfo.name,isGroupField: fieldInfo.isGroupField,loader: loader,diff --git a/frontend/app_flowy/test/bloc_test/board_test/group_by_checkbox_field_test.dart b/frontend/appflowy_flutter/test/bloc_test/board_test/group_by_checkbox_field_test.dartsimilarity index 78%rename from frontend/app_flowy/test/bloc_test/board_test/group_by_checkbox_field_test.dartrename to frontend/appflowy_flutter/test/bloc_test/board_test/group_by_checkbox_field_test.dartindex c9c0d1e566..4054682560 100644--- a/frontend/app_flowy/test/bloc_test/board_test/group_by_checkbox_field_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/board_test/group_by_checkbox_field_test.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/board/application/board_bloc.dart';-import 'package:app_flowy/plugins/grid/application/setting/group_bloc.dart';+import 'package:appflowy/plugins/database_view/application/setting/group_bloc.dart';+import 'package:appflowy/plugins/database_view/board/application/board_bloc.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter_test/flutter_test.dart';@@ -30,11 +30,11 @@ void main() {// set group by checkboxfinal checkboxField = context.fieldContexts.last.field;- final gridGroupBloc = GridGroupBloc(+ final gridGroupBloc = DatabaseGroupBloc(viewId: context.gridView.id,fieldController: context.fieldController,- )..add(const GridGroupEvent.initial());- gridGroupBloc.add(GridGroupEvent.setGroupByField(+ )..add(const DatabaseGroupEvent.initial());+ gridGroupBloc.add(DatabaseGroupEvent.setGroupByField(checkboxField.id,checkboxField.fieldType,));diff --git a/frontend/app_flowy/test/bloc_test/board_test/group_by_multi_select_field_test.dart b/frontend/appflowy_flutter/test/bloc_test/board_test/group_by_multi_select_field_test.dartsimilarity index 82%rename from frontend/app_flowy/test/bloc_test/board_test/group_by_multi_select_field_test.dartrename to frontend/appflowy_flutter/test/bloc_test/board_test/group_by_multi_select_field_test.dartindex 748ec64f51..d15a846b4e 100644--- a/frontend/app_flowy/test/bloc_test/board_test/group_by_multi_select_field_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/board_test/group_by_multi_select_field_test.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/plugins/board/application/board_bloc.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:app_flowy/plugins/grid/application/setting/group_bloc.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/setting/group_bloc.dart';+import 'package:appflowy/plugins/database_view/board/application/board_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/select_option_editor_bloc.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter_test/flutter_test.dart';@@ -24,13 +24,13 @@ void main() {final multiSelectField = context.fieldContexts.last.field;// set grouped by the new multi-select field"- final gridGroupBloc = GridGroupBloc(+ final gridGroupBloc = DatabaseGroupBloc(viewId: context.gridView.id,fieldController: context.fieldController,- )..add(const GridGroupEvent.initial());+ )..add(const DatabaseGroupEvent.initial());await boardResponseFuture();- gridGroupBloc.add(GridGroupEvent.setGroupByField(+ gridGroupBloc.add(DatabaseGroupEvent.setGroupByField(multiSelectField.id,multiSelectField.fieldType,));@@ -59,7 +59,7 @@ void main() {// Create optionsfinal cellController = await context.makeCellController(multiSelectField.id)- as GridSelectOptionCellController;+ as SelectOptionCellController;final multiSelectOptionBloc =SelectOptionCellEditorBloc(cellController: cellController);@@ -71,13 +71,13 @@ void main() {await boardResponseFuture();// set grouped by the new multi-select field"- final gridGroupBloc = GridGroupBloc(+ final gridGroupBloc = DatabaseGroupBloc(viewId: context.gridView.id,fieldController: context.fieldController,- )..add(const GridGroupEvent.initial());+ )..add(const DatabaseGroupEvent.initial());await boardResponseFuture();- gridGroupBloc.add(GridGroupEvent.setGroupByField(+ gridGroupBloc.add(DatabaseGroupEvent.setGroupByField(multiSelectField.id,multiSelectField.fieldType,));diff --git a/frontend/app_flowy/test/bloc_test/board_test/group_by_unsupport_field_test.dart b/frontend/appflowy_flutter/test/bloc_test/board_test/group_by_unsupport_field_test.dartsimilarity index 89%rename from frontend/app_flowy/test/bloc_test/board_test/group_by_unsupport_field_test.dartrename to frontend/appflowy_flutter/test/bloc_test/board_test/group_by_unsupport_field_test.dartindex ba6ff17398..8f4a4c9263 100644--- a/frontend/app_flowy/test/bloc_test/board_test/group_by_unsupport_field_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/board_test/group_by_unsupport_field_test.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/board/application/board_bloc.dart';-import 'package:app_flowy/plugins/grid/application/field/field_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/field_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/board/application/board_bloc.dart';import 'package:bloc_test/bloc_test.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter_test/flutter_test.dart';diff --git a/frontend/app_flowy/test/bloc_test/board_test/util.dart b/frontend/appflowy_flutter/test/bloc_test/board_test/util.dartsimilarity index 74%rename from frontend/app_flowy/test/bloc_test/board_test/util.dartrename to frontend/appflowy_flutter/test/bloc_test/board_test/util.dartindex c55ff91ec8..fc6fe8c617 100644--- a/frontend/app_flowy/test/bloc_test/board_test/util.dart+++ b/frontend/appflowy_flutter/test/bloc_test/board_test/util.dart@@ -1,14 +1,14 @@-import 'package:app_flowy/plugins/board/application/board_data_controller.dart';-import 'package:app_flowy/plugins/board/board.dart';-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.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:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/application/row/row_bloc.dart';-import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';-import 'package:app_flowy/plugins/grid/application/row/row_data_controller.dart';-import 'package:app_flowy/workspace/application/app/app_service.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/field_service.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';+import 'package:appflowy/plugins/database_view/application/row/row_data_controller.dart';+import 'package:appflowy/plugins/database_view/board/application/board_data_controller.dart';+import 'package:appflowy/plugins/database_view/board/board.dart';+import 'package:appflowy/plugins/database_view/grid/application/row/row_bloc.dart';+import 'package:appflowy/workspace/application/app/app_service.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';@@ -32,7 +32,6 @@ class AppFlowyBoardTest {.createView(appId: app.id,name: "Test Board",- dataFormatType: builder.dataFormatType,layoutType: builder.layoutType!,).then((result) {@@ -72,7 +71,7 @@ class BoardTestContext {List<FieldInfo> get fieldContexts => fieldController.fieldInfos;- GridFieldController get fieldController {+ FieldController get fieldController {return _boardDataController.fieldController;}@@ -91,17 +90,17 @@ class BoardTestContext {fieldName: fieldInfo?.name ?? '',isGroupField: fieldInfo?.isGroupField ?? false,loader: loader,- databaseId: gridView.id,+ viewId: gridView.id,);return editorBloc;}- Future<GridCellController> makeCellController(String fieldId) async {+ Future<CellController> makeCellController(String fieldId) async {final builder = await makeCellControllerBuilder(fieldId);return builder.build();}- Future<GridCellControllerBuilder> makeCellControllerBuilder(+ Future<CellControllerBuilder> makeCellControllerBuilder(String fieldId,) async {final RowInfo rowInfo = rowInfos.last;@@ -120,8 +119,8 @@ class BoardTestContext {)..add(const RowEvent.initial());await gridResponseFuture();- return GridCellControllerBuilder(- cellId: rowBloc.state.gridCellMap[fieldId]!,+ return CellControllerBuilder(+ cellId: rowBloc.state.cellByFieldId[fieldId]!,cellCache: rowCache.cellCache,delegate: rowDataController,);@@ -142,9 +141,9 @@ class BoardTestContext {return fieldInfo;}- GridFieldCellContext singleSelectFieldCellContext() {+ FieldCellContext singleSelectFieldCellContext() {final field = singleSelectFieldContext().field;- return GridFieldCellContext(viewId: gridView.id, field: field);+ return FieldCellContext(viewId: gridView.id, field: field);}FieldInfo textFieldContext() {diff --git a/frontend/app_flowy/test/bloc_test/grid_test/cell/select_option_cell_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/cell/select_option_cell_test.dartsimilarity index 98%rename from frontend/app_flowy/test/bloc_test/grid_test/cell/select_option_cell_test.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/cell/select_option_cell_test.dartindex 44cc8f65a3..261734207d 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/cell/select_option_cell_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/cell/select_option_cell_test.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/cell/select_option_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/cell/select_option_editor_bloc.dart';import 'package:dartz/dartz.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';diff --git a/frontend/app_flowy/test/bloc_test/grid_test/field/edit_field_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/field/edit_field_test.dartsimilarity index 91%rename from frontend/app_flowy/test/bloc_test/grid_test/field/edit_field_test.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/field/edit_field_test.dartindex c62a797c4d..0423672763 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/field/edit_field_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/field/edit_field_test.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/application/prelude.dart';+import 'package:appflowy/plugins/database_view/application/field/field_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:flutter_test/flutter_test.dart';import '../util.dart';@@ -13,7 +13,7 @@ Future<FieldEditorBloc> createEditorBloc(AppFlowyGridTest gridTest) async {);return FieldEditorBloc(- databaseId: context.gridView.id,+ viewId: context.gridView.id,fieldName: fieldInfo.name,isGroupField: fieldInfo.isGroupField,loader: loader,@@ -83,7 +83,7 @@ Future<FieldEditorBloc> makeEditorBloc(AppFlowyGridTest gridTest) async {);final editorBloc = FieldEditorBloc(- databaseId: context.gridView.id,+ viewId: context.gridView.id,fieldName: fieldInfo.name,isGroupField: fieldInfo.isGroupField,loader: loader,diff --git a/frontend/app_flowy/test/bloc_test/grid_test/filter/create_filter_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dartsimilarity index 80%rename from frontend/app_flowy/test/bloc_test/grid_test/filter/create_filter_test.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dartindex 2b8126d959..a9d0ae30ea 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/filter/create_filter_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/grid/application/filter/filter_service.dart';-import 'package:app_flowy/plugins/grid/application/grid_bloc.dart';-import 'package:app_flowy/plugins/grid/application/grid_data_controller.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_data_controller.dart';import 'package:appflowy_backend/protobuf/flowy-database/checkbox_filter.pbenum.dart';import 'package:appflowy_backend/protobuf/flowy-database/text_filter.pb.dart';import 'package:flutter_test/flutter_test.dart';@@ -15,7 +15,7 @@ void main() {test('create a text filter)', () async {final context = await gridTest.createTestGrid();- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final textField = context.textFieldContext();await service.insertTextFilter(fieldId: textField.id,@@ -28,7 +28,7 @@ void main() {test('delete a text filter)', () async {final context = await gridTest.createTestGrid();- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final textField = context.textFieldContext();await service.insertTextFilter(fieldId: textField.id,@@ -49,8 +49,8 @@ void main() {test('filter rows with condition: text is empty', () async {final context = await gridTest.createTestGrid();- final service = FilterFFIService(viewId: context.gridView.id);- final gridController = GridController(view: context.gridView);+ final service = FilterBackendService(viewId: context.gridView.id);+ final gridController = DatabaseController(view: context.gridView);final gridBloc = GridBloc(view: context.gridView,gridController: gridController,@@ -70,8 +70,8 @@ void main() {test('filter rows with condition: text is empty(After edit the row)',() async {final context = await gridTest.createTestGrid();- final service = FilterFFIService(viewId: context.gridView.id);- final gridController = GridController(view: context.gridView);+ final service = FilterBackendService(viewId: context.gridView.id);+ final gridController = DatabaseController(view: context.gridView);final gridBloc = GridBloc(view: context.gridView,gridController: gridController,@@ -97,7 +97,7 @@ void main() {test('filter rows with condition: text is not empty', () async {final context = await gridTest.createTestGrid();- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final textField = context.textFieldContext();await gridResponseFuture();await service.insertTextFilter(@@ -111,8 +111,8 @@ void main() {test('filter rows with condition: checkbox uncheck', () async {final context = await gridTest.createTestGrid();final checkboxField = context.checkboxFieldContext();- final service = FilterFFIService(viewId: context.gridView.id);- final gridController = GridController(view: context.gridView);+ final service = FilterBackendService(viewId: context.gridView.id);+ final gridController = DatabaseController(view: context.gridView);final gridBloc = GridBloc(view: context.gridView,gridController: gridController,@@ -130,8 +130,8 @@ void main() {test('filter rows with condition: checkbox check', () async {final context = await gridTest.createTestGrid();final checkboxField = context.checkboxFieldContext();- final service = FilterFFIService(viewId: context.gridView.id);- final gridController = GridController(view: context.gridView);+ final service = FilterBackendService(viewId: context.gridView.id);+ final gridController = DatabaseController(view: context.gridView);final gridBloc = GridBloc(view: context.gridView,gridController: gridController,diff --git a/frontend/app_flowy/test/bloc_test/grid_test/filter/edit_filter_field_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/edit_filter_field_test.dartsimilarity index 76%rename from frontend/app_flowy/test/bloc_test/grid_test/filter/edit_filter_field_test.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/filter/edit_filter_field_test.dartindex b04a9edb7c..1dcc3dec07 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/filter/edit_filter_field_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/edit_filter_field_test.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/plugins/grid/application/field/field_editor_bloc.dart';-import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/application/filter/filter_menu_bloc.dart';-import 'package:app_flowy/plugins/grid/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/application/field/field_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/grid/application/filter/filter_menu_bloc.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/text_filter.pb.dart';import 'package:flutter_test/flutter_test.dart';@@ -16,7 +16,7 @@ void main() {test("create a text filter and then alter the filter's field)", () async {final context = await gridTest.createTestGrid();- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final textField = context.textFieldContext();// Create the filter menu bloc@@ -40,7 +40,7 @@ void main() {);final editorBloc = FieldEditorBloc(- databaseId: context.gridView.id,+ viewId: context.gridView.id,fieldName: textField.field.name,isGroupField: false,loader: loader,diff --git a/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_menu_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_menu_test.dartsimilarity index 86%rename from frontend/app_flowy/test/bloc_test/grid_test/filter/filter_menu_test.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_menu_test.dartindex 766b2d8232..6fff3517e7 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_menu_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_menu_test.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/grid/application/filter/filter_menu_bloc.dart';-import 'package:app_flowy/plugins/grid/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/grid/application/filter/filter_menu_bloc.dart';import 'package:appflowy_backend/protobuf/flowy-database/text_filter.pb.dart';import 'package:flutter_test/flutter_test.dart';@@ -19,7 +19,7 @@ void main() {await gridResponseFuture();assert(menuBloc.state.creatableFields.length == 3);- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final textField = context.textFieldContext();await service.insertTextFilter(fieldId: textField.id,@@ -36,7 +36,7 @@ void main() {..add(const GridFilterMenuEvent.initial());await gridResponseFuture();- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final textField = context.textFieldContext();// Create filterdiff --git a/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dartsimilarity index 87%rename from frontend/app_flowy/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dartindex 28a101b234..fd54e41e73 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/checkbox_filter.pbenum.dart';import 'package:flutter_test/flutter_test.dart';@@ -13,7 +13,7 @@ void main() {test('filter rows by checkbox is check condition)', () async {final context = await createTestFilterGrid(gridTest);- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final controller = await context.makeCheckboxCellController(0);controller.saveCellData("Yes");@@ -32,7 +32,7 @@ void main() {test('filter rows by checkbox is uncheck condition)', () async {final context = await createTestFilterGrid(gridTest);- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final controller = await context.makeCheckboxCellController(0);controller.saveCellData("Yes");diff --git a/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_rows_by_text_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_text_test.dartsimilarity index 93%rename from frontend/app_flowy/test/bloc_test/grid_test/filter/filter_rows_by_text_test.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_text_test.dartindex 73cb170e26..a55401b35e 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_rows_by_text_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_text_test.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/application/filter/filter_service.dart';+import 'package:appflowy/plugins/database_view/application/filter/filter_service.dart';import 'package:appflowy_backend/protobuf/flowy-database/text_filter.pb.dart';import 'package:flutter_test/flutter_test.dart';@@ -14,7 +14,7 @@ void main() {test('filter rows by text is empty condition)', () async {final context = await createTestFilterGrid(gridTest);- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final textField = context.textFieldContext();// create a new filterawait service.insertTextFilter(@@ -41,7 +41,7 @@ void main() {test('filter rows by text is not empty condition)', () async {final context = await createTestFilterGrid(gridTest);- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final textField = context.textFieldContext();// create a new filterawait service.insertTextFilter(@@ -66,7 +66,7 @@ void main() {test('filter rows by text is empty or is not empty condition)', () async {final context = await createTestFilterGrid(gridTest);- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final textField = context.textFieldContext();// create a new filterawait service.insertTextFilter(@@ -102,7 +102,7 @@ void main() {test('filter rows by text is condition)', () async {final context = await createTestFilterGrid(gridTest);- final service = FilterFFIService(viewId: context.gridView.id);+ final service = FilterBackendService(viewId: context.gridView.id);final textField = context.textFieldContext();// create a new filterawait service.insertTextFilter(diff --git a/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_util.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_util.dartsimilarity index 75%rename from frontend/app_flowy/test/bloc_test/grid_test/filter/filter_util.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_util.dartindex 9f10978cc6..fe955226e3 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_util.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_util.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/grid/application/grid_data_controller.dart';-import 'package:app_flowy/plugins/grid/grid.dart';-import 'package:app_flowy/workspace/application/app/app_service.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_data_controller.dart';+import 'package:appflowy/plugins/database_view/grid/grid.dart';+import 'package:appflowy/workspace/application/app/app_service.dart';import '../util.dart';@@ -11,13 +11,12 @@ Future<GridTestContext> createTestFilterGrid(AppFlowyGridTest gridTest) async {.createView(appId: app.id,name: "Filter Grid",- dataFormatType: builder.dataFormatType,layoutType: builder.layoutType!,).then((result) {return result.fold((view) async {- final context = GridTestContext(view, GridController(view: view));+ final context = GridTestContext(view, DatabaseController(view: view));final result = await context.gridController.openGrid();await editCells(context);diff --git a/frontend/app_flowy/test/bloc_test/grid_test/grid_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/grid_bloc_test.dartsimilarity index 80%rename from frontend/app_flowy/test/bloc_test/grid_test/grid_bloc_test.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/grid_bloc_test.dartindex 8020c77ac2..6250a8dced 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/grid_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/grid_bloc_test.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/grid/application/grid_bloc.dart';-import 'package:app_flowy/plugins/grid/application/grid_data_controller.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_data_controller.dart';import 'package:flutter_test/flutter_test.dart';import 'package:bloc_test/bloc_test.dart';import 'util.dart';@@ -20,7 +20,7 @@ void main() {"create a row",build: () => GridBloc(view: context.gridView,- gridController: GridController(view: context.gridView))+ gridController: DatabaseController(view: context.gridView))..add(const GridEvent.initial()),act: (bloc) => bloc.add(const GridEvent.createRow()),wait: const Duration(milliseconds: 300),@@ -33,7 +33,7 @@ void main() {"delete the last row",build: () => GridBloc(view: context.gridView,- gridController: GridController(view: context.gridView))+ gridController: DatabaseController(view: context.gridView))..add(const GridEvent.initial()),act: (bloc) async {await gridResponseFuture();diff --git a/frontend/app_flowy/test/bloc_test/grid_test/grid_header_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/grid_header_bloc_test.dartsimilarity index 86%rename from frontend/app_flowy/test/bloc_test/grid_test/grid_header_bloc_test.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/grid_header_bloc_test.dartindex f5db69d142..156c931f0b 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/grid_header_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/grid_header_bloc_test.dart@@ -1,5 +1,5 @@-import 'package:app_flowy/plugins/grid/application/field/field_action_sheet_bloc.dart';-import 'package:app_flowy/plugins/grid/application/grid_header_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/field_action_sheet_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_header_bloc.dart';import 'package:bloc_test/bloc_test.dart';import 'package:flutter_test/flutter_test.dart';@@ -26,7 +26,7 @@ void main() {"hides property",build: () {final bloc = GridHeaderBloc(- databaseId: context.gridView.id,+ viewId: context.gridView.id,fieldController: context.fieldController,)..add(const GridHeaderEvent.initial());return bloc;@@ -45,7 +45,7 @@ void main() {"shows property",build: () {final bloc = GridHeaderBloc(- databaseId: context.gridView.id,+ viewId: context.gridView.id,fieldController: context.fieldController,)..add(const GridHeaderEvent.initial());return bloc;@@ -66,7 +66,7 @@ void main() {"duplicate property",build: () {final bloc = GridHeaderBloc(- databaseId: context.gridView.id,+ viewId: context.gridView.id,fieldController: context.fieldController,)..add(const GridHeaderEvent.initial());return bloc;@@ -77,7 +77,7 @@ void main() {},wait: gridResponseDuration(),verify: (bloc) {- assert(bloc.state.fields.length == 4);+ expect(bloc.state.fields.length, 4);},);@@ -85,7 +85,7 @@ void main() {"delete property",build: () {final bloc = GridHeaderBloc(- databaseId: context.gridView.id,+ viewId: context.gridView.id,fieldController: context.fieldController,)..add(const GridHeaderEvent.initial());return bloc;@@ -96,7 +96,7 @@ void main() {},wait: gridResponseDuration(),verify: (bloc) {- assert(bloc.state.fields.length == 2);+ expect(bloc.state.fields.length, 2);},);@@ -104,7 +104,7 @@ void main() {"update name",build: () {final bloc = GridHeaderBloc(- databaseId: context.gridView.id,+ viewId: context.gridView.id,fieldController: context.fieldController,)..add(const GridHeaderEvent.initial());return bloc;@@ -119,7 +119,7 @@ void main() {final field = bloc.state.fields.firstWhere((element) => element.id == actionSheetBloc.fieldService.fieldId);- assert(field.name == "Hello world");+ expect(field.name, "Hello world");},);});diff --git a/frontend/app_flowy/test/bloc_test/grid_test/util.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dartsimilarity index 73%rename from frontend/app_flowy/test/bloc_test/grid_test/util.dartrename to frontend/appflowy_flutter/test/bloc_test/grid_test/util.dartindex 7305f7f7ce..a15592e59a 100644--- a/frontend/app_flowy/test/bloc_test/grid_test/util.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart@@ -1,14 +1,14 @@-import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';-import 'package:app_flowy/plugins/grid/application/field/field_controller.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:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';-import 'package:app_flowy/plugins/grid/application/grid_data_controller.dart';-import 'package:app_flowy/plugins/grid/application/row/row_bloc.dart';-import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';-import 'package:app_flowy/plugins/grid/application/row/row_data_controller.dart';-import 'package:app_flowy/plugins/grid/grid.dart';-import 'package:app_flowy/workspace/application/app/app_service.dart';+import 'package:appflowy/plugins/database_view/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';+import 'package:appflowy/plugins/database_view/application/field/field_editor_bloc.dart';+import 'package:appflowy/plugins/database_view/application/field/field_service.dart';+import 'package:appflowy/plugins/database_view/application/field/type_option/type_option_context.dart';+import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';+import 'package:appflowy/plugins/database_view/application/row/row_data_controller.dart';+import 'package:appflowy/plugins/database_view/grid/application/grid_data_controller.dart';+import 'package:appflowy/plugins/database_view/grid/application/row/row_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/grid.dart';+import 'package:appflowy/workspace/application/app/app_service.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';@@ -16,7 +16,7 @@ import '../../util.dart';class GridTestContext {final ViewPB gridView;- final GridController gridController;+ final DatabaseController gridController;GridTestContext(this.gridView, this.gridController);@@ -26,7 +26,7 @@ class GridTestContext {List<FieldInfo> get fieldContexts => fieldController.fieldInfos;- GridFieldController get fieldController {+ FieldController get fieldController {return gridController.fieldController;}@@ -49,18 +49,18 @@ class GridTestContext {fieldName: fieldInfo?.name ?? '',isGroupField: fieldInfo?.isGroupField ?? false,loader: loader,- databaseId: gridView.id,+ viewId: gridView.id,);return editorBloc;}- Future<GridCellController> makeCellController(+ Future<CellController> makeCellController(String fieldId, int rowIndex) async {final builder = await makeCellControllerBuilder(fieldId, rowIndex);return builder.build();}- Future<GridCellControllerBuilder> makeCellControllerBuilder(+ Future<CellControllerBuilder> makeCellControllerBuilder(String fieldId,int rowIndex,) async {@@ -80,8 +80,8 @@ class GridTestContext {)..add(const RowEvent.initial());await gridResponseFuture();- return GridCellControllerBuilder(- cellId: rowBloc.state.gridCellMap[fieldId]!,+ return CellControllerBuilder(+ cellId: rowBloc.state.cellByFieldId[fieldId]!,cellCache: rowCache.cellCache,delegate: rowDataController,);@@ -102,9 +102,9 @@ class GridTestContext {return fieldInfo;}- GridFieldCellContext singleSelectFieldCellContext() {+ FieldCellContext singleSelectFieldCellContext() {final field = singleSelectFieldContext().field;- return GridFieldCellContext(viewId: gridView.id, field: field);+ return FieldCellContext(viewId: gridView.id, field: field);}FieldInfo textFieldContext() {@@ -119,7 +119,7 @@ class GridTestContext {return fieldInfo;}- Future<GridSelectOptionCellController> makeSelectOptionCellController(+ Future<SelectOptionCellController> makeSelectOptionCellController(FieldType fieldType, int rowIndex) async {assert(fieldType == FieldType.SingleSelect ||fieldType == FieldType.MultiSelect);@@ -127,24 +127,23 @@ class GridTestContext {final field =fieldContexts.firstWhere((element) => element.fieldType == fieldType);final cellController = await makeCellController(field.id, rowIndex)- as GridSelectOptionCellController;+ as SelectOptionCellController;return cellController;}- Future<GridTextCellController> makeTextCellController(int rowIndex) async {+ Future<TextCellController> makeTextCellController(int rowIndex) async {final field = fieldContexts.firstWhere((element) => element.fieldType == FieldType.RichText);final cellController =- await makeCellController(field.id, rowIndex) as GridTextCellController;+ await makeCellController(field.id, rowIndex) as TextCellController;return cellController;}- Future<GridTextCellController> makeCheckboxCellController(- int rowIndex) async {+ Future<TextCellController> makeCheckboxCellController(int rowIndex) async {final field = fieldContexts.firstWhere((element) => element.fieldType == FieldType.Checkbox);final cellController =- await makeCellController(field.id, rowIndex) as GridTextCellController;+ await makeCellController(field.id, rowIndex) as TextCellController;return cellController;}}@@ -167,13 +166,12 @@ class AppFlowyGridTest {.createView(appId: app.id,name: "Test Grid",- dataFormatType: builder.dataFormatType,layoutType: builder.layoutType!,).then((result) {return result.fold((view) async {- final context = GridTestContext(view, GridController(view: view));+ final context = GridTestContext(view, DatabaseController(view: view));final result = await context.gridController.openGrid();result.fold((l) => null, (r) => throw Exception(r));return context;@@ -207,7 +205,7 @@ class AppFlowyGridCellTest {await context.createRow();}- Future<GridSelectOptionCellController> makeSelectOptionCellController(+ Future<SelectOptionCellController> makeSelectOptionCellController(FieldType fieldType, int rowIndex) async {return await context.makeSelectOptionCellController(fieldType, rowIndex);}diff --git a/frontend/app_flowy/test/bloc_test/home_test/app_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/app_bloc_test.dartsimilarity index 94%rename from frontend/app_flowy/test/bloc_test/home_test/app_bloc_test.dartrename to frontend/appflowy_flutter/test/bloc_test/home_test/app_bloc_test.dartindex 4929e125c0..69ef8eb1e4 100644--- a/frontend/app_flowy/test/bloc_test/home_test/app_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/app_bloc_test.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/plugins/document/application/doc_bloc.dart';-import 'package:app_flowy/plugins/document/document.dart';-import 'package:app_flowy/plugins/grid/grid.dart';-import 'package:app_flowy/workspace/application/app/app_bloc.dart';-import 'package:app_flowy/workspace/application/menu/menu_view_section_bloc.dart';+import 'package:appflowy/plugins/database_view/grid/grid.dart';+import 'package:appflowy/plugins/document/application/doc_bloc.dart';+import 'package:appflowy/plugins/document/document.dart';+import 'package:appflowy/workspace/application/app/app_bloc.dart';+import 'package:appflowy/workspace/application/menu/menu_view_section_bloc.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:flutter_test/flutter_test.dart';import '../../util.dart';diff --git a/frontend/app_flowy/test/bloc_test/home_test/create_page_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/create_page_test.dartsimilarity index 86%rename from frontend/app_flowy/test/bloc_test/home_test/create_page_test.dartrename to frontend/appflowy_flutter/test/bloc_test/home_test/create_page_test.dartindex 0a66b4df86..978f168df6 100644--- a/frontend/app_flowy/test/bloc_test/home_test/create_page_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/create_page_test.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/plugins/board/board.dart';-import 'package:app_flowy/plugins/calendar/calendar.dart';-import 'package:app_flowy/plugins/document/document.dart';-import 'package:app_flowy/plugins/grid/grid.dart';-import 'package:app_flowy/workspace/application/app/app_bloc.dart';+import 'package:appflowy/plugins/database_view/calendar/calendar.dart';+import 'package:appflowy/plugins/database_view/board/board.dart';+import 'package:appflowy/plugins/database_view/grid/grid.dart';+import 'package:appflowy/plugins/document/document.dart';+import 'package:appflowy/workspace/application/app/app_bloc.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flutter_test/flutter_test.dart';import '../../util.dart';diff --git a/frontend/app_flowy/test/bloc_test/home_test/home_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/home_bloc_test.dartsimilarity index 86%rename from frontend/app_flowy/test/bloc_test/home_test/home_bloc_test.dartrename to frontend/appflowy_flutter/test/bloc_test/home_test/home_bloc_test.dartindex 8388983470..ef42b59fc0 100644--- a/frontend/app_flowy/test/bloc_test/home_test/home_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/home_bloc_test.dart@@ -1,7 +1,7 @@-import 'package:app_flowy/plugins/document/application/doc_bloc.dart';-import 'package:app_flowy/plugins/document/document.dart';-import 'package:app_flowy/workspace/application/app/app_bloc.dart';-import 'package:app_flowy/workspace/application/home/home_bloc.dart';+import 'package:appflowy/plugins/document/application/doc_bloc.dart';+import 'package:appflowy/plugins/document/document.dart';+import 'package:appflowy/workspace/application/app/app_bloc.dart';+import 'package:appflowy/workspace/application/home/home_bloc.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:flutter_test/flutter_test.dart';diff --git a/frontend/app_flowy/test/bloc_test/home_test/menu_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/menu_bloc_test.dartsimilarity index 94%rename from frontend/app_flowy/test/bloc_test/home_test/menu_bloc_test.dartrename to frontend/appflowy_flutter/test/bloc_test/home_test/menu_bloc_test.dartindex 42d5187aa7..252cbc9f4f 100644--- a/frontend/app_flowy/test/bloc_test/home_test/menu_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/menu_bloc_test.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/workspace/application/menu/menu_bloc.dart';+import 'package:appflowy/workspace/application/menu/menu_bloc.dart';import 'package:flutter_test/flutter_test.dart';import '../../util.dart';diff --git a/frontend/app_flowy/test/bloc_test/home_test/trash_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/trash_bloc_test.dartsimilarity index 94%rename from frontend/app_flowy/test/bloc_test/home_test/trash_bloc_test.dartrename to frontend/appflowy_flutter/test/bloc_test/home_test/trash_bloc_test.dartindex 1ec9b533c3..da7d0159d3 100644--- a/frontend/app_flowy/test/bloc_test/home_test/trash_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/trash_bloc_test.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/document/document.dart';-import 'package:app_flowy/plugins/trash/application/trash_bloc.dart';-import 'package:app_flowy/workspace/application/app/app_bloc.dart';+import 'package:appflowy/plugins/document/document.dart';+import 'package:appflowy/plugins/trash/application/trash_bloc.dart';+import 'package:appflowy/workspace/application/app/app_bloc.dart';import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:flutter_test/flutter_test.dart';diff --git a/frontend/app_flowy/test/bloc_test/home_test/view_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dartsimilarity index 90%rename from frontend/app_flowy/test/bloc_test/home_test/view_bloc_test.dartrename to frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dartindex 082fe0fc21..cc4c5ec832 100644--- a/frontend/app_flowy/test/bloc_test/home_test/view_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart@@ -1,6 +1,6 @@-import 'package:app_flowy/plugins/document/document.dart';-import 'package:app_flowy/workspace/application/app/app_bloc.dart';-import 'package:app_flowy/workspace/application/view/view_bloc.dart';+import 'package:appflowy/plugins/document/document.dart';+import 'package:appflowy/workspace/application/app/app_bloc.dart';+import 'package:appflowy/workspace/application/view/view_bloc.dart';import 'package:flutter_test/flutter_test.dart';import '../../util.dart';diff --git a/frontend/app_flowy/test/unit_test/editor/share_markdown_test.dart b/frontend/appflowy_flutter/test/unit_test/editor/share_markdown_test.dartsimilarity index 85%rename from frontend/app_flowy/test/unit_test/editor/share_markdown_test.dartrename to frontend/appflowy_flutter/test/unit_test/editor/share_markdown_test.dartindex 452537f55c..77311f395d 100644--- a/frontend/app_flowy/test/unit_test/editor/share_markdown_test.dart+++ b/frontend/appflowy_flutter/test/unit_test/editor/share_markdown_test.dart@@ -1,7 +1,7 @@import 'dart:convert';-import 'package:app_flowy/plugins/document/presentation/plugins/parsers/divider_node_parser.dart';-import 'package:app_flowy/plugins/document/presentation/plugins/parsers/math_equation_node_parser.dart';+import 'package:appflowy/plugins/document/presentation/plugins/parsers/divider_node_parser.dart';+import 'package:appflowy/plugins/document/presentation/plugins/parsers/math_equation_node_parser.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter_test/flutter_test.dart';diff --git a/frontend/app_flowy/test/unit_test/select_option_split_text_input.dart b/frontend/appflowy_flutter/test/unit_test/select_option_split_text_input.dartsimilarity index 91%rename from frontend/app_flowy/test/unit_test/select_option_split_text_input.dartrename to frontend/appflowy_flutter/test/unit_test/select_option_split_text_input.dartindex 892b0dba91..75d5053112 100644--- a/frontend/app_flowy/test/unit_test/select_option_split_text_input.dart+++ b/frontend/appflowy_flutter/test/unit_test/select_option_split_text_input.dart@@ -1,4 +1,4 @@-import 'package:app_flowy/plugins/grid/presentation/widgets/cell/select_option_cell/text_field.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/text_field.dart';import 'package:flutter_test/flutter_test.dart';void main() {diff --git a/frontend/app_flowy/test/util.dart b/frontend/appflowy_flutter/test/util.dartsimilarity index 87%rename from frontend/app_flowy/test/util.dartrename to frontend/appflowy_flutter/test/util.dartindex 1069a84b0f..93340ddb72 100644--- a/frontend/app_flowy/test/util.dart+++ b/frontend/appflowy_flutter/test/util.dart@@ -1,8 +1,8 @@-import 'package:app_flowy/startup/launch_configuration.dart';-import 'package:app_flowy/startup/startup.dart';-import 'package:app_flowy/user/application/auth_service.dart';-import 'package:app_flowy/user/application/user_service.dart';-import 'package:app_flowy/workspace/application/workspace/workspace_service.dart';+import 'package:appflowy/startup/launch_configuration.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/user/application/auth_service.dart';+import 'package:appflowy/user/application/user_service.dart';+import 'package:appflowy/workspace/application/workspace/workspace_service.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/uuid.dart';import 'package:appflowy_backend/protobuf/flowy-folder/app.pb.dart';@@ -12,7 +12,7 @@ import 'package:flutter/material.dart';import 'package:flutter/services.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:app_flowy/main.dart';+import 'package:appflowy/main.dart';import 'package:shared_preferences/shared_preferences.dart';class AppFlowyIntegrateTest {@@ -26,7 +26,7 @@ class AppFlowyIntegrateTest {class AppFlowyUnitTest {late UserProfilePB userProfile;- late UserService userService;+ late UserBackendService userService;late WorkspaceService workspaceService;late List<WorkspacePB> workspaces;@@ -59,7 +59,7 @@ class AppFlowyUnitTest {return result.fold((user) {userProfile = user;- userService = UserService(userId: userProfile.id);+ userService = UserBackendService(userId: userProfile.id);},(error) {},);diff --git a/frontend/app_flowy/test/widget_test/select_option_text_field_test.dart b/frontend/appflowy_flutter/test/widget_test/select_option_text_field_test.dartsimilarity index 94%rename from frontend/app_flowy/test/widget_test/select_option_text_field_test.dartrename to frontend/appflowy_flutter/test/widget_test/select_option_text_field_test.dartindex f8f7c982f9..76cae8d2d2 100644--- a/frontend/app_flowy/test/widget_test/select_option_text_field_test.dart+++ b/frontend/appflowy_flutter/test/widget_test/select_option_text_field_test.dart@@ -1,6 +1,6 @@import 'dart:collection';-import 'package:app_flowy/plugins/grid/presentation/widgets/cell/select_option_cell/text_field.dart';+import 'package:appflowy/plugins/database_view/grid/presentation/widgets/cell/select_option_cell/text_field.dart';import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';diff --git a/frontend/app_flowy/web/favicon.png b/frontend/appflowy_flutter/web/favicon.pngsimilarity index 100%rename from frontend/app_flowy/web/favicon.pngrename to frontend/appflowy_flutter/web/favicon.pngdiff --git a/frontend/app_flowy/web/icons/Icon-192.png b/frontend/appflowy_flutter/web/icons/Icon-192.pngsimilarity index 100%rename from frontend/app_flowy/web/icons/Icon-192.pngrename to frontend/appflowy_flutter/web/icons/Icon-192.pngdiff --git a/frontend/app_flowy/web/icons/Icon-512.png b/frontend/appflowy_flutter/web/icons/Icon-512.pngsimilarity index 100%rename from frontend/app_flowy/web/icons/Icon-512.pngrename to frontend/appflowy_flutter/web/icons/Icon-512.pngdiff --git a/frontend/app_flowy/web/icons/Icon-maskable-192.png b/frontend/appflowy_flutter/web/icons/Icon-maskable-192.pngsimilarity index 100%rename from frontend/app_flowy/web/icons/Icon-maskable-192.pngrename to frontend/appflowy_flutter/web/icons/Icon-maskable-192.pngdiff --git a/frontend/app_flowy/web/icons/Icon-maskable-512.png b/frontend/appflowy_flutter/web/icons/Icon-maskable-512.pngsimilarity index 100%rename from frontend/app_flowy/web/icons/Icon-maskable-512.pngrename to frontend/appflowy_flutter/web/icons/Icon-maskable-512.pngdiff --git a/frontend/app_flowy/web/index.html b/frontend/appflowy_flutter/web/index.htmlsimilarity index 97%rename from frontend/app_flowy/web/index.htmlrename to frontend/appflowy_flutter/web/index.htmlindex 284a6312ec..5ce9ee11a8 100644--- a/frontend/app_flowy/web/index.html+++ b/frontend/appflowy_flutter/web/index.html@@ -23,10 +23,10 @@<!-- iOS meta tags & icons --><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black">- <meta name="apple-mobile-web-app-title" content="app_flowy">+ <meta name="apple-mobile-web-app-title" content="appflowy_flutter"><link rel="apple-touch-icon" href="icons/Icon-192.png">- <title>app_flowy</title>+ <title>appflowy_flutter</title><link rel="manifest" href="manifest.json"></head><body>diff --git a/frontend/app_flowy/web/manifest.json b/frontend/appflowy_flutter/web/manifest.jsonsimilarity index 88%rename from frontend/app_flowy/web/manifest.jsonrename to frontend/appflowy_flutter/web/manifest.jsonindex 05b16ccb95..d3a5afc3df 100644--- a/frontend/app_flowy/web/manifest.json+++ b/frontend/appflowy_flutter/web/manifest.json@@ -1,6 +1,6 @@{- "name": "app_flowy",- "short_name": "app_flowy",+ "name": "appflowy_flutter",+ "short_name": "appflowy_flutter","start_url": ".","display": "standalone","background_color": "#0175C2",diff --git a/frontend/app_flowy/windows/.gitignore b/frontend/appflowy_flutter/windows/.gitignoresimilarity index 100%rename from frontend/app_flowy/windows/.gitignorerename to frontend/appflowy_flutter/windows/.gitignorediff --git a/frontend/app_flowy/windows/CMakeLists.txt b/frontend/appflowy_flutter/windows/CMakeLists.txtsimilarity index 97%rename from frontend/app_flowy/windows/CMakeLists.txtrename to frontend/appflowy_flutter/windows/CMakeLists.txtindex 8cd643ca40..066bfe709e 100644--- a/frontend/app_flowy/windows/CMakeLists.txt+++ b/frontend/appflowy_flutter/windows/CMakeLists.txt@@ -1,7 +1,7 @@cmake_minimum_required(VERSION 3.14)-project(app_flowy LANGUAGES CXX)+project(appflowy_flutter LANGUAGES CXX)-set(BINARY_NAME "app_flowy")+set(BINARY_NAME "appflowy_flutter")cmake_policy(SET CMP0063 NEW)diff --git a/frontend/app_flowy/windows/flutter/CMakeLists.txt b/frontend/appflowy_flutter/windows/flutter/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/windows/flutter/CMakeLists.txtrename to frontend/appflowy_flutter/windows/flutter/CMakeLists.txtdiff --git a/frontend/app_flowy/windows/runner/CMakeLists.txt b/frontend/appflowy_flutter/windows/runner/CMakeLists.txtsimilarity index 100%rename from frontend/app_flowy/windows/runner/CMakeLists.txtrename to frontend/appflowy_flutter/windows/runner/CMakeLists.txtdiff --git a/frontend/app_flowy/windows/runner/Runner.rc b/frontend/appflowy_flutter/windows/runner/Runner.rcsimilarity index 93%rename from frontend/app_flowy/windows/runner/Runner.rcrename to frontend/appflowy_flutter/windows/runner/Runner.rcindex 2b19c08c34..1f8c964ed2 100644--- a/frontend/app_flowy/windows/runner/Runner.rc+++ b/frontend/appflowy_flutter/windows/runner/Runner.rc@@ -92,10 +92,10 @@ BEGINVALUE "CompanyName", "com.example" "\0"VALUE "FileDescription", "AppFlowy" "\0"VALUE "FileVersion", VERSION_AS_STRING "\0"- VALUE "InternalName", "app_flowy" "\0"+ VALUE "InternalName", "appflowy_flutter" "\0"VALUE "LegalCopyright", "Copyright (C) 2021 com.example. All rights reserved." "\0"- VALUE "OriginalFilename", "app_flowy.exe" "\0"- VALUE "ProductName", "app_flowy" "\0"+ VALUE "OriginalFilename", "appflowy_flutter.exe" "\0"+ VALUE "ProductName", "appflowy_flutter" "\0"VALUE "ProductVersion", VERSION_AS_STRING "\0"ENDENDdiff --git a/frontend/app_flowy/windows/runner/flutter_window.cpp b/frontend/appflowy_flutter/windows/runner/flutter_window.cppsimilarity index 100%rename from frontend/app_flowy/windows/runner/flutter_window.cpprename to frontend/appflowy_flutter/windows/runner/flutter_window.cppdiff --git a/frontend/app_flowy/windows/runner/flutter_window.h b/frontend/appflowy_flutter/windows/runner/flutter_window.hsimilarity index 100%rename from frontend/app_flowy/windows/runner/flutter_window.hrename to frontend/appflowy_flutter/windows/runner/flutter_window.hdiff --git a/frontend/app_flowy/windows/runner/main.cpp b/frontend/appflowy_flutter/windows/runner/main.cppsimilarity index 94%rename from frontend/app_flowy/windows/runner/main.cpprename to frontend/appflowy_flutter/windows/runner/main.cppindex 7e58d9fad1..8f38159b86 100644--- a/frontend/app_flowy/windows/runner/main.cpp+++ b/frontend/appflowy_flutter/windows/runner/main.cpp@@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,FlutterWindow window(project);Win32Window::Point origin(10, 10);Win32Window::Size size(1280, 720);- if (!window.CreateAndShow(L"app_flowy", origin, size)) {+ if (!window.CreateAndShow(L"appflowy_flutter", origin, size)) {return EXIT_FAILURE;}window.SetQuitOnClose(true);diff --git a/frontend/app_flowy/windows/runner/resource.h b/frontend/appflowy_flutter/windows/runner/resource.hsimilarity index 100%rename from frontend/app_flowy/windows/runner/resource.hrename to frontend/appflowy_flutter/windows/runner/resource.hdiff --git a/frontend/app_flowy/windows/runner/resources/app_icon.ico b/frontend/appflowy_flutter/windows/runner/resources/app_icon.icosimilarity index 100%rename from frontend/app_flowy/windows/runner/resources/app_icon.icorename to frontend/appflowy_flutter/windows/runner/resources/app_icon.icodiff --git a/frontend/app_flowy/windows/runner/runner.exe.manifest b/frontend/appflowy_flutter/windows/runner/runner.exe.manifestsimilarity index 100%rename from frontend/app_flowy/windows/runner/runner.exe.manifestrename to frontend/appflowy_flutter/windows/runner/runner.exe.manifestdiff --git a/frontend/app_flowy/windows/runner/utils.cpp b/frontend/appflowy_flutter/windows/runner/utils.cppsimilarity index 100%rename from frontend/app_flowy/windows/runner/utils.cpprename to frontend/appflowy_flutter/windows/runner/utils.cppdiff --git a/frontend/app_flowy/windows/runner/utils.h b/frontend/appflowy_flutter/windows/runner/utils.hsimilarity index 100%rename from frontend/app_flowy/windows/runner/utils.hrename to frontend/appflowy_flutter/windows/runner/utils.hdiff --git a/frontend/app_flowy/windows/runner/win32_window.cpp b/frontend/appflowy_flutter/windows/runner/win32_window.cppsimilarity index 100%rename from frontend/app_flowy/windows/runner/win32_window.cpprename to frontend/appflowy_flutter/windows/runner/win32_window.cppdiff --git a/frontend/app_flowy/windows/runner/win32_window.h b/frontend/appflowy_flutter/windows/runner/win32_window.hsimilarity index 100%rename from frontend/app_flowy/windows/runner/win32_window.hrename to frontend/appflowy_flutter/windows/runner/win32_window.hdiff --git a/frontend/appflowy_tauri/vite.config.ts b/frontend/appflowy_tauri/vite.config.tsindex 7c4a242b09..b155feb0be 100644--- a/frontend/appflowy_tauri/vite.config.ts+++ b/frontend/appflowy_tauri/vite.config.ts@@ -4,7 +4,7 @@ import react from '@vitejs/plugin-react';// https://vitejs.dev/config/export default defineConfig({plugins: [react()],- publicDir: '../app_flowy/assets',+ publicDir: '../appflowy_flutter/assets',// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`// prevent vite from obscuring rust errorsclearScreen: false,diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex 075fac5a0b..b0dee4757a 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -1014,6 +1014,8 @@ dependencies = ["lib-ws","parking_lot 0.12.1","revision-model",+ "serde",+ "serde_json","tokio","tracing","user-model",diff --git a/frontend/rust-lib/flowy-client-sync/src/client_database/database_revision_pad.rs b/frontend/rust-lib/flowy-client-sync/src/client_database/database_revision_pad.rsindex 4fbddc4eb0..c9741b0200 100644--- a/frontend/rust-lib/flowy-client-sync/src/client_database/database_revision_pad.rs+++ b/frontend/rust-lib/flowy-client-sync/src/client_database/database_revision_pad.rs@@ -57,8 +57,7 @@ impl DatabaseRevisionPad {pub fn from_operations(operations: DatabaseOperations) -> SyncResult<Self> {let content = operations.content()?;let database_rev: DatabaseRevision = serde_json::from_str(&content).map_err(|e| {- let msg = format!("Deserialize operations to grid failed: {}", e);- tracing::error!("{}", msg);+ let msg = format!("Deserialize operations to database failed: {}", e);SyncError::internal().context(msg)})?;diff --git a/frontend/rust-lib/flowy-client-sync/src/client_database/database_view_revision_pad.rs b/frontend/rust-lib/flowy-client-sync/src/client_database/database_view_revision_pad.rsindex adf3579067..6859364d67 100644--- a/frontend/rust-lib/flowy-client-sync/src/client_database/database_view_revision_pad.rs+++ b/frontend/rust-lib/flowy-client-sync/src/client_database/database_view_revision_pad.rs@@ -10,13 +10,13 @@ use lib_ot::core::{DeltaBuilder, DeltaOperations, EmptyAttributes, OperationTranuse revision_model::Revision;use std::sync::Arc;-pub type GridViewOperations = DeltaOperations<EmptyAttributes>;-pub type GridViewOperationsBuilder = DeltaBuilder;+pub type DatabaseViewOperations = DeltaOperations<EmptyAttributes>;+pub type DatabaseViewOperationsBuilder = DeltaBuilder;#[derive(Debug, Clone)]pub struct DatabaseViewRevisionPad {view: Arc<DatabaseViewRevision>,- operations: GridViewOperations,+ operations: DatabaseViewOperations,}impl std::ops::Deref for DatabaseViewRevisionPad {@@ -30,14 +30,20 @@ impl std::ops::Deref for DatabaseViewRevisionPad {impl DatabaseViewRevisionPad {// For the moment, the view_id is equal to grid_id. The database_id represents the database id.// A database can be referenced by multiple views.- pub fn new(database_id: String, view_id: String, layout: LayoutRevision) -> Self {- let view = Arc::new(DatabaseViewRevision::new(database_id, view_id, layout));+ pub fn new(database_id: String, view_id: String, name: String, layout: LayoutRevision) -> Self {+ let view = Arc::new(DatabaseViewRevision::new(+ database_id,+ view_id,+ true,+ name,+ layout,+ ));let json = serde_json::to_string(&view).unwrap();- let operations = GridViewOperationsBuilder::new().insert(&json).build();+ let operations = DatabaseViewOperationsBuilder::new().insert(&json).build();Self { view, operations }}- pub fn from_operations(operations: GridViewOperations) -> SyncResult<Self> {+ pub fn from_operations(operations: DatabaseViewOperations) -> SyncResult<Self> {if operations.is_empty() {return Err(SyncError::record_not_found().context("Unexpected empty operations"));}@@ -54,7 +60,7 @@ impl DatabaseViewRevisionPad {}pub fn from_revisions(revisions: Vec<Revision>) -> SyncResult<Self> {- let operations: GridViewOperations = make_operations_from_revisions(revisions)?;+ let operations: DatabaseViewOperations = make_operations_from_revisions(revisions)?;Self::from_operations(operations)}@@ -75,7 +81,7 @@ impl DatabaseViewRevisionPad {field_id: &str,field_type: &FieldTypeRevision,group_configuration_rev: GroupConfigurationRevision,- ) -> SyncResult<Option<GridViewRevisionChangeset>> {+ ) -> SyncResult<Option<DatabaseViewRevisionChangeset>> {self.modify(|view| {// Only save one groupview.groups.clear();@@ -98,7 +104,7 @@ impl DatabaseViewRevisionPad {field_type: &FieldTypeRevision,configuration_id: &str,mut_configuration_fn: F,- ) -> SyncResult<Option<GridViewRevisionChangeset>> {+ ) -> SyncResult<Option<DatabaseViewRevisionChangeset>> {self.modify(|view| match view.groups.get_mut_objects(field_id, field_type) {None => Ok(None),@@ -120,7 +126,7 @@ impl DatabaseViewRevisionPad {group_id: &str,field_id: &str,field_type: &FieldTypeRevision,- ) -> SyncResult<Option<GridViewRevisionChangeset>> {+ ) -> SyncResult<Option<DatabaseViewRevisionChangeset>> {self.modify(|view| {if let Some(groups) = view.groups.get_mut_objects(field_id, field_type) {groups.retain(|group| group.id != group_id);@@ -162,7 +168,7 @@ impl DatabaseViewRevisionPad {&mut self,field_id: &str,sort_rev: SortRevision,- ) -> SyncResult<Option<GridViewRevisionChangeset>> {+ ) -> SyncResult<Option<DatabaseViewRevisionChangeset>> {self.modify(|view| {let field_type = sort_rev.field_type;view.sorts.add_object(field_id, &field_type, sort_rev);@@ -174,7 +180,7 @@ impl DatabaseViewRevisionPad {&mut self,field_id: &str,sort_rev: SortRevision,- ) -> SyncResult<Option<GridViewRevisionChangeset>> {+ ) -> SyncResult<Option<DatabaseViewRevisionChangeset>> {self.modify(|view| {if let Some(sort) = view.sorts@@ -196,7 +202,7 @@ impl DatabaseViewRevisionPad {sort_id: &str,field_id: &str,field_type: T,- ) -> SyncResult<Option<GridViewRevisionChangeset>> {+ ) -> SyncResult<Option<DatabaseViewRevisionChangeset>> {let field_type = field_type.into();self.modify(|view| {if let Some(sorts) = view.sorts.get_mut_objects(field_id, &field_type) {@@ -208,7 +214,7 @@ impl DatabaseViewRevisionPad {})}- pub fn delete_all_sorts(&mut self) -> SyncResult<Option<GridViewRevisionChangeset>> {+ pub fn delete_all_sorts(&mut self) -> SyncResult<Option<DatabaseViewRevisionChangeset>> {self.modify(|view| {view.sorts.clear();Ok(Some(()))@@ -246,7 +252,7 @@ impl DatabaseViewRevisionPad {&mut self,field_id: &str,filter_rev: FilterRevision,- ) -> SyncResult<Option<GridViewRevisionChangeset>> {+ ) -> SyncResult<Option<DatabaseViewRevisionChangeset>> {self.modify(|view| {let field_type = filter_rev.field_type;view.filters.add_object(field_id, &field_type, filter_rev);@@ -258,7 +264,7 @@ impl DatabaseViewRevisionPad {&mut self,field_id: &str,filter_rev: FilterRevision,- ) -> SyncResult<Option<GridViewRevisionChangeset>> {+ ) -> SyncResult<Option<DatabaseViewRevisionChangeset>> {self.modify(|view| {if let Some(filter) =view@@ -282,7 +288,7 @@ impl DatabaseViewRevisionPad {filter_id: &str,field_id: &str,field_type: T,- ) -> SyncResult<Option<GridViewRevisionChangeset>> {+ ) -> SyncResult<Option<DatabaseViewRevisionChangeset>> {let field_type = field_type.into();self.modify(|view| {if let Some(filters) = view.filters.get_mut_objects(field_id, &field_type) {@@ -310,7 +316,7 @@ impl DatabaseViewRevisionPad {&mut self,layout: &LayoutRevision,settings: &T,- ) -> SyncResult<Option<GridViewRevisionChangeset>>+ ) -> SyncResult<Option<DatabaseViewRevisionChangeset>>whereT: serde::Serialize,{@@ -322,14 +328,14 @@ impl DatabaseViewRevisionPad {}pub fn json_str(&self) -> SyncResult<String> {- make_grid_view_rev_json_str(&self.view)+ make_database_view_rev_json_str(&self.view)}pub fn layout(&self) -> LayoutRevision {self.layout.clone()}- fn modify<F>(&mut self, f: F) -> SyncResult<Option<GridViewRevisionChangeset>>+ fn modify<F>(&mut self, f: F) -> SyncResult<Option<DatabaseViewRevisionChangeset>>whereF: FnOnce(&mut DatabaseViewRevision) -> SyncResult<Option<()>>,{@@ -337,14 +343,14 @@ impl DatabaseViewRevisionPad {match f(Arc::make_mut(&mut self.view))? {None => Ok(None),Some(_) => {- let old = make_grid_view_rev_json_str(&cloned_view)?;+ let old = make_database_view_rev_json_str(&cloned_view)?;let new = self.json_str()?;match cal_diff::<EmptyAttributes>(old, new) {None => Ok(None),Some(operations) => {self.operations = self.operations.compose(&operations)?;let md5 = md5(&self.operations.json_bytes());- Ok(Some(GridViewRevisionChangeset { operations, md5 }))+ Ok(Some(DatabaseViewRevisionChangeset { operations, md5 }))},}},@@ -353,19 +359,19 @@ impl DatabaseViewRevisionPad {}#[derive(Debug)]-pub struct GridViewRevisionChangeset {- pub operations: GridViewOperations,+pub struct DatabaseViewRevisionChangeset {+ pub operations: DatabaseViewOperations,pub md5: String,}-pub fn make_grid_view_rev_json_str(grid_revision: &DatabaseViewRevision) -> SyncResult<String> {+pub fn make_database_view_rev_json_str(grid_revision: &DatabaseViewRevision) -> SyncResult<String> {let json = serde_json::to_string(grid_revision).map_err(|err| {internal_sync_error(format!("Serialize grid view to json str failed. {:?}", err))})?;Ok(json)}-pub fn make_grid_view_operations(grid_view: &DatabaseViewRevision) -> GridViewOperations {+pub fn make_database_view_operations(grid_view: &DatabaseViewRevision) -> DatabaseViewOperations {let json = serde_json::to_string(grid_view).unwrap();- GridViewOperationsBuilder::new().insert(&json).build()+ DatabaseViewOperationsBuilder::new().insert(&json).build()}diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.tomlindex 9b40c20b38..81cba6ff23 100644--- a/frontend/rust-lib/flowy-core/Cargo.toml+++ b/frontend/rust-lib/flowy-core/Cargo.toml@@ -31,6 +31,8 @@ revision-model = { path = "../../../shared-lib/revision-model" }ws-model = { path = "../../../shared-lib/ws-model" }lib-ws = { path = "../../../shared-lib/lib-ws" }lib-infra = { path = "../../../shared-lib/lib-infra" }+serde = "1.0"+serde_json = "1.0"[features]default = ["rev-sqlite"]diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rsindex a0c0970df0..b7f1fd7987 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rs@@ -4,10 +4,11 @@ use flowy_sqlite::ConnectionPool;use database_model::BuildDatabaseContext;use flowy_client_ws::FlowyWebSocketConnect;use flowy_database::entities::LayoutTypePB;-use flowy_database::manager::{make_database_view_data, DatabaseManager};+use flowy_database::manager::{create_new_database, link_existing_database, DatabaseManager};use flowy_database::util::{make_default_board, make_default_calendar, make_default_grid};use flowy_document::editor::make_transaction_from_document_content;use flowy_document::DocumentManager;+use flowy_folder::entities::{ViewDataFormatPB, ViewLayoutTypePB, ViewPB};use flowy_folder::manager::{ViewDataProcessor, ViewDataProcessorMap};use flowy_folder::{@@ -86,7 +87,7 @@ fn make_view_data_processor(map.insert(data_type, document_processor.clone());});- let grid_data_impl = Arc::new(GridViewDataProcessor(database_manager));+ let grid_data_impl = Arc::new(DatabaseViewDataProcessor(database_manager));grid_data_impl.data_types().into_iter()@@ -166,33 +167,6 @@ impl WSMessageReceiver for FolderWSMessageReceiverImpl {struct DocumentViewDataProcessor(Arc<DocumentManager>);impl ViewDataProcessor for DocumentViewDataProcessor {- fn create_view(- &self,- _user_id: &str,- view_id: &str,- layout: ViewLayoutTypePB,- view_data: Bytes,- ) -> FutureResult<(), FlowyError> {- // Only accept Document type- debug_assert_eq!(layout, ViewLayoutTypePB::Document);- let view_data = match String::from_utf8(view_data.to_vec()) {- Ok(content) => match make_transaction_from_document_content(&content) {- Ok(transaction) => transaction.to_bytes().unwrap_or_else(|_| vec![]),- Err(_) => vec![],- },- Err(_) => vec![],- };-- let revision = Revision::initial_revision(view_id, Bytes::from(view_data));- let view_id = view_id.to_string();- let manager = self.0.clone();-- FutureResult::new(async move {- manager.create_document(view_id, vec![revision]).await?;- Ok(())- })- }-fn close_view(&self, view_id: &str) -> FutureResult<(), FlowyError> {let manager = self.0.clone();let view_id = view_id.to_string();@@ -212,13 +186,15 @@ impl ViewDataProcessor for DocumentViewDataProcessor {})}- fn create_default_view(+ fn create_view_with_build_in_data(&self,user_id: &str,view_id: &str,+ _name: &str,layout: ViewLayoutTypePB,_data_format: ViewDataFormatPB,- ) -> FutureResult<Bytes, FlowyError> {+ _ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError> {debug_assert_eq!(layout, ViewLayoutTypePB::Document);let _user_id = user_id.to_string();let view_id = view_id.to_string();@@ -226,53 +202,52 @@ impl ViewDataProcessor for DocumentViewDataProcessor {let document_content = self.0.initial_document_content();FutureResult::new(async move {let delta_data = Bytes::from(document_content);- let revision = Revision::initial_revision(&view_id, delta_data.clone());+ let revision = Revision::initial_revision(&view_id, delta_data);manager.create_document(view_id, vec![revision]).await?;- Ok(delta_data)+ Ok(())})}- fn create_view_with_data(+ fn create_view_with_custom_data(&self,_user_id: &str,- _view_id: &str,+ view_id: &str,+ _name: &str,data: Vec<u8>,layout: ViewLayoutTypePB,- ) -> FutureResult<Bytes, FlowyError> {+ _ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError> {debug_assert_eq!(layout, ViewLayoutTypePB::Document);- FutureResult::new(async move { Ok(Bytes::from(data)) })- }-- fn data_types(&self) -> Vec<ViewDataFormatPB> {- vec![ViewDataFormatPB::DeltaFormat, ViewDataFormatPB::NodeFormat]- }-}+ let view_data = match String::from_utf8(data) {+ Ok(content) => match make_transaction_from_document_content(&content) {+ Ok(transaction) => transaction.to_bytes().unwrap_or_else(|_| vec![]),+ Err(_) => vec![],+ },+ Err(_) => vec![],+ };-struct GridViewDataProcessor(Arc<DatabaseManager>);-impl ViewDataProcessor for GridViewDataProcessor {- fn create_view(- &self,- _user_id: &str,- view_id: &str,- _layout: ViewLayoutTypePB,- delta_data: Bytes,- ) -> FutureResult<(), FlowyError> {- let revision = Revision::initial_revision(view_id, delta_data);+ let revision = Revision::initial_revision(view_id, Bytes::from(view_data));let view_id = view_id.to_string();- let database_manager = self.0.clone();+ let manager = self.0.clone();+FutureResult::new(async move {- database_manager- .create_database(view_id, vec![revision])- .await?;+ manager.create_document(view_id, vec![revision]).await?;Ok(())})}+ fn data_types(&self) -> Vec<ViewDataFormatPB> {+ vec![ViewDataFormatPB::DeltaFormat, ViewDataFormatPB::NodeFormat]+ }+}++struct DatabaseViewDataProcessor(Arc<DatabaseManager>);+impl ViewDataProcessor for DatabaseViewDataProcessor {fn close_view(&self, view_id: &str) -> FutureResult<(), FlowyError> {let database_manager = self.0.clone();let view_id = view_id.to_string();FutureResult::new(async move {- database_manager.close_database(view_id).await?;+ database_manager.close_database_view(view_id).await?;Ok(())})}@@ -281,69 +256,106 @@ impl ViewDataProcessor for GridViewDataProcessor {let database_manager = self.0.clone();let view_id = view.id.clone();FutureResult::new(async move {- let editor = database_manager.open_database(view_id).await?;- let delta_bytes = editor.duplicate_database().await?;+ let editor = database_manager.open_database_view(&view_id).await?;+ let delta_bytes = editor.duplicate_database(&view_id).await?;Ok(delta_bytes.into())})}- fn create_default_view(+ /// Create a database view with build-in data.+ /// If the ext contains the {"database_id": "xx"}, then it will link to+ /// the existing database. The data of the database will be shared within+ /// these references views.+ fn create_view_with_build_in_data(&self,- user_id: &str,+ _user_id: &str,view_id: &str,+ name: &str,layout: ViewLayoutTypePB,data_format: ViewDataFormatPB,- ) -> FutureResult<Bytes, FlowyError> {+ ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError> {debug_assert_eq!(data_format, ViewDataFormatPB::DatabaseFormat);- let (build_context, layout) = match layout {- ViewLayoutTypePB::Grid => (make_default_grid(), LayoutTypePB::Grid),- ViewLayoutTypePB::Board => (make_default_board(), LayoutTypePB::Board),- ViewLayoutTypePB::Calendar => (make_default_calendar(), LayoutTypePB::Calendar),- ViewLayoutTypePB::Document => {- return FutureResult::new(async move {- Err(FlowyError::internal().context(format!("Can't handle {:?} layout type", layout)))- });- },- };-- let user_id = user_id.to_string();let view_id = view_id.to_string();+ let name = name.to_string();let database_manager = self.0.clone();- FutureResult::new(async move {- make_database_view_data(&user_id, &view_id, layout, database_manager, build_context).await- })+ match DatabaseExtParams::from_map(ext).map(|params| params.database_id) {+ None => {+ let (build_context, layout) = match layout {+ ViewLayoutTypePB::Grid => (make_default_grid(), LayoutTypePB::Grid),+ ViewLayoutTypePB::Board => (make_default_board(), LayoutTypePB::Board),+ ViewLayoutTypePB::Calendar => (make_default_calendar(), LayoutTypePB::Calendar),+ ViewLayoutTypePB::Document => {+ return FutureResult::new(async move {+ Err(FlowyError::internal().context(format!("Can't handle {:?} layout type", layout)))+ });+ },+ };+ FutureResult::new(async move {+ create_new_database(&view_id, name, layout, database_manager, build_context).await+ })+ },+ Some(database_id) => {+ let layout = layout_type_from_view_layout(layout);+ FutureResult::new(async move {+ link_existing_database(&view_id, name, &database_id, layout, database_manager).await+ })+ },+ }}- fn create_view_with_data(+ /// Create a database view with custom data.+ /// If the ext contains the {"database_id": "xx"}, then it will link+ /// to the existing database. The data of the database will be shared+ /// within these references views.+ fn create_view_with_custom_data(&self,- user_id: &str,+ _user_id: &str,view_id: &str,+ name: &str,data: Vec<u8>,layout: ViewLayoutTypePB,- ) -> FutureResult<Bytes, FlowyError> {- let user_id = user_id.to_string();+ ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError> {let view_id = view_id.to_string();let database_manager = self.0.clone();-- let layout = match layout {- ViewLayoutTypePB::Grid => LayoutTypePB::Grid,- ViewLayoutTypePB::Board => LayoutTypePB::Board,- ViewLayoutTypePB::Calendar => LayoutTypePB::Calendar,- ViewLayoutTypePB::Document => {- return FutureResult::new(async move {- Err(FlowyError::internal().context(format!("Can't handle {:?} layout type", layout)))- });- },- };-- FutureResult::new(async move {- let bytes = Bytes::from(data);- let build_context = BuildDatabaseContext::try_from(bytes)?;- make_database_view_data(&user_id, &view_id, layout, database_manager, build_context).await- })+ let layout = layout_type_from_view_layout(layout);+ let name = name.to_string();+ match DatabaseExtParams::from_map(ext).map(|params| params.database_id) {+ None => FutureResult::new(async move {+ let bytes = Bytes::from(data);+ let build_context = BuildDatabaseContext::try_from(bytes)?;+ let _ = create_new_database(&view_id, name, layout, database_manager, build_context).await;+ Ok(())+ }),+ Some(database_id) => FutureResult::new(async move {+ link_existing_database(&view_id, name, &database_id, layout, database_manager).await+ }),+ }}fn data_types(&self) -> Vec<ViewDataFormatPB> {vec![ViewDataFormatPB::DatabaseFormat]}}++fn layout_type_from_view_layout(layout: ViewLayoutTypePB) -> LayoutTypePB {+ match layout {+ ViewLayoutTypePB::Grid => LayoutTypePB::Grid,+ ViewLayoutTypePB::Board => LayoutTypePB::Board,+ ViewLayoutTypePB::Calendar => LayoutTypePB::Calendar,+ ViewLayoutTypePB::Document => LayoutTypePB::Grid,+ }+}++#[derive(Debug, serde::Deserialize)]+struct DatabaseExtParams {+ database_id: String,+}++impl DatabaseExtParams {+ pub fn from_map(map: HashMap<String, String>) -> Option<Self> {+ let value = serde_json::to_value(map).ok()?;+ serde_json::from_value::<Self>(value).ok()+ }+}diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rsindex a2f2ff118f..a728cc13f1 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/grid_deps.rs@@ -2,7 +2,7 @@ use crate::FlowyError;use bytes::Bytes;use flowy_client_ws::FlowyWebSocketConnect;use flowy_database::manager::{DatabaseManager, DatabaseUser};-use flowy_database::services::persistence::GridDatabase;+use flowy_database::services::persistence::DatabaseDBConnection;use flowy_revision::{RevisionWebSocket, WSStateReceiver};use flowy_sqlite::ConnectionPool;use flowy_task::TaskDispatcher;@@ -15,9 +15,9 @@ use std::sync::Arc;use tokio::sync::RwLock;use ws_model::ws_revision::ClientRevisionWSData;-pub struct GridDepsResolver();+pub struct DatabaseDepsResolver();-impl GridDepsResolver {+impl DatabaseDepsResolver {pub async fn resolve(ws_conn: Arc<FlowyWebSocketConnect>,user_session: Arc<UserSession>,@@ -25,27 +25,27 @@ impl GridDepsResolver {) -> Arc<DatabaseManager> {let user = Arc::new(GridUserImpl(user_session.clone()));let rev_web_socket = Arc::new(GridRevisionWebSocket(ws_conn));- let grid_manager = Arc::new(DatabaseManager::new(+ let database_manager = Arc::new(DatabaseManager::new(user.clone(),rev_web_socket,task_scheduler,- Arc::new(GridDatabaseImpl(user_session)),+ Arc::new(DatabaseDBConnectionImpl(user_session)),));if let (Ok(user_id), Ok(token)) = (user.user_id(), user.token()) {- match grid_manager.initialize(&user_id, &token).await {+ match database_manager.initialize(&user_id, &token).await {Ok(_) => {},Err(e) => tracing::error!("Initialize grid manager failed: {}", e),}}- grid_manager+ database_manager}}-struct GridDatabaseImpl(Arc<UserSession>);-impl GridDatabase for GridDatabaseImpl {- fn db_pool(&self) -> Result<Arc<ConnectionPool>, FlowyError> {+struct DatabaseDBConnectionImpl(Arc<UserSession>);+impl DatabaseDBConnection for DatabaseDBConnectionImpl {+ fn get_db_pool(&self) -> Result<Arc<ConnectionPool>, FlowyError> {self.0.db_pool()diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-core/src/lib.rsindex cde5a8cc65..17c21a7052 100644--- a/frontend/rust-lib/flowy-core/src/lib.rs+++ b/frontend/rust-lib/flowy-core/src/lib.rs@@ -112,7 +112,7 @@ pub struct AppFlowyCore {pub user_session: Arc<UserSession>,pub document_manager: Arc<DocumentManager>,pub folder_manager: Arc<FolderManager>,- pub grid_manager: Arc<DatabaseManager>,+ pub database_manager: Arc<DatabaseManager>,pub event_dispatcher: Arc<AFPluginDispatcher>,pub ws_conn: Arc<FlowyWebSocketConnect>,pub local_server: Option<Arc<LocalServer>>,@@ -130,7 +130,7 @@ impl AppFlowyCore {runtime.spawn(TaskRunner::run(task_dispatcher.clone()));let (local_server, ws_conn) = mk_local_server(&config.server_config);- let (user_session, document_manager, folder_manager, local_server, grid_manager) = runtime+ let (user_session, document_manager, folder_manager, local_server, database_manager) = runtime.block_on(async {let user_session = mk_user_session(&config, &local_server, &config.server_config);let document_manager = DocumentDepsResolver::resolve(@@ -141,7 +141,7 @@ impl AppFlowyCore {&config.document,);- let grid_manager = GridDepsResolver::resolve(+ let database_manager = DatabaseDepsResolver::resolve(ws_conn.clone(),user_session.clone(),task_dispatcher.clone(),@@ -154,7 +154,7 @@ impl AppFlowyCore {&config.server_config,&ws_conn,&document_manager,- &grid_manager,+ &database_manager,).await;@@ -167,14 +167,14 @@ impl AppFlowyCore {document_manager,folder_manager,local_server,- grid_manager,+ database_manager,)});let user_status_listener = UserStatusListener {document_manager: document_manager.clone(),folder_manager: folder_manager.clone(),- grid_manager: grid_manager.clone(),+ database_manager: database_manager.clone(),ws_conn: ws_conn.clone(),config: config.clone(),};@@ -190,7 +190,7 @@ impl AppFlowyCore {make_plugins(&ws_conn,&folder_manager,- &grid_manager,+ &database_manager,&user_session,&document_manager,)@@ -202,7 +202,7 @@ impl AppFlowyCore {user_session,document_manager,folder_manager,- grid_manager,+ database_manager,event_dispatcher,ws_conn,local_server,@@ -288,7 +288,7 @@ fn mk_user_session(struct UserStatusListener {document_manager: Arc<DocumentManager>,folder_manager: Arc<FolderManager>,- grid_manager: Arc<DatabaseManager>,+ database_manager: Arc<DatabaseManager>,ws_conn: Arc<FlowyWebSocketConnect>,config: AppFlowyCoreConfig,}@@ -297,7 +297,7 @@ impl UserStatusListener {async fn did_sign_in(&self, token: &str, user_id: &str) -> FlowyResult<()> {self.folder_manager.initialize(user_id, token).await?;self.document_manager.initialize(user_id).await?;- self.grid_manager.initialize(user_id, token).await?;+ self.database_manager.initialize(user_id, token).await?;self.ws_conn.start(token.to_owned(), user_id.to_owned())@@ -320,7 +320,7 @@ impl UserStatusListener {.await?;self- .grid_manager+ .database_manager.initialize_with_new_user(&user_profile.id, &user_profile.token).await?;diff --git a/frontend/rust-lib/flowy-database/src/entities/calendar_entities.rs b/frontend/rust-lib/flowy-database/src/entities/calendar_entities.rsindex 97b41acda0..2a1406c21d 100644--- a/frontend/rust-lib/flowy-database/src/entities/calendar_entities.rs+++ b/frontend/rust-lib/flowy-database/src/entities/calendar_entities.rs@@ -39,7 +39,7 @@ const DEFAULT_SHOW_WEEK_NUMBERS: bool = true;impl CalendarSettingsParams {pub fn default_with(view_id: String) -> Self {CalendarSettingsParams {- view_id: view_id.to_string(),+ view_id,layout_ty: CalendarLayout::default(),first_day_of_week: DEFAULT_FIRST_DAY_OF_WEEK,show_weekends: DEFAULT_SHOW_WEEKENDS,@@ -52,7 +52,7 @@ impl TryInto<CalendarSettingsParams> for CalendarSettingsPB {type Error = ErrorCode;fn try_into(self) -> Result<CalendarSettingsParams, Self::Error> {- let view_id = NotEmptyStr::parse(self.view_id).map_err(|_| ErrorCode::ViewIdInvalid)?;+ let view_id = NotEmptyStr::parse(self.view_id).map_err(|_| ErrorCode::ViewIdIsInvalid)?;Ok(CalendarSettingsParams {view_id: view_id.0,layout_ty: self.layout_ty,diff --git a/frontend/rust-lib/flowy-database/src/entities/cell_entities.rs b/frontend/rust-lib/flowy-database/src/entities/cell_entities.rsindex ef4b44a970..f1556005b2 100644--- a/frontend/rust-lib/flowy-database/src/entities/cell_entities.rs+++ b/frontend/rust-lib/flowy-database/src/entities/cell_entities.rs@@ -11,7 +11,7 @@ pub struct CreateSelectOptionPayloadPB {pub field_id: String,#[pb(index = 2)]- pub database_id: String,+ pub view_id: String,#[pb(index = 3)]pub option_name: String,@@ -19,7 +19,7 @@ pub struct CreateSelectOptionPayloadPB {pub struct CreateSelectOptionParams {pub field_id: String,- pub database_id: String,+ pub view_id: String,pub option_name: String,}@@ -29,13 +29,12 @@ impl TryInto<CreateSelectOptionParams> for CreateSelectOptionPayloadPB {fn try_into(self) -> Result<CreateSelectOptionParams, Self::Error> {let option_name =NotEmptyStr::parse(self.option_name).map_err(|_| ErrorCode::SelectOptionNameIsEmpty)?;- let database_id =- NotEmptyStr::parse(self.database_id).map_err(|_| ErrorCode::DatabaseIdIsEmpty)?;+ let view_id = NotEmptyStr::parse(self.view_id).map_err(|_| ErrorCode::ViewIdIsInvalid)?;let field_id = NotEmptyStr::parse(self.field_id).map_err(|_| ErrorCode::FieldIdIsEmpty)?;Ok(CreateSelectOptionParams {field_id: field_id.0,option_name: option_name.0,- database_id: database_id.0,+ view_id: view_id.0,})}}@@ -43,7 +42,7 @@ impl TryInto<CreateSelectOptionParams> for CreateSelectOptionPayloadPB {#[derive(Debug, Clone, Default, ProtoBuf)]pub struct CellIdPB {#[pb(index = 1)]- pub database_id: String,+ pub view_id: String,#[pb(index = 2)]pub field_id: String,@@ -55,7 +54,7 @@ pub struct CellIdPB {/// Represents as the cell identifier. It's used to locate the cell in corresponding/// view's row with the field id.pub struct CellIdParams {- pub database_id: String,+ pub view_id: String,pub field_id: String,pub row_id: String,}@@ -64,12 +63,11 @@ impl TryInto<CellIdParams> for CellIdPB {type Error = ErrorCode;fn try_into(self) -> Result<CellIdParams, Self::Error> {- let database_id =- NotEmptyStr::parse(self.database_id).map_err(|_| ErrorCode::DatabaseIdIsEmpty)?;+ let view_id = NotEmptyStr::parse(self.view_id).map_err(|_| ErrorCode::DatabaseIdIsEmpty)?;let field_id = NotEmptyStr::parse(self.field_id).map_err(|_| ErrorCode::FieldIdIsEmpty)?;let row_id = NotEmptyStr::parse(self.row_id).map_err(|_| ErrorCode::RowIdIsEmpty)?;Ok(CellIdParams {- database_id: database_id.0,+ view_id: view_id.0,field_id: field_id.0,row_id: row_id.0,})@@ -144,7 +142,7 @@ impl std::convert::From<Vec<CellPB>> for RepeatedCellPB {#[derive(Debug, Clone, Default, ProtoBuf)]pub struct CellChangesetPB {#[pb(index = 1)]- pub database_id: String,+ pub view_id: String,#[pb(index = 2)]pub row_id: String,diff --git a/frontend/rust-lib/flowy-database/src/entities/database_entities.rs b/frontend/rust-lib/flowy-database/src/entities/database_entities.rsnew file mode 100644index 0000000000..909bcb879b--- /dev/null+++ b/frontend/rust-lib/flowy-database/src/entities/database_entities.rs@@ -0,0 +1,16 @@+use flowy_derive::ProtoBuf;++#[derive(Debug, Default, ProtoBuf)]+pub struct DatabaseDescPB {+ #[pb(index = 1)]+ pub name: String,++ #[pb(index = 2)]+ pub database_id: String,+}++#[derive(Debug, Default, ProtoBuf)]+pub struct RepeatedDatabaseDescPB {+ #[pb(index = 1)]+ pub items: Vec<DatabaseDescPB>,+}diff --git a/frontend/rust-lib/flowy-database/src/entities/field_entities.rs b/frontend/rust-lib/flowy-database/src/entities/field_entities.rsindex 54dc8ad68f..0610afa092 100644--- a/frontend/rust-lib/flowy-database/src/entities/field_entities.rs+++ b/frontend/rust-lib/flowy-database/src/entities/field_entities.rs@@ -392,7 +392,7 @@ pub struct FieldChangesetPB {pub field_id: String,#[pb(index = 2)]- pub database_id: String,+ pub view_id: String,#[pb(index = 3, one_of)]pub name: Option<String>,@@ -419,8 +419,7 @@ impl TryInto<FieldChangesetParams> for FieldChangesetPB {type Error = ErrorCode;fn try_into(self) -> Result<FieldChangesetParams, Self::Error> {- let database_id =- NotEmptyStr::parse(self.database_id).map_err(|_| ErrorCode::DatabaseIdIsEmpty)?;+ let view_id = NotEmptyStr::parse(self.view_id).map_err(|_| ErrorCode::DatabaseIdIsEmpty)?;let field_id = NotEmptyStr::parse(self.field_id).map_err(|_| ErrorCode::FieldIdIsEmpty)?;let field_type = self.field_type.map(FieldTypeRevision::from);// if let Some(type_option_data) = self.type_option_data.as_ref() {@@ -431,7 +430,7 @@ impl TryInto<FieldChangesetParams> for FieldChangesetPB {Ok(FieldChangesetParams {field_id: field_id.0,- database_id: database_id.0,+ view_id: view_id.0,name: self.name,desc: self.desc,field_type,@@ -447,7 +446,7 @@ impl TryInto<FieldChangesetParams> for FieldChangesetPB {pub struct FieldChangesetParams {pub field_id: String,- pub database_id: String,+ pub view_id: String,pub name: Option<String>,diff --git a/frontend/rust-lib/flowy-database/src/entities/group_entities/group.rs b/frontend/rust-lib/flowy-database/src/entities/group_entities/group.rsindex bd163ec060..f17ae80997 100644--- a/frontend/rust-lib/flowy-database/src/entities/group_entities/group.rs+++ b/frontend/rust-lib/flowy-database/src/entities/group_entities/group.rs@@ -140,6 +140,9 @@ pub struct InsertGroupPayloadPB {#[pb(index = 2)]pub field_type: FieldType,++ #[pb(index = 3)]+ pub view_id: String,}impl TryInto<InsertGroupParams> for InsertGroupPayloadPB {@@ -150,14 +153,20 @@ impl TryInto<InsertGroupParams> for InsertGroupPayloadPB {.map_err(|_| ErrorCode::FieldIdIsEmpty)?.0;+ let view_id = NotEmptyStr::parse(self.view_id)+ .map_err(|_| ErrorCode::ViewIdIsInvalid)?+ .0;+Ok(InsertGroupParams {field_id,field_type_rev: self.field_type.into(),+ view_id,})}}pub struct InsertGroupParams {+ pub view_id: String,pub field_id: String,pub field_type_rev: FieldTypeRevision,}@@ -172,6 +181,9 @@ pub struct DeleteGroupPayloadPB {#[pb(index = 3)]pub field_type: FieldType,++ #[pb(index = 4)]+ pub view_id: String,}impl TryInto<DeleteGroupParams> for DeleteGroupPayloadPB {@@ -184,16 +196,21 @@ impl TryInto<DeleteGroupParams> for DeleteGroupPayloadPB {let group_id = NotEmptyStr::parse(self.group_id).map_err(|_| ErrorCode::FieldIdIsEmpty)?.0;+ let view_id = NotEmptyStr::parse(self.view_id)+ .map_err(|_| ErrorCode::ViewIdIsInvalid)?+ .0;Ok(DeleteGroupParams {field_id,field_type_rev: self.field_type.into(),group_id,+ view_id,})}}pub struct DeleteGroupParams {+ pub view_id: String,pub field_id: String,pub group_id: String,pub field_type_rev: FieldTypeRevision,diff --git a/frontend/rust-lib/flowy-database/src/entities/mod.rs b/frontend/rust-lib/flowy-database/src/entities/mod.rsindex a8e1d90a4f..9eb59729cd 100644--- a/frontend/rust-lib/flowy-database/src/entities/mod.rs+++ b/frontend/rust-lib/flowy-database/src/entities/mod.rs@@ -1,5 +1,6 @@mod calendar_entities;mod cell_entities;+mod database_entities;mod field_entities;pub mod filter_entities;mod grid_entities;@@ -12,6 +13,7 @@ mod view_entities;pub use calendar_entities::*;pub use cell_entities::*;+pub use database_entities::*;pub use field_entities::*;pub use filter_entities::*;pub use grid_entities::*;diff --git a/frontend/rust-lib/flowy-database/src/entities/setting_entities.rs b/frontend/rust-lib/flowy-database/src/entities/setting_entities.rsindex d1ac252113..98cbed1640 100644--- a/frontend/rust-lib/flowy-database/src/entities/setting_entities.rs+++ b/frontend/rust-lib/flowy-database/src/entities/setting_entities.rs@@ -96,7 +96,7 @@ impl TryInto<DatabaseSettingChangesetParams> for DatabaseSettingChangesetPB {fn try_into(self) -> Result<DatabaseSettingChangesetParams, Self::Error> {let view_id = NotEmptyStr::parse(self.view_id)- .map_err(|_| ErrorCode::ViewIdInvalid)?+ .map_err(|_| ErrorCode::ViewIdIsInvalid)?.0;let insert_filter = match self.alter_filter {diff --git a/frontend/rust-lib/flowy-database/src/entities/view_entities.rs b/frontend/rust-lib/flowy-database/src/entities/view_entities.rsindex 6a95519613..0200f3a4a9 100644--- a/frontend/rust-lib/flowy-database/src/entities/view_entities.rs+++ b/frontend/rust-lib/flowy-database/src/entities/view_entities.rs@@ -2,7 +2,7 @@ use crate::entities::{InsertedRowPB, UpdatedRowPB};use flowy_derive::ProtoBuf;#[derive(Debug, Default, Clone, ProtoBuf)]-pub struct ViewRowsVisibilityChangesetPB {+pub struct RowsVisibilityChangesetPB {#[pb(index = 1)]pub view_id: String,@@ -14,7 +14,7 @@ pub struct ViewRowsVisibilityChangesetPB {}#[derive(Debug, Default, Clone, ProtoBuf)]-pub struct ViewRowsChangesetPB {+pub struct RowsChangesetPB {#[pb(index = 1)]pub view_id: String,@@ -28,7 +28,7 @@ pub struct ViewRowsChangesetPB {pub updated_rows: Vec<UpdatedRowPB>,}-impl ViewRowsChangesetPB {+impl RowsChangesetPB {pub fn from_insert(view_id: String, inserted_rows: Vec<InsertedRowPB>) -> Self {Self {view_id,diff --git a/frontend/rust-lib/flowy-database/src/event_handler.rs b/frontend/rust-lib/flowy-database/src/event_handler.rsindex 588064b31e..b0ad0ae5a4 100644--- a/frontend/rust-lib/flowy-database/src/event_handler.rs+++ b/frontend/rust-lib/flowy-database/src/event_handler.rs@@ -10,7 +10,7 @@ use crate::services::field::{use crate::services::row::make_row_from_row_rev;use database_model::FieldRevision;use flowy_error::{ErrorCode, FlowyError, FlowyResult};-use lib_dispatch::prelude::{data_result, AFPluginData, AFPluginState, DataResult};+use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};use std::sync::Arc;#[tracing::instrument(level = "trace", skip(data, manager), err)]@@ -18,10 +18,10 @@ pub(crate) async fn get_database_data_handler(data: AFPluginData<DatabaseViewIdPB>,manager: AFPluginState<Arc<DatabaseManager>>,) -> DataResult<DatabasePB, FlowyError> {- let database_id: DatabaseViewIdPB = data.into_inner();- let editor = manager.open_database(database_id.as_ref()).await?;- let database = editor.get_database(database_id.as_ref()).await?;- data_result(database)+ let view_id: DatabaseViewIdPB = data.into_inner();+ let editor = manager.open_database_view(view_id.as_ref()).await?;+ let database = editor.get_database(view_id.as_ref()).await?;+ data_result_ok(database)}#[tracing::instrument(level = "trace", skip(data, manager), err)]@@ -29,10 +29,10 @@ pub(crate) async fn get_database_setting_handler(data: AFPluginData<DatabaseViewIdPB>,manager: AFPluginState<Arc<DatabaseManager>>,) -> DataResult<DatabaseViewSettingPB, FlowyError> {- let database_id: DatabaseViewIdPB = data.into_inner();- let editor = manager.open_database(database_id).await?;- let database_setting = editor.get_setting().await?;- data_result(database_setting)+ let view_id: DatabaseViewIdPB = data.into_inner();+ let editor = manager.open_database_view(view_id.as_ref()).await?;+ let database_setting = editor.get_setting(view_id.as_ref()).await?;+ data_result_ok(database_setting)}#[tracing::instrument(level = "trace", skip(data, manager), err)]@@ -73,12 +73,12 @@ pub(crate) async fn get_all_filters_handler(data: AFPluginData<DatabaseViewIdPB>,manager: AFPluginState<Arc<DatabaseManager>>,) -> DataResult<RepeatedFilterPB, FlowyError> {- let database_id: DatabaseViewIdPB = data.into_inner();- let editor = manager.open_database(database_id).await?;+ let view_id: DatabaseViewIdPB = data.into_inner();+ let editor = manager.open_database_view(view_id.as_ref()).await?;let filters = RepeatedFilterPB {- items: editor.get_all_filters().await?,+ items: editor.get_all_filters(view_id.as_ref()).await?,};- data_result(filters)+ data_result_ok(filters)}#[tracing::instrument(level = "trace", skip(data, manager), err)]@@ -86,12 +86,12 @@ pub(crate) async fn get_all_sorts_handler(data: AFPluginData<DatabaseViewIdPB>,manager: AFPluginState<Arc<DatabaseManager>>,) -> DataResult<RepeatedSortPB, FlowyError> {- let database_id: DatabaseViewIdPB = data.into_inner();- let editor = manager.open_database(database_id.as_ref()).await?;+ let view_id: DatabaseViewIdPB = data.into_inner();+ let editor = manager.open_database_view(view_id.as_ref()).await?;let sorts = RepeatedSortPB {- items: editor.get_all_sorts(database_id.as_ref()).await?,+ items: editor.get_all_sorts(view_id.as_ref()).await?,};- data_result(sorts)+ data_result_ok(sorts)}#[tracing::instrument(level = "trace", skip(data, manager), err)]@@ -99,9 +99,9 @@ pub(crate) async fn delete_all_sorts_handler(data: AFPluginData<DatabaseViewIdPB>,manager: AFPluginState<Arc<DatabaseManager>>,) -> Result<(), FlowyError> {- let database_id: DatabaseViewIdPB = data.into_inner();- let editor = manager.open_database(database_id.as_ref()).await?;- editor.delete_all_sorts(database_id.as_ref()).await?;+ let view_id: DatabaseViewIdPB = data.into_inner();+ let editor = manager.open_database_view(view_id.as_ref()).await?;+ editor.delete_all_sorts(view_id.as_ref()).await?;Ok(())}@@ -118,7 +118,7 @@ pub(crate) async fn get_fields_handler(.map(FieldPB::from).collect::<Vec<_>>().into();- data_result(repeated_field)+ data_result_ok(repeated_field)}#[tracing::instrument(level = "trace", skip(data, manager), err)]@@ -127,7 +127,7 @@ pub(crate) async fn update_field_handler(manager: AFPluginState<Arc<DatabaseManager>>,) -> Result<(), FlowyError> {let changeset: FieldChangesetParams = data.into_inner().try_into()?;- let editor = manager.get_database_editor(&changeset.database_id).await?;+ let editor = manager.get_database_editor(&changeset.view_id).await?;editor.update_field(changeset).await?;Ok(())}@@ -141,7 +141,12 @@ pub(crate) async fn update_field_type_option_handler(let editor = manager.get_database_editor(¶ms.view_id).await?;let old_field_rev = editor.get_field_rev(¶ms.field_id).await;editor- .update_field_type_option(¶ms.field_id, params.type_option_data, old_field_rev)+ .update_field_type_option(+ ¶ms.view_id,+ ¶ms.field_id,+ params.type_option_data,+ old_field_rev,+ ).await?;Ok(())}@@ -178,7 +183,12 @@ pub(crate) async fn switch_to_field_handler(// Update the type-option data after the field type has been changedlet type_option_data = get_type_option_data(&new_field_rev, ¶ms.field_type).await?;editor- .update_field_type_option(&new_field_rev.id, type_option_data, old_field_rev)+ .update_field_type_option(+ ¶ms.view_id,+ &new_field_rev.id,+ type_option_data,+ old_field_rev,+ ).await?;Ok(())@@ -213,7 +223,7 @@ pub(crate) async fn get_field_type_option_data_handler(field: field_rev.into(),type_option_data,};- data_result(data)+ data_result_ok(data)},}}@@ -232,7 +242,7 @@ pub(crate) async fn create_field_type_option_data_handler(let field_type: FieldType = field_rev.ty.into();let type_option_data = get_type_option_data(&field_rev, &field_type).await?;- data_result(TypeOptionPB {+ data_result_ok(TypeOptionPB {view_id: params.view_id,field: field_rev.into(),type_option_data,@@ -282,7 +292,7 @@ pub(crate) async fn get_row_handler(.await?.map(make_row_from_row_rev);- data_result(OptionalRowPB { row })+ data_result_ok(OptionalRowPB { row })}#[tracing::instrument(level = "debug", skip(data, manager), err)]@@ -326,7 +336,7 @@ pub(crate) async fn create_table_row_handler(let params: CreateRowParams = data.into_inner().try_into()?;let editor = manager.get_database_editor(params.view_id.as_ref()).await?;let row = editor.create_row(params).await?;- data_result(row)+ data_result_ok(row)}#[tracing::instrument(level = "trace", skip_all, err)]@@ -335,10 +345,10 @@ pub(crate) async fn get_cell_handler(manager: AFPluginState<Arc<DatabaseManager>>,) -> DataResult<CellPB, FlowyError> {let params: CellIdParams = data.into_inner().try_into()?;- let editor = manager.get_database_editor(¶ms.database_id).await?;+ let editor = manager.get_database_editor(¶ms.view_id).await?;match editor.get_cell(¶ms).await {- None => data_result(CellPB::empty(¶ms.field_id, ¶ms.row_id)),- Some(cell) => data_result(cell),+ None => data_result_ok(CellPB::empty(¶ms.field_id, ¶ms.row_id)),+ Some(cell) => data_result_ok(cell),}}@@ -348,7 +358,7 @@ pub(crate) async fn update_cell_handler(manager: AFPluginState<Arc<DatabaseManager>>,) -> Result<(), FlowyError> {let changeset: CellChangesetPB = data.into_inner();- let editor = manager.get_database_editor(&changeset.database_id).await?;+ let editor = manager.get_database_editor(&changeset.view_id).await?;editor.update_cell_with_changeset(&changeset.row_id,@@ -365,13 +375,13 @@ pub(crate) async fn new_select_option_handler(manager: AFPluginState<Arc<DatabaseManager>>,) -> DataResult<SelectOptionPB, FlowyError> {let params: CreateSelectOptionParams = data.into_inner().try_into()?;- let editor = manager.get_database_editor(¶ms.database_id).await?;+ let editor = manager.get_database_editor(¶ms.view_id).await?;match editor.get_field_rev(¶ms.field_id).await {None => Err(ErrorCode::InvalidData.into()),Some(field_rev) => {let type_option = select_type_option_from_field_rev(&field_rev)?;let select_option = type_option.create_option(¶ms.option_name);- data_result(select_option)+ data_result_ok(select_option)},}}@@ -383,12 +393,12 @@ pub(crate) async fn update_select_option_handler() -> Result<(), FlowyError> {let changeset: SelectOptionChangeset = data.into_inner().try_into()?;let editor = manager- .get_database_editor(&changeset.cell_path.database_id)+ .get_database_editor(&changeset.cell_path.view_id).await?;let field_id = changeset.cell_path.field_id.clone();let (tx, rx) = tokio::sync::oneshot::channel();editor- .modify_field_rev(&field_id, |field_rev| {+ .modify_field_rev(&changeset.cell_path.view_id, &field_id, |field_rev| {let mut type_option = select_type_option_from_field_rev(field_rev)?;let mut cell_changeset_str = None;let mut is_changed = None;@@ -444,14 +454,14 @@ pub(crate) async fn get_select_option_handler(manager: AFPluginState<Arc<DatabaseManager>>,) -> DataResult<SelectOptionCellDataPB, FlowyError> {let params: CellIdParams = data.into_inner().try_into()?;- let editor = manager.get_database_editor(¶ms.database_id).await?;+ let editor = manager.get_database_editor(¶ms.view_id).await?;match editor.get_field_rev(¶ms.field_id).await {None => {tracing::error!("Can't find the select option field with id: {}",params.field_id);- data_result(SelectOptionCellDataPB::default())+ data_result_ok(SelectOptionCellDataPB::default())},Some(field_rev) => {//@@ -468,7 +478,7 @@ pub(crate) async fn get_select_option_handler(};let ids = SelectOptionIds::from_cell_str(&type_cell_data.cell_str)?;let selected_options = type_option.get_selected_options(ids);- data_result(selected_options)+ data_result_ok(selected_options)},}}@@ -480,7 +490,7 @@ pub(crate) async fn update_select_option_cell_handler() -> Result<(), FlowyError> {let params: SelectOptionCellChangesetParams = data.into_inner().try_into()?;let editor = manager- .get_database_editor(¶ms.cell_identifier.database_id)+ .get_database_editor(¶ms.cell_identifier.view_id).await?;let changeset = SelectOptionCellChangeset {insert_option_ids: params.insert_option_ids,@@ -510,7 +520,7 @@ pub(crate) async fn update_date_cell_handler(is_utc: data.is_utc,};- let editor = manager.get_database_editor(&cell_path.database_id).await?;+ let editor = manager.get_database_editor(&cell_path.view_id).await?;editor.update_cell(cell_path.row_id, cell_path.field_id, cell_changeset).await?;@@ -524,8 +534,8 @@ pub(crate) async fn get_groups_handler() -> DataResult<RepeatedGroupPB, FlowyError> {let params: DatabaseViewIdPB = data.into_inner();let editor = manager.get_database_editor(¶ms.value).await?;- let group = editor.load_groups().await?;- data_result(group)+ let group = editor.load_groups(¶ms.value).await?;+ data_result_ok(group)}#[tracing::instrument(level = "debug", skip(data, manager), err)]@@ -536,7 +546,7 @@ pub(crate) async fn create_board_card_handler(let params: CreateRowParams = data.into_inner().try_into()?;let editor = manager.get_database_editor(params.view_id.as_ref()).await?;let row = editor.create_row(params).await?;- data_result(row)+ data_result_ok(row)}#[tracing::instrument(level = "debug", skip(data, manager), err)]@@ -561,6 +571,22 @@ pub(crate) async fn move_group_row_handler(Ok(())}+#[tracing::instrument(level = "debug", skip(manager), err)]+pub(crate) async fn get_databases_handler(+ manager: AFPluginState<Arc<DatabaseManager>>,+) -> DataResult<RepeatedDatabaseDescPB, FlowyError> {+ let items = manager+ .get_databases()+ .await?+ .into_iter()+ .map(|database_info| DatabaseDescPB {+ name: database_info.name,+ database_id: database_info.database_id,+ })+ .collect::<Vec<DatabaseDescPB>>();+ data_result_ok(RepeatedDatabaseDescPB { items })+}+#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn set_calendar_setting_handler(data: AFPluginData<CalendarSettingsPB>,@@ -568,6 +594,7 @@ pub(crate) async fn set_calendar_setting_handler() -> FlowyResult<()> {let params: CalendarSettingsParams = data.into_inner().try_into()?;let _ = manager.get_database_editor(params.view_id.as_ref()).await?;+ //TODO(nathan):todo!("nathan: depends on the main branch refactoring")}@@ -578,5 +605,6 @@ pub(crate) async fn get_calendar_setting_handler() -> FlowyResult<()> {let view_id = data.into_inner().value;let _ = manager.get_database_editor(view_id.as_ref()).await?;+ //TODO(nathan):todo!("nathan: depends on the main branch refactoring")}diff --git a/frontend/rust-lib/flowy-database/src/event_map.rs b/frontend/rust-lib/flowy-database/src/event_map.rsindex c504b7cf63..d4c737241e 100644--- a/frontend/rust-lib/flowy-database/src/event_map.rs+++ b/frontend/rust-lib/flowy-database/src/event_map.rs@@ -48,8 +48,10 @@ pub fn init(database_manager: Arc<DatabaseManager>) -> AFPlugin {.event(DatabaseEvent::MoveGroup, move_group_handler).event(DatabaseEvent::MoveGroupRow, move_group_row_handler).event(DatabaseEvent::GetGroup, get_groups_handler)+ // Database+ .event(DatabaseEvent::GetDatabases, get_databases_handler)// Calendar- .event(DatabaseEvent::SetCalenderSetting, set_calendar_setting_handler)+ .event(DatabaseEvent::SetCalenderSetting, set_calendar_setting_handler).event(DatabaseEvent::GetCalendarSetting, get_calendar_setting_handler);plugin@@ -233,9 +235,12 @@ pub enum DatabaseEvent {#[event(input = "MoveGroupRowPayloadPB")]GroupByField = 113,+ #[event(output = "RepeatedDatabaseDescPB")]+ GetDatabases = 114,+#[event(input = "CalendarSettingsPB")]- SetCalenderSetting = 114,+ SetCalenderSetting = 115,#[event()]- GetCalendarSetting = 115,+ GetCalendarSetting = 116,}diff --git a/frontend/rust-lib/flowy-database/src/manager.rs b/frontend/rust-lib/flowy-database/src/manager.rsindex 03e4a8c350..1c26c9baa8 100644--- a/frontend/rust-lib/flowy-database/src/manager.rs+++ b/frontend/rust-lib/flowy-database/src/manager.rs@@ -1,31 +1,35 @@use crate::entities::LayoutTypePB;use crate::services::database::{- make_database_block_rev_manager, DatabaseRevisionCloudService, DatabaseRevisionEditor,- DatabaseRevisionMergeable, DatabaseRevisionSerde,+ make_database_block_rev_manager, DatabaseEditor, DatabaseRefIndexerQuery,+ DatabaseRevisionCloudService, DatabaseRevisionMergeable, DatabaseRevisionSerde,};-use crate::services::database_view::make_database_view_rev_manager;-use crate::services::persistence::block_index::BlockIndexCache;+use crate::services::database_view::{+ make_database_view_rev_manager, make_database_view_revision_pad, DatabaseViewEditor,+};+use crate::services::persistence::block_index::BlockRowIndexer;+use crate::services::persistence::database_ref::{DatabaseInfo, DatabaseRef, DatabaseRefIndexer};use crate::services::persistence::kv::DatabaseKVPersistence;use crate::services::persistence::migration::DatabaseMigration;use crate::services::persistence::rev_sqlite::{SQLiteDatabaseRevisionPersistence, SQLiteDatabaseRevisionSnapshotPersistence,};-use crate::services::persistence::GridDatabase;-use bytes::Bytes;-use database_model::{BuildDatabaseContext, DatabaseRevision, DatabaseViewRevision};+use crate::services::persistence::DatabaseDBConnection;+use std::collections::HashMap;++use database_model::{+ gen_database_id, BuildDatabaseContext, DatabaseRevision, DatabaseViewRevision,+};use flowy_client_sync::client_database::{- make_database_block_operations, make_database_operations, make_grid_view_operations,+ make_database_block_operations, make_database_operations, make_database_view_operations,};use flowy_error::{FlowyError, FlowyResult};use flowy_revision::{RevisionManager, RevisionPersistence, RevisionPersistenceConfiguration, RevisionWebSocket,};use flowy_sqlite::ConnectionPool;-use lib_infra::async_trait::async_trait;-use lib_infra::ref_map::{RefCountHashMap, RefCountValue};-use revision_model::Revision;-use flowy_task::TaskDispatcher;++use revision_model::Revision;use std::sync::Arc;use tokio::sync::RwLock;@@ -36,52 +40,66 @@ pub trait DatabaseUser: Send + Sync {}pub struct DatabaseManager {- database_editors: RwLock<RefCountHashMap<Arc<DatabaseRevisionEditor>>>,+ database_editors: RwLock<HashMap<String, Arc<DatabaseEditor>>>,database_user: Arc<dyn DatabaseUser>,- block_index_cache: Arc<BlockIndexCache>,+ block_indexer: Arc<BlockRowIndexer>,+ database_ref_indexer: Arc<DatabaseRefIndexer>,#[allow(dead_code)]kv_persistence: Arc<DatabaseKVPersistence>,task_scheduler: Arc<RwLock<TaskDispatcher>>,+ #[allow(dead_code)]migration: DatabaseMigration,}impl DatabaseManager {pub fn new(- grid_user: Arc<dyn DatabaseUser>,+ database_user: Arc<dyn DatabaseUser>,_rev_web_socket: Arc<dyn RevisionWebSocket>,task_scheduler: Arc<RwLock<TaskDispatcher>>,- database: Arc<dyn GridDatabase>,+ database_db: Arc<dyn DatabaseDBConnection>,) -> Self {- let grid_editors = RwLock::new(RefCountHashMap::new());- let kv_persistence = Arc::new(DatabaseKVPersistence::new(database.clone()));- let block_index_cache = Arc::new(BlockIndexCache::new(database.clone()));- let migration = DatabaseMigration::new(grid_user.clone(), database);+ let database_editors = RwLock::new(HashMap::new());+ let kv_persistence = Arc::new(DatabaseKVPersistence::new(database_db.clone()));+ let block_indexer = Arc::new(BlockRowIndexer::new(database_db.clone()));+ let database_ref_indexer = Arc::new(DatabaseRefIndexer::new(database_db.clone()));+ let migration = DatabaseMigration::new(+ database_user.clone(),+ database_db,+ database_ref_indexer.clone(),+ );Self {- database_editors: grid_editors,- database_user: grid_user,+ database_editors,+ database_user,kv_persistence,- block_index_cache,+ block_indexer,+ database_ref_indexer,task_scheduler,migration,}}- pub async fn initialize_with_new_user(&self, _user_id: &str, _token: &str) -> FlowyResult<()> {+ pub async fn initialize_with_new_user(&self, user_id: &str, _token: &str) -> FlowyResult<()> {+ self.migration.run(user_id).await?;Ok(())}- pub async fn initialize(&self, _user_id: &str, _token: &str) -> FlowyResult<()> {+ pub async fn initialize(&self, user_id: &str, _token: &str) -> FlowyResult<()> {+ self.migration.run(user_id).await?;Ok(())}#[tracing::instrument(level = "debug", skip_all, err)]pub async fn create_database<T: AsRef<str>>(&self,- database_id: T,+ database_id: &str,+ view_id: T,+ name: &str,revisions: Vec<Revision>,) -> FlowyResult<()> {- let database_id = database_id.as_ref();let db_pool = self.database_user.db_pool()?;+ let _ = self+ .database_ref_indexer+ .bind(database_id, view_id.as_ref(), true, name);let rev_manager = self.make_database_rev_manager(database_id, db_pool)?;rev_manager.reset_object(revisions).await?;@@ -112,58 +130,96 @@ impl DatabaseManager {Ok(())}- pub async fn open_database<T: AsRef<str>>(+ pub async fn open_database_view<T: AsRef<str>>(&self,- database_id: T,- ) -> FlowyResult<Arc<DatabaseRevisionEditor>> {- let database_id = database_id.as_ref();- let _ = self.migration.run_v1_migration(database_id).await;- self.get_or_create_database_editor(database_id).await+ view_id: T,+ ) -> FlowyResult<Arc<DatabaseEditor>> {+ let view_id = view_id.as_ref();+ let database_info = self.database_ref_indexer.get_database_with_view(view_id)?;+ self+ .get_or_create_database_editor(&database_info.database_id, view_id)+ .await}- #[tracing::instrument(level = "debug", skip_all, fields(database_id), err)]- pub async fn close_database<T: AsRef<str>>(&self, database_id: T) -> FlowyResult<()> {- let database_id = database_id.as_ref();- tracing::Span::current().record("database_id", database_id);- self+ #[tracing::instrument(level = "debug", skip_all, fields(view_id), err)]+ pub async fn close_database_view<T: AsRef<str>>(&self, view_id: T) -> FlowyResult<()> {+ let view_id = view_id.as_ref();+ let database_info = self.database_ref_indexer.get_database_with_view(view_id)?;+ tracing::Span::current().record("database_id", &database_info.database_id);++ let mut should_remove_editor = false;+ if let Some(database_editor) = self.database_editors.write().await- .remove(database_id)- .await;+ .get(&database_info.database_id)+ {+ database_editor.close_view_editor(view_id).await;+ should_remove_editor = database_editor.number_of_ref_views().await == 0;+ if should_remove_editor {+ database_editor.dispose().await;+ }+ }++ if should_remove_editor {+ self+ .database_editors+ .write()+ .await+ .remove(&database_info.database_id);+ }Ok(())}// #[tracing::instrument(level = "debug", skip(self), err)]- //TODO(nathan): map the view_id to database_id- pub async fn get_database_editor(- &self,- database_id: &str,- ) -> FlowyResult<Arc<DatabaseRevisionEditor>> {+ pub async fn get_database_editor(&self, view_id: &str) -> FlowyResult<Arc<DatabaseEditor>> {let read_guard = self.database_editors.read().await;- let editor = read_guard.get(database_id);+ let editor = read_guard.get(view_id);match editor {None => {// Drop the read_guard ASAP in case of the following read/write lockdrop(read_guard);- self.open_database(database_id).await+ self.open_database_view(view_id).await},- Some(editor) => Ok(editor),+ Some(editor) => Ok(editor.clone()),}}+ pub async fn get_databases(&self) -> FlowyResult<Vec<DatabaseInfo>> {+ self.database_ref_indexer.get_all_databases()+ }++ pub async fn get_database_ref_views(&self, database_id: &str) -> FlowyResult<Vec<DatabaseRef>> {+ self+ .database_ref_indexer+ .get_ref_views_with_database(database_id)+ }+async fn get_or_create_database_editor(&self,database_id: &str,- ) -> FlowyResult<Arc<DatabaseRevisionEditor>> {- if let Some(editor) = self.database_editors.read().await.get(database_id) {- return Ok(editor);- }+ view_id: &str,+ ) -> FlowyResult<Arc<DatabaseEditor>> {+ if let Some(database_editor) = self.database_editors.read().await.get(database_id) {+ let user_id = self.database_user.user_id()?;+ let (view_pad, view_rev_manager) =+ make_database_view_revision_pad(view_id, self.database_user.clone()).await?;+ let view_editor = DatabaseViewEditor::from_pad(+ &user_id,+ database_editor.database_view_data.clone(),+ database_editor.cell_data_cache.clone(),+ view_rev_manager,+ view_pad,+ )+ .await?;+ database_editor.open_view_editor(view_editor).await;+ return Ok(database_editor.clone());+ }+ // Lock the database_editorslet mut database_editors = self.database_editors.write().await;let db_pool = self.database_user.db_pool()?;- let editor = self.make_database_rev_editor(database_id, db_pool).await?;- tracing::trace!("Open database: {}", database_id);+ let editor = self.make_database_rev_editor(view_id, db_pool).await?;database_editors.insert(database_id.to_string(), editor.clone());Ok(editor)}@@ -171,27 +227,53 @@ impl DatabaseManager {#[tracing::instrument(level = "trace", skip(self, pool), err)]async fn make_database_rev_editor(&self,- database_id: &str,+ view_id: &str,pool: Arc<ConnectionPool>,- ) -> Result<Arc<DatabaseRevisionEditor>, FlowyError> {+ ) -> Result<Arc<DatabaseEditor>, FlowyError> {let user = self.database_user.clone();+ tracing::debug!("Open database view: {}", view_id);+ let (base_view_pad, base_view_rev_manager) =+ make_database_view_revision_pad(view_id, user.clone()).await?;+ let mut database_id = base_view_pad.database_id.clone();++ tracing::debug!("Open database:{}", database_id);+ if database_id.is_empty() {+ // Before the database_id concept comes up, we used the view_id directly. So if+ // the database_id is empty, which means we can used the view_id. After the version 0.1.1,+ // we start to used the database_id that enables binding different views to the same database.+ database_id = view_id.to_owned();+ }+let token = user.token()?;let cloud = Arc::new(DatabaseRevisionCloudService::new(token));- let mut rev_manager = self.make_database_rev_manager(database_id, pool.clone())?;+ let mut rev_manager = self.make_database_rev_manager(&database_id, pool.clone())?;let database_pad = Arc::new(RwLock::new(rev_manager.initialize::<DatabaseRevisionSerde>(Some(cloud)).await?,));- let database_editor = DatabaseRevisionEditor::new(- database_id,+ let user_id = user.user_id()?;+ let database_editor = DatabaseEditor::new(+ &database_id,user,database_pad,rev_manager,- self.block_index_cache.clone(),+ self.block_indexer.clone(),+ self.database_ref_indexer.clone(),self.task_scheduler.clone(),).await?;++ let base_view_editor = DatabaseViewEditor::from_pad(+ &user_id,+ database_editor.database_view_data.clone(),+ database_editor.cell_data_cache.clone(),+ base_view_rev_manager,+ base_view_pad,+ )+ .await?;+ database_editor.open_view_editor(base_view_editor).await;+Ok(database_editor)}@@ -210,7 +292,8 @@ impl DatabaseManager {RevisionPersistence::new(&user_id, database_id, disk_cache, configuration);// Create snapshot persistence- let snapshot_object_id = format!("grid:{}", database_id);+ const DATABASE_SP_PREFIX: &str = "grid";+ let snapshot_object_id = format!("{}:{}", DATABASE_SP_PREFIX, database_id);let snapshot_persistence =SQLiteDatabaseRevisionSnapshotPersistence::new(&snapshot_object_id, pool);@@ -226,18 +309,50 @@ impl DatabaseManager {}}-pub async fn make_database_view_data(- _user_id: &str,+pub async fn link_existing_database(view_id: &str,+ name: String,+ database_id: &str,+ layout: LayoutTypePB,+ database_manager: Arc<DatabaseManager>,+) -> FlowyResult<()> {+ tracing::trace!(+ "Link database view: {} with database: {}",+ view_id,+ database_id+ );+ let database_view_rev = DatabaseViewRevision::new(+ database_id.to_string(),+ view_id.to_owned(),+ false,+ name.clone(),+ layout.into(),+ );+ let database_view_ops = make_database_view_operations(&database_view_rev);+ let database_view_bytes = database_view_ops.json_bytes();+ let revision = Revision::initial_revision(view_id, database_view_bytes);+ database_manager+ .create_database_view(view_id, vec![revision])+ .await?;++ let _ = database_manager+ .database_ref_indexer+ .bind(database_id, view_id, false, &name);+ Ok(())+}++pub async fn create_new_database(+ view_id: &str,+ name: String,layout: LayoutTypePB,database_manager: Arc<DatabaseManager>,build_context: BuildDatabaseContext,-) -> FlowyResult<Bytes> {+) -> FlowyResult<()> {let BuildDatabaseContext {field_revs,block_metas,blocks,- database_view_data: grid_view_revision_data,+ database_view_data,} = build_context;for block_meta_data in &blocks {@@ -245,11 +360,11 @@ pub async fn make_database_view_data(// Indexing the block's rowsblock_meta_data.rows.iter().for_each(|row| {let _ = database_manager- .block_index_cache+ .block_indexer.insert(&row.block_id, &row.id);});- // Create grid's block+ // Create database's blocklet database_block_ops = make_database_block_operations(block_meta_data);let database_block_bytes = database_block_ops.json_bytes();let revision = Revision::initial_revision(block_id, database_block_bytes);@@ -258,37 +373,43 @@ pub async fn make_database_view_data(.await?;}- // Will replace the grid_id with the value returned by the gen_grid_id()- let database_id = view_id.to_owned();+ let database_id = gen_database_id();let database_rev = DatabaseRevision::from_build_context(&database_id, field_revs, block_metas);- // Create grid+ // Create database+ tracing::trace!("Create new database: {}", database_id);let database_ops = make_database_operations(&database_rev);let database_bytes = database_ops.json_bytes();- let revision = Revision::initial_revision(&database_id, database_bytes.clone());+ let revision = Revision::initial_revision(&database_id, database_bytes);database_manager- .create_database(&database_id, vec![revision])+ .create_database(&database_id, &view_id, &name, vec![revision]).await?;- // Create grid view- let grid_view = if grid_view_revision_data.is_empty() {- DatabaseViewRevision::new(database_id, view_id.to_owned(), layout.into())+ // Create database view+ tracing::trace!("Create new database view: {}", view_id);+ let database_view_rev = if database_view_data.is_empty() {+ DatabaseViewRevision::new(database_id, view_id.to_owned(), true, name, layout.into())} else {- DatabaseViewRevision::from_json(grid_view_revision_data)?+ DatabaseViewRevision::from_json(database_view_data)?};- let database_view_ops = make_grid_view_operations(&grid_view);+ let database_view_ops = make_database_view_operations(&database_view_rev);let database_view_bytes = database_view_ops.json_bytes();let revision = Revision::initial_revision(view_id, database_view_bytes);database_manager.create_database_view(view_id, vec![revision]).await?;- Ok(database_bytes)+ Ok(())+}++impl DatabaseRefIndexerQuery for DatabaseRefIndexer {+ fn get_ref_views(&self, database_id: &str) -> FlowyResult<Vec<DatabaseRef>> {+ self.get_ref_views_with_database(database_id)+ }}-#[async_trait]-impl RefCountValue for DatabaseRevisionEditor {- async fn did_remove(&self) {- self.close().await;+impl DatabaseRefIndexerQuery for Arc<DatabaseRefIndexer> {+ fn get_ref_views(&self, database_id: &str) -> FlowyResult<Vec<DatabaseRef>> {+ (**self).get_ref_views(database_id)}}diff --git a/frontend/rust-lib/flowy-database/src/services/database/block_editor.rs b/frontend/rust-lib/flowy-database/src/services/database/block_editor.rsindex 5b5cf46413..dafc43047c 100644--- a/frontend/rust-lib/flowy-database/src/services/database/block_editor.rs+++ b/frontend/rust-lib/flowy-database/src/services/database/block_editor.rs@@ -19,7 +19,7 @@ use std::borrow::Cow;use std::sync::Arc;use tokio::sync::RwLock;-pub struct DatabaseBlockRevisionEditor {+pub struct DatabaseBlockEditor {#[allow(dead_code)]user_id: String,pub block_id: String,@@ -27,7 +27,7 @@ pub struct DatabaseBlockRevisionEditor {rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,}-impl DatabaseBlockRevisionEditor {+impl DatabaseBlockEditor {pub async fn new(user_id: &str,token: &str,diff --git a/frontend/rust-lib/flowy-database/src/services/database/block_manager.rs b/frontend/rust-lib/flowy-database/src/services/database/block_manager.rsindex e0985c3f23..9d91ff7fd9 100644--- a/frontend/rust-lib/flowy-database/src/services/database/block_manager.rs+++ b/frontend/rust-lib/flowy-database/src/services/database/block_manager.rs@@ -1,8 +1,8 @@use crate::entities::{CellChangesetPB, InsertedRowPB, UpdatedRowPB};use crate::manager::DatabaseUser;use crate::notification::{send_notification, DatabaseNotification};-use crate::services::database::{DatabaseBlockRevisionEditor, DatabaseBlockRevisionMergeable};-use crate::services::persistence::block_index::BlockIndexCache;+use crate::services::database::{DatabaseBlockEditor, DatabaseBlockRevisionMergeable};+use crate::services::persistence::block_index::BlockRowIndexer;use crate::services::persistence::rev_sqlite::{SQLiteDatabaseBlockRevisionPersistence, SQLiteDatabaseRevisionSnapshotPersistence,};@@ -41,18 +41,18 @@ pub enum DatabaseBlockEvent {}type BlockId = String;-pub(crate) struct DatabaseBlockManager {+pub(crate) struct DatabaseBlocks {user: Arc<dyn DatabaseUser>,- persistence: Arc<BlockIndexCache>,- block_editors: DashMap<BlockId, Arc<DatabaseBlockRevisionEditor>>,+ persistence: Arc<BlockRowIndexer>,+ block_editors: DashMap<BlockId, Arc<DatabaseBlockEditor>>,event_notifier: broadcast::Sender<DatabaseBlockEvent>,}-impl DatabaseBlockManager {+impl DatabaseBlocks {pub(crate) async fn new(user: &Arc<dyn DatabaseUser>,block_meta_revs: Vec<Arc<DatabaseBlockMetaRevision>>,- persistence: Arc<BlockIndexCache>,+ persistence: Arc<BlockRowIndexer>,event_notifier: broadcast::Sender<DatabaseBlockEvent>,) -> FlowyResult<Self> {let block_editors = make_block_editors(user, block_meta_revs).await?;@@ -76,7 +76,7 @@ impl DatabaseBlockManager {pub(crate) async fn get_or_create_block_editor(&self,block_id: &str,- ) -> FlowyResult<Arc<DatabaseBlockRevisionEditor>> {+ ) -> FlowyResult<Arc<DatabaseBlockEditor>> {debug_assert!(!block_id.is_empty());match self.block_editors.get(block_id) {None => {@@ -97,7 +97,7 @@ impl DatabaseBlockManager {pub(crate) async fn get_editor_from_row_id(&self,row_id: &str,- ) -> FlowyResult<Arc<DatabaseBlockRevisionEditor>> {+ ) -> FlowyResult<Arc<DatabaseBlockEditor>> {let block_id = self.persistence.get_block_id(row_id)?;self.get_or_create_block_editor(&block_id).await}@@ -306,7 +306,7 @@ impl DatabaseBlockManager {async fn make_block_editors(user: &Arc<dyn DatabaseUser>,block_meta_revs: Vec<Arc<DatabaseBlockMetaRevision>>,-) -> FlowyResult<DashMap<String, Arc<DatabaseBlockRevisionEditor>>> {+) -> FlowyResult<DashMap<String, Arc<DatabaseBlockEditor>>> {let editor_map = DashMap::new();for block_meta_rev in block_meta_revs {let editor = make_database_block_editor(user, &block_meta_rev.block_id).await?;@@ -319,12 +319,12 @@ async fn make_block_editors(async fn make_database_block_editor(user: &Arc<dyn DatabaseUser>,block_id: &str,-) -> FlowyResult<DatabaseBlockRevisionEditor> {+) -> FlowyResult<DatabaseBlockEditor> {tracing::trace!("Open block:{} editor", block_id);let token = user.token()?;let user_id = user.user_id()?;let rev_manager = make_database_block_rev_manager(user, block_id)?;- DatabaseBlockRevisionEditor::new(&user_id, &token, block_id, rev_manager).await+ DatabaseBlockEditor::new(&user_id, &token, block_id, rev_manager).await}pub fn make_database_block_rev_manager(@@ -340,7 +340,8 @@ pub fn make_database_block_rev_manager(let rev_persistence = RevisionPersistence::new(&user_id, block_id, disk_cache, configuration);// Create snapshot persistence- let snapshot_object_id = format!("grid_block:{}", block_id);+ const DATABASE_BLOCK_SP_PREFIX: &str = "grid_block";+ let snapshot_object_id = format!("{}:{}", DATABASE_BLOCK_SP_PREFIX, block_id);let snapshot_persistence =SQLiteDatabaseRevisionSnapshotPersistence::new(&snapshot_object_id, pool);diff --git a/frontend/rust-lib/flowy-database/src/services/database/database_editor.rs b/frontend/rust-lib/flowy-database/src/services/database/database_editor.rsindex e02becaf66..09fcfe6e24 100644--- a/frontend/rust-lib/flowy-database/src/services/database/database_editor.rs+++ b/frontend/rust-lib/flowy-database/src/services/database/database_editor.rs@@ -6,16 +6,19 @@ use crate::services::cell::{apply_cell_data_changeset, get_type_cell_protobuf, stringify_cell_data, AnyTypeCache,AtomicCellDataCache, CellProtobufBlob, ToCellChangesetString, TypeCellData,};-use crate::services::database::DatabaseBlockManager;+use crate::services::database::DatabaseBlocks;use crate::services::field::{default_type_option_builder_from_type, transform_type_option, type_option_builder_from_bytes,FieldBuilder, RowSingleCellData,};-use crate::services::database::DatabaseViewEditorDelegateImpl;-use crate::services::database_view::{DatabaseViewChanged, DatabaseViewManager};+use crate::services::database::DatabaseViewDataImpl;+use crate::services::database_view::{+ DatabaseViewChanged, DatabaseViewData, DatabaseViewEditor, DatabaseViews,+};use crate::services::filter::FilterType;-use crate::services::persistence::block_index::BlockIndexCache;+use crate::services::persistence::block_index::BlockRowIndexer;+use crate::services::persistence::database_ref::DatabaseRef;use crate::services::row::{DatabaseBlockRow, DatabaseBlockRowRevision, RowRevisionBuilder};use bytes::Bytes;use database_model::*;@@ -38,28 +41,36 @@ use std::collections::HashMap;use std::sync::Arc;use tokio::sync::{broadcast, RwLock};-pub struct DatabaseRevisionEditor {+pub trait DatabaseRefIndexerQuery: Send + Sync + 'static {+ fn get_ref_views(&self, database_id: &str) -> FlowyResult<Vec<DatabaseRef>>;+}++pub struct DatabaseEditor {pub database_id: String,database_pad: Arc<RwLock<DatabaseRevisionPad>>,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,- database_view_manager: Arc<DatabaseViewManager>,- database_block_manager: Arc<DatabaseBlockManager>,- cell_data_cache: AtomicCellDataCache,+ database_views: Arc<DatabaseViews>,+ database_blocks: Arc<DatabaseBlocks>,+ pub database_view_data: Arc<dyn DatabaseViewData>,+ pub cell_data_cache: AtomicCellDataCache,+ database_ref_query: Arc<dyn DatabaseRefIndexerQuery>,}-impl Drop for DatabaseRevisionEditor {+impl Drop for DatabaseEditor {fn drop(&mut self) {tracing::trace!("Drop DatabaseRevisionEditor");}}-impl DatabaseRevisionEditor {+impl DatabaseEditor {+ #[allow(clippy::too_many_arguments)]pub async fn new(database_id: &str,user: Arc<dyn DatabaseUser>,database_pad: Arc<RwLock<DatabaseRevisionPad>>,rev_manager: RevisionManager<Arc<ConnectionPool>>,- persistence: Arc<BlockIndexCache>,+ persistence: Arc<BlockRowIndexer>,+ database_ref_query: Arc<dyn DatabaseRefIndexerQuery>,task_scheduler: Arc<RwLock<TaskDispatcher>>,) -> FlowyResult<Arc<Self>> {let rev_manager = Arc::new(rev_manager);@@ -68,46 +79,56 @@ impl DatabaseRevisionEditor {// Block managerlet (block_event_tx, block_event_rx) = broadcast::channel(100);let block_meta_revs = database_pad.read().await.get_block_meta_revs();- let database_block_manager = Arc::new(- DatabaseBlockManager::new(&user, block_meta_revs, persistence, block_event_tx).await?,- );- let delegate = Arc::new(DatabaseViewEditorDelegateImpl {+ let database_blocks =+ Arc::new(DatabaseBlocks::new(&user, block_meta_revs, persistence, block_event_tx).await?);++ let database_view_data = Arc::new(DatabaseViewDataImpl {pad: database_pad.clone(),- block_manager: database_block_manager.clone(),+ blocks: database_blocks.clone(),task_scheduler,cell_data_cache: cell_data_cache.clone(),});// View manager- let database_view_manager = Arc::new(- DatabaseViewManager::new(- database_id.to_owned(),- user.clone(),- delegate,- cell_data_cache.clone(),- block_event_rx,- )- .await?,- );-+ let database_views = DatabaseViews::new(+ user.clone(),+ database_view_data.clone(),+ cell_data_cache.clone(),+ block_event_rx,+ )+ .await?;+ let database_views = Arc::new(database_views);let editor = Arc::new(Self {database_id: database_id.to_owned(),database_pad,rev_manager,- database_block_manager,- database_view_manager,+ database_blocks,+ database_views,cell_data_cache,+ database_ref_query,+ database_view_data,});Ok(editor)}- #[tracing::instrument(name = "close database editor", level = "trace", skip_all)]- pub async fn close(&self) {- self.database_block_manager.close().await;+ pub async fn open_view_editor(&self, view_editor: DatabaseViewEditor) {+ self.database_views.open(view_editor).await+ }++ #[tracing::instrument(name = "close database editor view", level = "trace", skip_all)]+ pub async fn close_view_editor(&self, view_id: &str) {self.rev_manager.generate_snapshot().await;+ self.database_views.close(view_id).await;+ }++ pub async fn dispose(&self) {+ self.database_blocks.close().await;self.rev_manager.close().await;- self.database_view_manager.close(&self.database_id).await;+ }++ pub async fn number_of_ref_views(&self) -> usize {+ self.database_views.number_of_views().await}/// Save the type-option data to disk and send a `DatabaseNotification::DidUpdateField` notification@@ -122,6 +143,7 @@ impl DatabaseRevisionEditor {///pub async fn update_field_type_option(&self,+ view_id: &str,field_id: &str,type_option_data: Vec<u8>,old_field_rev: Option<Arc<FieldRevision>>,@@ -152,8 +174,8 @@ impl DatabaseRevisionEditor {.await?;self- .database_view_manager- .did_update_view_field_type_option(field_id, old_field_rev)+ .database_views+ .did_update_view_field_type_option(view_id, field_id, old_field_rev).await?;self.notify_did_update_database_field(field_id).await?;Ok(())@@ -234,7 +256,7 @@ impl DatabaseRevisionEditor {Ok(())}- pub async fn modify_field_rev<F>(&self, field_id: &str, f: F) -> FlowyResult<()>+ pub async fn modify_field_rev<F>(&self, view_id: &str, field_id: &str, f: F) -> FlowyResult<()>whereF: for<'a> FnOnce(&'a mut FieldRevision) -> FlowyResult<Option<()>>,{@@ -252,8 +274,8 @@ impl DatabaseRevisionEditor {if is_changed {match self- .database_view_manager- .did_update_view_field_type_option(field_id, old_field_rev)+ .database_views+ .did_update_view_field_type_option(view_id, field_id, old_field_rev).await{Ok(_) => {},@@ -274,8 +296,11 @@ impl DatabaseRevisionEditor {Ok(())}- pub async fn group_by_field(&self, field_id: &str) -> FlowyResult<()> {- self.database_view_manager.group_by_field(field_id).await?;+ pub async fn group_by_field(&self, view_id: &str, field_id: &str) -> FlowyResult<()> {+ self+ .database_views+ .group_by_field(view_id, field_id)+ .await?;Ok(())}@@ -400,7 +425,7 @@ impl DatabaseRevisionEditor {let mut row_rev = self.create_row_rev().await?;self- .database_view_manager+ .database_views.will_create_row(&mut row_rev, ¶ms).await;@@ -408,16 +433,13 @@ impl DatabaseRevisionEditor {.create_row_pb(row_rev, params.start_row_id.clone()).await?;- self- .database_view_manager- .did_create_row(&row_pb, ¶ms)- .await;+ self.database_views.did_create_row(&row_pb, ¶ms).await;Ok(row_pb)}#[tracing::instrument(level = "trace", skip_all, err)]pub async fn move_group(&self, params: MoveGroupParams) -> FlowyResult<()> {- self.database_view_manager.move_group(params).await?;+ self.database_views.move_group(params).await?;Ok(())}@@ -432,10 +454,7 @@ impl DatabaseRevisionEditor {.or_insert_with(Vec::new).push(row_rev);}- let changesets = self- .database_block_manager- .insert_row(rows_by_block_id)- .await?;+ let changesets = self.database_blocks.insert_row(rows_by_block_id).await?;for changeset in changesets {self.update_block(changeset).await?;}@@ -445,20 +464,14 @@ impl DatabaseRevisionEditor {pub async fn update_row(&self, changeset: RowChangeset) -> FlowyResult<()> {let row_id = changeset.row_id.clone();let old_row = self.get_row_rev(&row_id).await?;- self.database_block_manager.update_row(changeset).await?;- self- .database_view_manager- .did_update_row(old_row, &row_id)- .await;+ self.database_blocks.update_row(changeset).await?;+ self.database_views.did_update_row(old_row, &row_id).await;Ok(())}/// Returns all the rows in this block.pub async fn get_row_pbs(&self, view_id: &str, block_id: &str) -> FlowyResult<Vec<RowPB>> {- let rows = self- .database_view_manager- .get_row_revs(view_id, block_id)- .await?;+ let rows = self.database_views.get_row_revs(view_id, block_id).await?;let rows = rows.into_iter().map(|row_rev| RowPB::from(&row_rev))@@ -468,10 +481,10 @@ impl DatabaseRevisionEditor {pub async fn get_all_row_revs(&self, view_id: &str) -> FlowyResult<Vec<Arc<RowRevision>>> {let mut all_rows = vec![];- let blocks = self.database_block_manager.get_blocks(None).await?;+ let blocks = self.database_blocks.get_blocks(None).await?;for block in blocks {let rows = self- .database_view_manager+ .database_views.get_row_revs(view_id, &block.block_id).await?;all_rows.extend(rows);@@ -480,17 +493,17 @@ impl DatabaseRevisionEditor {}pub async fn get_row_rev(&self, row_id: &str) -> FlowyResult<Option<Arc<RowRevision>>> {- match self.database_block_manager.get_row_rev(row_id).await? {+ match self.database_blocks.get_row_rev(row_id).await? {None => Ok(None),Some((_, row_rev)) => Ok(Some(row_rev)),}}pub async fn delete_row(&self, row_id: &str) -> FlowyResult<()> {- let row_rev = self.database_block_manager.delete_row(row_id).await?;+ let row_rev = self.database_blocks.delete_row(row_id).await?;tracing::trace!("Did delete row:{:?}", row_rev);if let Some(row_rev) = row_rev {- self.database_view_manager.did_delete_row(row_rev).await;+ self.database_views.did_delete_row(row_rev).await;}Ok(())}@@ -499,10 +512,7 @@ impl DatabaseRevisionEditor {&self,view_id: &str,) -> FlowyResult<broadcast::Receiver<DatabaseViewChanged>> {- self- .database_view_manager- .subscribe_view_changed(view_id)- .await+ self.database_views.subscribe_view_changed(view_id).await}pub async fn duplicate_row(&self, _row_id: &str) -> FlowyResult<()> {@@ -557,7 +567,7 @@ impl DatabaseRevisionEditor {) -> Option<(FieldType, CellProtobufBlob)> {let field_rev = self.get_field_rev(¶ms.field_id).await?;let (_, row_rev) = self- .database_block_manager+ .database_blocks.get_row_rev(¶ms.row_id).await.ok()??;@@ -574,7 +584,7 @@ impl DatabaseRevisionEditor {row_id: &str,field_id: &str,) -> FlowyResult<Option<CellRevision>> {- match self.database_block_manager.get_row_rev(row_id).await? {+ match self.database_blocks.get_row_rev(row_id).await? {None => Ok(None),Some((_, row_rev)) => {let cell_rev = row_rev.cells.get(field_id).cloned();@@ -589,7 +599,7 @@ impl DatabaseRevisionEditor {view_id: &str,field_id: &str,) -> FlowyResult<Vec<RowSingleCellData>> {- let view_editor = self.database_view_manager.get_view_editor(view_id).await?;+ let view_editor = self.database_views.get_view_editor(view_id).await?;view_editor.get_cells_for_field(field_id).await}@@ -621,17 +631,14 @@ impl DatabaseRevisionEditor {Some(self.cell_data_cache.clone()),)?;let cell_changeset = CellChangesetPB {- database_id: self.database_id.clone(),+ view_id: self.database_id.clone(),row_id: row_id.to_owned(),field_id: field_id.to_owned(),type_cell_data,};+ self.database_blocks.update_cell(cell_changeset).await?;self- .database_block_manager- .update_cell(cell_changeset)- .await?;- self- .database_view_manager+ .database_views.did_update_row(old_row_rev, row_id).await;Ok(())@@ -671,15 +678,12 @@ impl DatabaseRevisionEditor {.collect::<Vec<String>>(),Some(block_ids) => block_ids,};- let blocks = self- .database_block_manager- .get_blocks(Some(block_ids))- .await?;+ let blocks = self.database_blocks.get_blocks(Some(block_ids)).await?;Ok(blocks)}pub async fn delete_rows(&self, block_rows: Vec<DatabaseBlockRow>) -> FlowyResult<()> {- let changesets = self.database_block_manager.delete_rows(block_rows).await?;+ let changesets = self.database_blocks.delete_rows(block_rows).await?;for changeset in changesets {self.update_block(changeset).await?;}@@ -707,15 +711,15 @@ impl DatabaseRevisionEditor {})}- pub async fn get_setting(&self) -> FlowyResult<DatabaseViewSettingPB> {- self.database_view_manager.get_setting().await+ pub async fn get_setting(&self, view_id: &str) -> FlowyResult<DatabaseViewSettingPB> {+ self.database_views.get_setting(view_id).await}- pub async fn get_all_filters(&self) -> FlowyResult<Vec<FilterPB>> {+ pub async fn get_all_filters(&self, view_id: &str) -> FlowyResult<Vec<FilterPB>> {Ok(self- .database_view_manager- .get_all_filters()+ .database_views+ .get_all_filters(view_id).await?.into_iter().map(|filter| FilterPB::from(filter.as_ref()))@@ -723,27 +727,28 @@ impl DatabaseRevisionEditor {)}- pub async fn get_filters(&self, filter_id: FilterType) -> FlowyResult<Vec<Arc<FilterRevision>>> {- self.database_view_manager.get_filters(&filter_id).await+ pub async fn get_filters(+ &self,+ view_id: &str,+ filter_id: FilterType,+ ) -> FlowyResult<Vec<Arc<FilterRevision>>> {+ self.database_views.get_filters(view_id, &filter_id).await}pub async fn create_or_update_filter(&self, params: AlterFilterParams) -> FlowyResult<()> {- self- .database_view_manager- .create_or_update_filter(params)- .await?;+ self.database_views.create_or_update_filter(params).await?;Ok(())}pub async fn delete_filter(&self, params: DeleteFilterParams) -> FlowyResult<()> {- self.database_view_manager.delete_filter(params).await?;+ self.database_views.delete_filter(params).await?;Ok(())}pub async fn get_all_sorts(&self, view_id: &str) -> FlowyResult<Vec<SortPB>> {Ok(self- .database_view_manager+ .database_views.get_all_sorts(view_id).await?.into_iter()@@ -753,31 +758,25 @@ impl DatabaseRevisionEditor {}pub async fn delete_all_sorts(&self, view_id: &str) -> FlowyResult<()> {- self.database_view_manager.delete_all_sorts(view_id).await+ self.database_views.delete_all_sorts(view_id).await}pub async fn delete_sort(&self, params: DeleteSortParams) -> FlowyResult<()> {- self.database_view_manager.delete_sort(params).await?;+ self.database_views.delete_sort(params).await?;Ok(())}pub async fn create_or_update_sort(&self, params: AlterSortParams) -> FlowyResult<SortRevision> {- let sort_rev = self- .database_view_manager- .create_or_update_sort(params)- .await?;+ let sort_rev = self.database_views.create_or_update_sort(params).await?;Ok(sort_rev)}pub async fn insert_group(&self, params: InsertGroupParams) -> FlowyResult<()> {- self- .database_view_manager- .insert_or_update_group(params)- .await+ self.database_views.insert_or_update_group(params).await}pub async fn delete_group(&self, params: DeleteGroupParams) -> FlowyResult<()> {- self.database_view_manager.delete_group(params).await+ self.database_views.delete_group(params).await}pub async fn move_row(&self, params: MoveRowParams) -> FlowyResult<()> {@@ -787,21 +786,17 @@ impl DatabaseRevisionEditor {to_row_id,} = params;- match self- .database_block_manager- .get_row_rev(&from_row_id)- .await?- {+ match self.database_blocks.get_row_rev(&from_row_id).await? {None => tracing::warn!("Move row failed, can not find the row:{}", from_row_id),Some((_, row_rev)) => {match (- self.database_block_manager.index_of_row(&from_row_id).await,- self.database_block_manager.index_of_row(&to_row_id).await,+ self.database_blocks.index_of_row(&from_row_id).await,+ self.database_blocks.index_of_row(&to_row_id).await,) {(Some(from_index), Some(to_index)) => {tracing::trace!("Move row from {} to {}", from_index, to_index);self- .database_block_manager+ .database_blocks.move_row(row_rev.clone(), from_index, to_index).await?;},@@ -821,38 +816,40 @@ impl DatabaseRevisionEditor {to_row_id,} = params;- match self- .database_block_manager- .get_row_rev(&from_row_id)- .await?- {+ match self.database_blocks.get_row_rev(&from_row_id).await? {None => tracing::warn!("Move row failed, can not find the row:{}", from_row_id),Some((_, row_rev)) => {- let block_manager = self.database_block_manager.clone();+ let block_manager = self.database_blocks.clone();self- .database_view_manager- .move_group_row(row_rev, to_group_id, to_row_id.clone(), |row_changeset| {- to_fut(async move {- tracing::trace!("Row data changed: {:?}", row_changeset);- let cell_changesets = row_changeset- .cell_by_field_id- .into_iter()- .map(|(field_id, cell_rev)| CellChangesetPB {- database_id: view_id.clone(),- row_id: row_changeset.row_id.clone(),- field_id,- type_cell_data: cell_rev.type_cell_data,- })- .collect::<Vec<CellChangesetPB>>();-- for cell_changeset in cell_changesets {- match block_manager.update_cell(cell_changeset).await {- Ok(_) => {},- Err(e) => tracing::error!("Apply cell changeset error:{:?}", e),+ .database_views+ .move_group_row(+ &view_id.clone(),+ row_rev,+ to_group_id,+ to_row_id.clone(),+ |row_changeset| {+ to_fut(async move {+ tracing::trace!("Row data changed: {:?}", row_changeset);+ let cell_changesets = row_changeset+ .cell_by_field_id+ .into_iter()+ .map(|(field_id, cell_rev)| CellChangesetPB {+ view_id: view_id.clone(),+ row_id: row_changeset.row_id.clone(),+ field_id,+ type_cell_data: cell_rev.type_cell_data,+ })+ .collect::<Vec<CellChangesetPB>>();++ for cell_changeset in cell_changesets {+ match block_manager.update_cell(cell_changeset).await {+ Ok(_) => {},+ Err(e) => tracing::error!("Apply cell changeset error:{:?}", e),+ }}- }- })- })+ })+ },+ ).await?;},}@@ -885,9 +882,9 @@ impl DatabaseRevisionEditor {Ok(())}- pub async fn duplicate_database(&self) -> FlowyResult<BuildDatabaseContext> {+ pub async fn duplicate_database(&self, view_id: &str) -> FlowyResult<BuildDatabaseContext> {let database_pad = self.database_pad.read().await;- let database_view_data = self.database_view_manager.duplicate_database_view().await?;+ let database_view_data = self.database_views.duplicate_database_view(view_id).await?;let original_blocks = database_pad.get_block_meta_revs();let (duplicated_fields, duplicated_blocks) = database_pad.duplicate_database_block_meta().await;@@ -895,7 +892,7 @@ impl DatabaseRevisionEditor {if original_blocks.len() == duplicated_blocks.len() {for (index, original_block_meta) in original_blocks.iter().enumerate() {let database_block_meta_editor = self- .database_block_manager+ .database_blocks.get_or_create_block_editor(&original_block_meta.block_id).await?;let duplicated_block_id = &duplicated_blocks[index].block_id;@@ -920,8 +917,8 @@ impl DatabaseRevisionEditor {}#[tracing::instrument(level = "trace", skip_all, err)]- pub async fn load_groups(&self) -> FlowyResult<RepeatedGroupPB> {- self.database_view_manager.load_groups().await+ pub async fn load_groups(&self, view_id: &str) -> FlowyResult<RepeatedGroupPB> {+ self.database_views.load_groups(view_id).await}async fn create_row_rev(&self) -> FlowyResult<RowRevision> {@@ -929,7 +926,7 @@ impl DatabaseRevisionEditor {let block_id = self.block_id().await?;// insert empty row below the row whose id is upper_row_id- let row_rev = RowRevisionBuilder::new(&block_id, &field_revs).build();+ let row_rev = RowRevisionBuilder::new(&block_id, field_revs).build();Ok(row_rev)}@@ -943,7 +940,7 @@ impl DatabaseRevisionEditor {// insert the rowlet row_count = self- .database_block_manager+ .database_blocks.create_row(row_rev, start_row_id).await?;@@ -986,10 +983,13 @@ impl DatabaseRevisionEditor {async fn notify_did_insert_database_field(&self, field_id: &str) -> FlowyResult<()> {if let Some((index, field_rev)) = self.database_pad.read().await.get_field_rev(field_id) {let index_field = IndexFieldPB::from_field_rev(field_rev, index);- //TODO(nathan): broadcast the changeset to views that reference to this database- let notified_changeset =- DatabaseFieldChangesetPB::insert(&self.database_id, vec![index_field]);- self.notify_did_update_database(notified_changeset).await?;+ if let Ok(views) = self.database_ref_query.get_ref_views(&self.database_id) {+ for view in views {+ let notified_changeset =+ DatabaseFieldChangesetPB::insert(&view.view_id, vec![index_field.clone()]);+ self.notify_did_update_database(notified_changeset).await?;+ }+ }}Ok(())}@@ -1020,15 +1020,20 @@ impl DatabaseRevisionEditor {&self,changeset: DatabaseFieldChangesetPB,) -> FlowyResult<()> {- send_notification(&self.database_id, DatabaseNotification::DidUpdateFields)- .payload(changeset)- .send();+ if let Ok(views) = self.database_ref_query.get_ref_views(&self.database_id) {+ for view in views {+ send_notification(&view.view_id, DatabaseNotification::DidUpdateFields)+ .payload(changeset.clone())+ .send();+ }+ }+Ok(())}}#[cfg(feature = "flowy_unit_test")]-impl DatabaseRevisionEditor {+impl DatabaseEditor {pub fn rev_manager(&self) -> Arc<RevisionManager<Arc<ConnectionPool>>> {self.rev_manager.clone()}diff --git a/frontend/rust-lib/flowy-database/src/services/database/trait_impl.rs b/frontend/rust-lib/flowy-database/src/services/database/trait_impl.rsindex 4c2d0d68d0..b7278f01f0 100644--- a/frontend/rust-lib/flowy-database/src/services/database/trait_impl.rs+++ b/frontend/rust-lib/flowy-database/src/services/database/trait_impl.rs@@ -1,7 +1,7 @@use crate::entities::FieldType;use crate::services::cell::AtomicCellDataCache;-use crate::services::database::DatabaseBlockManager;-use crate::services::database_view::DatabaseViewEditorDelegate;+use crate::services::database::DatabaseBlocks;+use crate::services::database_view::DatabaseViewData;use crate::services::field::{TypeOptionCellDataHandler, TypeOptionCellExt};use crate::services::row::DatabaseBlockRowRevision;@@ -13,14 +13,14 @@ use std::any::type_name;use std::sync::Arc;use tokio::sync::RwLock;-pub struct DatabaseViewEditorDelegateImpl {+pub struct DatabaseViewDataImpl {pub(crate) pad: Arc<RwLock<DatabaseRevisionPad>>,- pub(crate) block_manager: Arc<DatabaseBlockManager>,+ pub(crate) blocks: Arc<DatabaseBlocks>,pub(crate) task_scheduler: Arc<RwLock<TaskDispatcher>>,pub(crate) cell_data_cache: AtomicCellDataCache,}-impl DatabaseViewEditorDelegate for DatabaseViewEditorDelegateImpl {+impl DatabaseViewData for DatabaseViewDataImpl {fn get_field_revs(&self, field_ids: Option<Vec<String>>) -> Fut<Vec<Arc<FieldRevision>>> {let pad = self.pad.clone();to_fut(async move {@@ -29,7 +29,7 @@ impl DatabaseViewEditorDelegate for DatabaseViewEditorDelegateImpl {Err(e) => {tracing::error!("[{}] get field revisions failed: {}",- type_name::<DatabaseViewEditorDelegateImpl>(),+ type_name::<DatabaseViewDataImpl>(),e);vec![]@@ -44,13 +44,13 @@ impl DatabaseViewEditorDelegate for DatabaseViewEditorDelegateImpl {}fn index_of_row(&self, row_id: &str) -> Fut<Option<usize>> {- let block_manager = self.block_manager.clone();+ let block_manager = self.blocks.clone();let row_id = row_id.to_owned();to_fut(async move { block_manager.index_of_row(&row_id).await })}fn get_row_rev(&self, row_id: &str) -> Fut<Option<(usize, Arc<RowRevision>)>> {- let block_manager = self.block_manager.clone();+ let block_manager = self.blocks.clone();let row_id = row_id.to_owned();to_fut(async move {match block_manager.get_row_rev(&row_id).await {@@ -61,7 +61,7 @@ impl DatabaseViewEditorDelegate for DatabaseViewEditorDelegateImpl {}fn get_row_revs(&self, block_id: Option<Vec<String>>) -> Fut<Vec<Arc<RowRevision>>> {- let block_manager = self.block_manager.clone();+ let block_manager = self.blocks.clone();to_fut(async move {let blocks = block_manager.get_blocks(block_id).await.unwrap();@@ -77,7 +77,7 @@ impl DatabaseViewEditorDelegate for DatabaseViewEditorDelegateImpl {// }fn get_blocks(&self) -> Fut<Vec<DatabaseBlockRowRevision>> {- let block_manager = self.block_manager.clone();+ let block_manager = self.blocks.clone();to_fut(async move { block_manager.get_blocks(None).await.unwrap_or_default() })}diff --git a/frontend/rust-lib/flowy-database/src/services/database_view/editor.rs b/frontend/rust-lib/flowy-database/src/services/database_view/editor.rsindex cf62aaaf0c..400d768a98 100644--- a/frontend/rust-lib/flowy-database/src/services/database_view/editor.rs+++ b/frontend/rust-lib/flowy-database/src/services/database_view/editor.rs@@ -10,7 +10,7 @@ use crate::services::filter::{FilterChangeset, FilterController, FilterTaskHandler, FilterType, UpdatedFilterType,};use crate::services::group::{- default_group_configuration, find_group_field, make_group_controller, Group,+ default_group_configuration, find_grouping_field, make_group_controller, Group,GroupConfigurationReader, GroupController, MoveGroupRowContext,};use crate::services::row::DatabaseBlockRowRevision;@@ -18,11 +18,11 @@ use crate::services::sort::{DeletedSortType, SortChangeset, SortController, SortTaskHandler, SortType,};use database_model::{- gen_database_filter_id, gen_database_sort_id, FieldRevision, FieldTypeRevision, FilterRevision,- LayoutRevision, RowChangeset, RowRevision, SortRevision,+ gen_database_filter_id, gen_database_id, gen_database_sort_id, FieldRevision, FieldTypeRevision,+ FilterRevision, LayoutRevision, RowChangeset, RowRevision, SortRevision,};use flowy_client_sync::client_database::{- make_grid_view_operations, DatabaseViewRevisionPad, GridViewRevisionChangeset,+ make_database_view_operations, DatabaseViewRevisionChangeset, DatabaseViewRevisionPad,};use flowy_error::FlowyResult;use flowy_revision::RevisionManager;@@ -38,7 +38,7 @@ use std::future::Future;use std::sync::Arc;use tokio::sync::{broadcast, RwLock};-pub trait DatabaseViewEditorDelegate: Send + Sync + 'static {+pub trait DatabaseViewData: Send + Sync + 'static {/// If the field_ids is None, then it will return all the field revisionsfn get_field_revs(&self, field_ids: Option<Vec<String>>) -> Fut<Vec<Arc<FieldRevision>>>;@@ -73,53 +73,29 @@ pub trait DatabaseViewEditorDelegate: Send + Sync + 'static {) -> Option<Box<dyn TypeOptionCellDataHandler>>;}-pub struct DatabaseViewRevisionEditor {+pub struct DatabaseViewEditor {user_id: String,- view_id: String,+ pub view_id: String,pad: Arc<RwLock<DatabaseViewRevisionPad>>,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,- delegate: Arc<dyn DatabaseViewEditorDelegate>,+ delegate: Arc<dyn DatabaseViewData>,group_controller: Arc<RwLock<Box<dyn GroupController>>>,filter_controller: Arc<FilterController>,sort_controller: Arc<RwLock<SortController>>,pub notifier: DatabaseViewChangedNotifier,}-impl DatabaseViewRevisionEditor {- #[tracing::instrument(level = "trace", skip_all, err)]- pub async fn new(+impl DatabaseViewEditor {+ pub async fn from_pad(user_id: &str,- token: &str,- view_id: String,- delegate: Arc<dyn DatabaseViewEditorDelegate>,+ delegate: Arc<dyn DatabaseViewData>,cell_data_cache: AtomicCellDataCache,- mut rev_manager: RevisionManager<Arc<ConnectionPool>>,+ rev_manager: RevisionManager<Arc<ConnectionPool>>,+ view_rev_pad: DatabaseViewRevisionPad,) -> FlowyResult<Self> {+ let view_id = view_rev_pad.view_id.clone();let (notifier, _) = broadcast::channel(100);tokio::spawn(DatabaseViewChangedReceiverRunner(Some(notifier.subscribe())).run());- let cloud = Arc::new(GridViewRevisionCloudService {- token: token.to_owned(),- });-- let view_rev_pad = match rev_manager- .initialize::<GridViewRevisionSerde>(Some(cloud))- .await- {- Ok(pad) => pad,- Err(err) => {- // It shouldn't be here, because the snapshot should come to recue.- tracing::error!("Deserialize grid view revisions failed: {}", err);- let view = DatabaseViewRevisionPad::new(- view_id.to_owned(),- view_id.to_owned(),- LayoutRevision::Grid,- );- let bytes = make_grid_view_operations(&view).json_bytes();- let reset_revision = Revision::initial_revision(&view_id, bytes);- let _ = rev_manager.reset_object(vec![reset_revision]).await;- view- },- };let view_rev_pad = Arc::new(RwLock::new(view_rev_pad));let rev_manager = Arc::new(rev_manager);@@ -165,6 +141,43 @@ impl DatabaseViewRevisionEditor {})}+ #[tracing::instrument(level = "trace", skip_all, err)]+ pub async fn new(+ user_id: &str,+ token: &str,+ view_id: String,+ delegate: Arc<dyn DatabaseViewData>,+ cell_data_cache: AtomicCellDataCache,+ mut rev_manager: RevisionManager<Arc<ConnectionPool>>,+ ) -> FlowyResult<Self> {+ let cloud = Arc::new(DatabaseViewRevisionCloudService {+ token: token.to_owned(),+ });++ let view_rev_pad = match rev_manager+ .initialize::<DatabaseViewRevisionSerde>(Some(cloud))+ .await+ {+ Ok(pad) => pad,+ Err(err) => {+ // It shouldn't be here, because the snapshot should come to recue.+ tracing::error!("Deserialize database view revisions failed: {}", err);+ let (view, reset_revision) = generate_restore_view(&view_id).await;+ let _ = rev_manager.reset_object(vec![reset_revision]).await;+ view+ },+ };++ Self::from_pad(+ user_id,+ delegate,+ cell_data_cache,+ rev_manager,+ view_rev_pad,+ )+ .await+ }+#[tracing::instrument(name = "close grid view editor", level = "trace", skip_all)]pub async fn close(&self) {self.rev_manager.generate_snapshot().await;@@ -177,18 +190,18 @@ impl DatabaseViewRevisionEditor {let changeset = match event.into_owned() {DatabaseBlockEvent::InsertRow { block_id: _, row } => {//- ViewRowsChangesetPB::from_insert(self.view_id.clone(), vec![row])+ RowsChangesetPB::from_insert(self.view_id.clone(), vec![row])},DatabaseBlockEvent::UpdateRow { block_id: _, row } => {//- ViewRowsChangesetPB::from_update(self.view_id.clone(), vec![row])+ RowsChangesetPB::from_update(self.view_id.clone(), vec![row])},DatabaseBlockEvent::DeleteRow {block_id: _,row_id,} => {//- ViewRowsChangesetPB::from_delete(self.view_id.clone(), vec![row_id])+ RowsChangesetPB::from_delete(self.view_id.clone(), vec![row_id])},DatabaseBlockEvent::Move {block_id: _,@@ -196,7 +209,7 @@ impl DatabaseViewRevisionEditor {inserted_row,} => {//- ViewRowsChangesetPB::from_move(+ RowsChangesetPB::from_move(self.view_id.clone(),vec![deleted_row_id],vec![inserted_row],@@ -450,7 +463,7 @@ impl DatabaseViewRevisionEditor {pub async fn get_view_setting(&self) -> DatabaseViewSettingPB {let field_revs = self.delegate.get_field_revs(None).await;- make_grid_setting(&*self.pad.read().await, &field_revs)+ make_database_view_setting(&*self.pad.read().await, &field_revs)}pub async fn get_all_view_sorts(&self) -> Vec<Arc<SortRevision>> {@@ -781,7 +794,7 @@ impl DatabaseViewRevisionEditor {whereF: for<'a> FnOnce(&'a mut DatabaseViewRevisionPad,- ) -> FlowyResult<Option<GridViewRevisionChangeset>>,+ ) -> FlowyResult<Option<DatabaseViewRevisionChangeset>>,{let mut write_guard = self.pad.write().await;match f(&mut write_guard)? {@@ -825,7 +838,7 @@ impl DatabaseViewRevisionEditor {}/// Returns the list of cells corresponding to the given field.pub(crate) async fn get_cells_for_field(- delegate: Arc<dyn DatabaseViewEditorDelegate>,+ delegate: Arc<dyn DatabaseViewData>,field_id: &str,) -> FlowyResult<Vec<RowSingleCellData>> {let row_revs = delegate.get_row_revs(None).await;@@ -854,7 +867,7 @@ pub(crate) async fn get_cells_for_field(}#[async_trait]-impl RefCountValue for DatabaseViewRevisionEditor {+impl RefCountValue for DatabaseViewEditor {async fn did_remove(&self) {self.close().await;}@@ -865,7 +878,7 @@ async fn new_group_controller(view_id: String,view_rev_pad: Arc<RwLock<DatabaseViewRevisionPad>>,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,- delegate: Arc<dyn DatabaseViewEditorDelegate>,+ delegate: Arc<dyn DatabaseViewData>,) -> FlowyResult<Box<dyn GroupController>> {let configuration_reader = GroupConfigurationReaderImpl {pad: view_rev_pad.clone(),@@ -884,7 +897,7 @@ async fn new_group_controller(.find(|field_rev| field_rev.id == configuration.field_id).cloned()})- .unwrap_or_else(|| find_group_field(&field_revs, &layout).unwrap());+ .unwrap_or_else(|| find_grouping_field(&field_revs, &layout).unwrap());new_group_controller_with_field_rev(user_id,@@ -905,7 +918,7 @@ async fn new_group_controller_with_field_rev(view_id: String,view_rev_pad: Arc<RwLock<DatabaseViewRevisionPad>>,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,- field_rev: Arc<FieldRevision>,+ grouping_field_rev: Arc<FieldRevision>,row_revs: Vec<Arc<RowRevision>>,configuration_reader: GroupConfigurationReaderImpl,) -> FlowyResult<Box<dyn GroupController>> {@@ -916,7 +929,7 @@ async fn new_group_controller_with_field_rev(};make_group_controller(view_id,- field_rev,+ grouping_field_rev,row_revs,configuration_reader,configuration_writer,@@ -926,7 +939,7 @@ async fn new_group_controller_with_field_rev(async fn make_filter_controller(view_id: &str,- delegate: Arc<dyn DatabaseViewEditorDelegate>,+ delegate: Arc<dyn DatabaseViewData>,notifier: DatabaseViewChangedNotifier,cell_data_cache: AtomicCellDataCache,pad: Arc<RwLock<DatabaseViewRevisionPad>>,@@ -934,7 +947,7 @@ async fn make_filter_controller(let field_revs = delegate.get_field_revs(None).await;let filter_revs = pad.read().await.get_all_filters(&field_revs);let task_scheduler = delegate.get_task_scheduler();- let filter_delegate = GridViewFilterDelegateImpl {+ let filter_delegate = DatabaseViewFilterDelegateImpl {editor_delegate: delegate.clone(),view_revision_pad: pad,};@@ -962,7 +975,7 @@ async fn make_filter_controller(async fn make_sort_controller(view_id: &str,- delegate: Arc<dyn DatabaseViewEditorDelegate>,+ delegate: Arc<dyn DatabaseViewData>,notifier: DatabaseViewChangedNotifier,filter_controller: Arc<FilterController>,pad: Arc<RwLock<DatabaseViewRevisionPad>>,@@ -971,7 +984,7 @@ async fn make_sort_controller(let handler_id = gen_handler_id();let field_revs = delegate.get_field_revs(None).await;let sorts = pad.read().await.get_all_sorts(&field_revs);- let sort_delegate = GridViewSortDelegateImpl {+ let sort_delegate = DatabaseViewSortDelegateImpl {editor_delegate: delegate.clone(),view_revision_pad: pad,filter_controller,@@ -998,6 +1011,19 @@ fn gen_handler_id() -> String {nanoid!(10)}+async fn generate_restore_view(view_id: &str) -> (DatabaseViewRevisionPad, Revision) {+ let database_id = gen_database_id();+ let view = DatabaseViewRevisionPad::new(+ database_id,+ view_id.to_owned(),+ "".to_string(),+ LayoutRevision::Grid,+ );+ let bytes = make_database_view_operations(&view).json_bytes();+ let reset_revision = Revision::initial_revision(view_id, bytes);+ (view, reset_revision)+}+#[cfg(test)]mod tests {use flowy_client_sync::client_database::DatabaseOperations;diff --git a/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rs b/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rsindex 44901f901b..ac7745d06e 100644--- a/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rs+++ b/frontend/rust-lib/flowy-database/src/services/database_view/editor_manager.rs@@ -6,13 +6,16 @@ use crate::manager::DatabaseUser;use crate::services::cell::AtomicCellDataCache;use crate::services::database::DatabaseBlockEvent;use crate::services::database_view::notifier::*;-use crate::services::database_view::trait_impl::GridViewRevisionMergeable;-use crate::services::database_view::{DatabaseViewEditorDelegate, DatabaseViewRevisionEditor};+use crate::services::database_view::trait_impl::{+ DatabaseViewRevisionMergeable, DatabaseViewRevisionSerde,+};+use crate::services::database_view::{DatabaseViewData, DatabaseViewEditor};use crate::services::filter::FilterType;use crate::services::persistence::rev_sqlite::{- SQLiteDatabaseRevisionSnapshotPersistence, SQLiteGridViewRevisionPersistence,+ SQLiteDatabaseRevisionSnapshotPersistence, SQLiteDatabaseViewRevisionPersistence,};use database_model::{FieldRevision, FilterRevision, RowChangeset, RowRevision, SortRevision};+use flowy_client_sync::client_database::DatabaseViewRevisionPad;use flowy_error::FlowyResult;use flowy_revision::{RevisionManager, RevisionPersistence, RevisionPersistenceConfiguration};use flowy_sqlite::ConnectionPool;@@ -22,37 +25,48 @@ use std::borrow::Cow;use std::sync::Arc;use tokio::sync::{broadcast, RwLock};-pub struct DatabaseViewManager {- database_id: String,+/// It's used to manager the list of views that reference to the same database.+pub struct DatabaseViews {user: Arc<dyn DatabaseUser>,- delegate: Arc<dyn DatabaseViewEditorDelegate>,- view_editors: Arc<RwLock<RefCountHashMap<Arc<DatabaseViewRevisionEditor>>>>,+ delegate: Arc<dyn DatabaseViewData>,+ view_editors: Arc<RwLock<RefCountHashMap<Arc<DatabaseViewEditor>>>>,cell_data_cache: AtomicCellDataCache,}-impl DatabaseViewManager {+impl DatabaseViews {pub async fn new(- database_id: String,user: Arc<dyn DatabaseUser>,- delegate: Arc<dyn DatabaseViewEditorDelegate>,+ delegate: Arc<dyn DatabaseViewData>,cell_data_cache: AtomicCellDataCache,block_event_rx: broadcast::Receiver<DatabaseBlockEvent>,) -> FlowyResult<Self> {let view_editors = Arc::new(RwLock::new(RefCountHashMap::default()));listen_on_database_block_event(block_event_rx, view_editors.clone());Ok(Self {- database_id,user,delegate,- cell_data_cache,view_editors,+ cell_data_cache,})}+ pub async fn open(&self, view_editor: DatabaseViewEditor) {+ let view_id = view_editor.view_id.clone();+ self+ .view_editors+ .write()+ .await+ .insert(view_id, Arc::new(view_editor));+ }+pub async fn close(&self, view_id: &str) {self.view_editors.write().await.remove(view_id).await;}+ pub async fn number_of_views(&self) -> usize {+ self.view_editors.read().await.values().len()+ }+pub async fn subscribe_view_changed(&self,view_id: &str,@@ -77,8 +91,8 @@ impl DatabaseViewManager {Ok(row_revs)}- pub async fn duplicate_database_view(&self) -> FlowyResult<String> {- let editor = self.get_default_view_editor().await?;+ pub async fn duplicate_database_view(&self, view_id: &str) -> FlowyResult<String> {+ let editor = self.get_view_editor(view_id).await?;let view_data = editor.duplicate_view_data().await?;Ok(view_data)}@@ -113,8 +127,8 @@ impl DatabaseViewManager {}}- pub async fn group_by_field(&self, field_id: &str) -> FlowyResult<()> {- let view_editor = self.get_default_view_editor().await?;+ pub async fn group_by_field(&self, view_id: &str, field_id: &str) -> FlowyResult<()> {+ let view_editor = self.get_view_editor(view_id).await?;view_editor.group_by_view_field(field_id).await?;Ok(())}@@ -125,18 +139,22 @@ impl DatabaseViewManager {}}- pub async fn get_setting(&self) -> FlowyResult<DatabaseViewSettingPB> {- let view_editor = self.get_default_view_editor().await?;+ pub async fn get_setting(&self, view_id: &str) -> FlowyResult<DatabaseViewSettingPB> {+ let view_editor = self.get_view_editor(view_id).await?;Ok(view_editor.get_view_setting().await)}- pub async fn get_all_filters(&self) -> FlowyResult<Vec<Arc<FilterRevision>>> {- let view_editor = self.get_default_view_editor().await?;+ pub async fn get_all_filters(&self, view_id: &str) -> FlowyResult<Vec<Arc<FilterRevision>>> {+ let view_editor = self.get_view_editor(view_id).await?;Ok(view_editor.get_all_view_filters().await)}- pub async fn get_filters(&self, filter_id: &FilterType) -> FlowyResult<Vec<Arc<FilterRevision>>> {- let view_editor = self.get_default_view_editor().await?;+ pub async fn get_filters(+ &self,+ view_id: &str,+ filter_id: &FilterType,+ ) -> FlowyResult<Vec<Arc<FilterRevision>>> {+ let view_editor = self.get_view_editor(view_id).await?;Ok(view_editor.get_view_filters(filter_id).await)}@@ -170,24 +188,24 @@ impl DatabaseViewManager {view_editor.delete_view_sort(params).await}- pub async fn load_groups(&self) -> FlowyResult<RepeatedGroupPB> {- let view_editor = self.get_default_view_editor().await?;+ pub async fn load_groups(&self, view_id: &str) -> FlowyResult<RepeatedGroupPB> {+ let view_editor = self.get_view_editor(view_id).await?;let groups = view_editor.load_view_groups().await?;Ok(RepeatedGroupPB { items: groups })}pub async fn insert_or_update_group(&self, params: InsertGroupParams) -> FlowyResult<()> {- let view_editor = self.get_default_view_editor().await?;+ let view_editor = self.get_view_editor(¶ms.view_id).await?;view_editor.initialize_new_group(params).await}pub async fn delete_group(&self, params: DeleteGroupParams) -> FlowyResult<()> {- let view_editor = self.get_default_view_editor().await?;+ let view_editor = self.get_view_editor(¶ms.view_id).await?;view_editor.delete_view_group(params).await}pub async fn move_group(&self, params: MoveGroupParams) -> FlowyResult<()> {- let view_editor = self.get_default_view_editor().await?;+ let view_editor = self.get_view_editor(¶ms.view_id).await?;view_editor.move_view_group(params).await?;Ok(())}@@ -197,13 +215,14 @@ impl DatabaseViewManager {///pub async fn move_group_row(&self,+ view_id: &str,row_rev: Arc<RowRevision>,to_group_id: String,to_row_id: Option<String>,recv_row_changeset: impl FnOnce(RowChangeset) -> Fut<()>,) -> FlowyResult<()> {let mut row_changeset = RowChangeset::new(row_rev.id.clone());- let view_editor = self.get_default_view_editor().await?;+ let view_editor = self.get_view_editor(view_id).await?;view_editor.move_view_group_row(&row_rev,@@ -230,10 +249,11 @@ impl DatabaseViewManager {#[tracing::instrument(level = "trace", skip(self), err)]pub async fn did_update_view_field_type_option(&self,+ view_id: &str,field_id: &str,old_field_rev: Option<Arc<FieldRevision>>,) -> FlowyResult<()> {- let view_editor = self.get_default_view_editor().await?;+ let view_editor = self.get_view_editor(view_id).await?;if view_editor.group_id().await == field_id {view_editor.group_by_view_field(field_id).await?;}@@ -244,32 +264,25 @@ impl DatabaseViewManager {Ok(())}- pub async fn get_view_editor(- &self,- view_id: &str,- ) -> FlowyResult<Arc<DatabaseViewRevisionEditor>> {+ pub async fn get_view_editor(&self, view_id: &str) -> FlowyResult<Arc<DatabaseViewEditor>> {debug_assert!(!view_id.is_empty());if let Some(editor) = self.view_editors.read().await.get(view_id) {return Ok(editor);}- tracing::trace!("{:p} create view_editor", self);+ tracing::trace!("{:p} create view:{} editor", self, view_id);let mut view_editors = self.view_editors.write().await;let editor = Arc::new(self.make_view_editor(view_id).await?);view_editors.insert(view_id.to_owned(), editor.clone());Ok(editor)}- async fn get_default_view_editor(&self) -> FlowyResult<Arc<DatabaseViewRevisionEditor>> {- self.get_view_editor(&self.database_id).await- }-- async fn make_view_editor(&self, view_id: &str) -> FlowyResult<DatabaseViewRevisionEditor> {+ async fn make_view_editor(&self, view_id: &str) -> FlowyResult<DatabaseViewEditor> {let rev_manager = make_database_view_rev_manager(&self.user, view_id).await?;let user_id = self.user.user_id()?;let token = self.user.token()?;let view_id = view_id.to_owned();- DatabaseViewRevisionEditor::new(+ DatabaseViewEditor::new(&user_id,&token,view_id,@@ -281,27 +294,21 @@ impl DatabaseViewManager {}}-fn listen_on_database_block_event(- mut block_event_rx: broadcast::Receiver<DatabaseBlockEvent>,- view_editors: Arc<RwLock<RefCountHashMap<Arc<DatabaseViewRevisionEditor>>>>,-) {- tokio::spawn(async move {- loop {- while let Ok(event) = block_event_rx.recv().await {- let read_guard = view_editors.read().await;- let view_editors = read_guard.values();- let event = if view_editors.len() == 1 {- Cow::Owned(event)- } else {- Cow::Borrowed(&event)- };- for view_editor in view_editors.iter() {- view_editor.handle_block_event(event.clone()).await;- }- }- }- });+#[tracing::instrument(level = "trace", skip(user), err)]+pub async fn make_database_view_revision_pad(+ view_id: &str,+ user: Arc<dyn DatabaseUser>,+) -> FlowyResult<(+ DatabaseViewRevisionPad,+ RevisionManager<Arc<ConnectionPool>>,+)> {+ let mut rev_manager = make_database_view_rev_manager(&user, view_id).await?;+ let view_rev_pad = rev_manager+ .initialize::<DatabaseViewRevisionSerde>(None)+ .await?;+ Ok((view_rev_pad, rev_manager))}+pub async fn make_database_view_rev_manager(user: &Arc<dyn DatabaseUser>,view_id: &str,@@ -310,16 +317,17 @@ pub async fn make_database_view_rev_manager(// Create revision persistencelet pool = user.db_pool()?;- let disk_cache = SQLiteGridViewRevisionPersistence::new(&user_id, pool.clone());+ let disk_cache = SQLiteDatabaseViewRevisionPersistence::new(&user_id, pool.clone());let configuration = RevisionPersistenceConfiguration::new(2, false);let rev_persistence = RevisionPersistence::new(&user_id, view_id, disk_cache, configuration);// Create snapshot persistence- let snapshot_object_id = format!("grid_view:{}", view_id);+ const DATABASE_VIEW_SP_PREFIX: &str = "grid_view";+ let snapshot_object_id = format!("{}:{}", DATABASE_VIEW_SP_PREFIX, view_id);let snapshot_persistence =SQLiteDatabaseRevisionSnapshotPersistence::new(&snapshot_object_id, pool);- let rev_compress = GridViewRevisionMergeable();+ let rev_compress = DatabaseViewRevisionMergeable();Ok(RevisionManager::new(&user_id,view_id,@@ -328,3 +336,25 @@ pub async fn make_database_view_rev_manager(snapshot_persistence,))}++fn listen_on_database_block_event(+ mut block_event_rx: broadcast::Receiver<DatabaseBlockEvent>,+ view_editors: Arc<RwLock<RefCountHashMap<Arc<DatabaseViewEditor>>>>,+) {+ tokio::spawn(async move {+ loop {+ while let Ok(event) = block_event_rx.recv().await {+ let read_guard = view_editors.read().await;+ let view_editors = read_guard.values();+ let event = if view_editors.len() == 1 {+ Cow::Owned(event)+ } else {+ Cow::Borrowed(&event)+ };+ for view_editor in view_editors.iter() {+ view_editor.handle_block_event(event.clone()).await;+ }+ }+ }+ });+}diff --git a/frontend/rust-lib/flowy-database/src/services/database_view/notifier.rs b/frontend/rust-lib/flowy-database/src/services/database_view/notifier.rsindex b2586bb919..9133ef2aa7 100644--- a/frontend/rust-lib/flowy-database/src/services/database_view/notifier.rs+++ b/frontend/rust-lib/flowy-database/src/services/database_view/notifier.rs@@ -1,4 +1,4 @@-use crate::entities::{ReorderAllRowsPB, ReorderSingleRowPB, ViewRowsVisibilityChangesetPB};+use crate::entities::{ReorderAllRowsPB, ReorderSingleRowPB, RowsVisibilityChangesetPB};use crate::notification::{send_notification, DatabaseNotification};use crate::services::filter::FilterResultNotification;use crate::services::sort::{ReorderAllRowsResult, ReorderSingleRowResult};@@ -34,7 +34,7 @@ impl DatabaseViewChangedReceiverRunner {.for_each(|changed| async {match changed {DatabaseViewChanged::FilterNotification(notification) => {- let changeset = ViewRowsVisibilityChangesetPB {+ let changeset = RowsVisibilityChangesetPB {view_id: notification.view_id,visible_rows: notification.visible_rows,invisible_rows: notification.invisible_rows,diff --git a/frontend/rust-lib/flowy-database/src/services/database_view/trait_impl.rs b/frontend/rust-lib/flowy-database/src/services/database_view/trait_impl.rsindex 31723c5959..ecf5b5c77d 100644--- a/frontend/rust-lib/flowy-database/src/services/database_view/trait_impl.rs+++ b/frontend/rust-lib/flowy-database/src/services/database_view/trait_impl.rs@@ -1,5 +1,5 @@use crate::entities::{CalendarSettingsParams, DatabaseViewSettingPB, LayoutSettingPB};-use crate::services::database_view::{get_cells_for_field, DatabaseViewEditorDelegate};+use crate::services::database_view::{get_cells_for_field, DatabaseViewData};use crate::services::field::RowSingleCellData;use crate::services::filter::{FilterController, FilterDelegate, FilterType};use crate::services::group::{GroupConfigurationReader, GroupConfigurationWriter};@@ -10,7 +10,7 @@ use database_model::{FieldRevision, FieldTypeRevision, FilterRevision, GroupConfigurationRevision, LayoutRevision,RowRevision, SortRevision,};-use flowy_client_sync::client_database::{DatabaseViewRevisionPad, GridViewRevisionChangeset};+use flowy_client_sync::client_database::{DatabaseViewRevisionChangeset, DatabaseViewRevisionPad};use flowy_client_sync::make_operations_from_revisions;use flowy_error::{FlowyError, FlowyResult};use flowy_revision::{@@ -24,12 +24,12 @@ use revision_model::Revision;use std::sync::Arc;use tokio::sync::RwLock;-pub(crate) struct GridViewRevisionCloudService {+pub(crate) struct DatabaseViewRevisionCloudService {#[allow(dead_code)]pub(crate) token: String,}-impl RevisionCloudService for GridViewRevisionCloudService {+impl RevisionCloudService for DatabaseViewRevisionCloudService {fn fetch_object(&self,_user_id: &str,@@ -39,8 +39,8 @@ impl RevisionCloudService for GridViewRevisionCloudService {}}-pub(crate) struct GridViewRevisionSerde();-impl RevisionObjectDeserializer for GridViewRevisionSerde {+pub(crate) struct DatabaseViewRevisionSerde();+impl RevisionObjectDeserializer for DatabaseViewRevisionSerde {type Output = DatabaseViewRevisionPad;fn deserialize_revisions(@@ -56,23 +56,23 @@ impl RevisionObjectDeserializer for GridViewRevisionSerde {}}-impl RevisionObjectSerializer for GridViewRevisionSerde {+impl RevisionObjectSerializer for DatabaseViewRevisionSerde {fn combine_revisions(revisions: Vec<Revision>) -> FlowyResult<Bytes> {let operations = make_operations_from_revisions::<EmptyAttributes>(revisions)?;Ok(operations.json_bytes())}}-pub(crate) struct GridViewRevisionMergeable();-impl RevisionMergeable for GridViewRevisionMergeable {+pub(crate) struct DatabaseViewRevisionMergeable();+impl RevisionMergeable for DatabaseViewRevisionMergeable {fn combine_revisions(&self, revisions: Vec<Revision>) -> FlowyResult<Bytes> {- GridViewRevisionSerde::combine_revisions(revisions)+ DatabaseViewRevisionSerde::combine_revisions(revisions)}}pub(crate) struct GroupConfigurationReaderImpl {pub(crate) pad: Arc<RwLock<DatabaseViewRevisionPad>>,- pub(crate) view_editor_delegate: Arc<dyn DatabaseViewEditorDelegate>,+ pub(crate) view_editor_delegate: Arc<dyn DatabaseViewData>,}impl GroupConfigurationReader for GroupConfigurationReaderImpl {@@ -131,9 +131,9 @@ impl GroupConfigurationWriter for GroupConfigurationWriterImpl {pub(crate) async fn apply_change(_user_id: &str,rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,- change: GridViewRevisionChangeset,+ change: DatabaseViewRevisionChangeset,) -> FlowyResult<()> {- let GridViewRevisionChangeset {+ let DatabaseViewRevisionChangeset {operations: delta,md5,} = change;@@ -142,7 +142,7 @@ pub(crate) async fn apply_change(Ok(())}-pub fn make_grid_setting(+pub fn make_database_view_setting(view_pad: &DatabaseViewRevisionPad,field_revs: &[Arc<FieldRevision>],) -> DatabaseViewSettingPB {@@ -170,12 +170,12 @@ pub fn make_grid_setting(}}-pub(crate) struct GridViewFilterDelegateImpl {- pub(crate) editor_delegate: Arc<dyn DatabaseViewEditorDelegate>,+pub(crate) struct DatabaseViewFilterDelegateImpl {+ pub(crate) editor_delegate: Arc<dyn DatabaseViewData>,pub(crate) view_revision_pad: Arc<RwLock<DatabaseViewRevisionPad>>,}-impl FilterDelegate for GridViewFilterDelegateImpl {+impl FilterDelegate for DatabaseViewFilterDelegateImpl {fn get_filter_rev(&self, filter_type: FilterType) -> Fut<Option<Arc<FilterRevision>>> {let pad = self.view_revision_pad.clone();to_fut(async move {@@ -210,13 +210,13 @@ impl FilterDelegate for GridViewFilterDelegateImpl {}}-pub(crate) struct GridViewSortDelegateImpl {- pub(crate) editor_delegate: Arc<dyn DatabaseViewEditorDelegate>,+pub(crate) struct DatabaseViewSortDelegateImpl {+ pub(crate) editor_delegate: Arc<dyn DatabaseViewData>,pub(crate) view_revision_pad: Arc<RwLock<DatabaseViewRevisionPad>>,pub(crate) filter_controller: Arc<FilterController>,}-impl SortDelegate for GridViewSortDelegateImpl {+impl SortDelegate for DatabaseViewSortDelegateImpl {fn get_sort_rev(&self, sort_type: SortType) -> Fut<Option<Arc<SortRevision>>> {let pad = self.view_revision_pad.clone();to_fut(async move {diff --git a/frontend/rust-lib/flowy-database/src/services/field/field_operation.rs b/frontend/rust-lib/flowy-database/src/services/field/field_operation.rsindex 6ceb8c5c06..4153531077 100644--- a/frontend/rust-lib/flowy-database/src/services/field/field_operation.rs+++ b/frontend/rust-lib/flowy-database/src/services/field/field_operation.rs@@ -1,12 +1,13 @@-use crate::services::database::DatabaseRevisionEditor;+use crate::services::database::DatabaseEditor;use crate::services::field::{MultiSelectTypeOptionPB, SingleSelectTypeOptionPB};use database_model::{TypeOptionDataDeserializer, TypeOptionDataSerializer};use flowy_error::FlowyResult;use std::sync::Arc;pub async fn edit_field_type_option<T>(+ view_id: &str,field_id: &str,- editor: Arc<DatabaseRevisionEditor>,+ editor: Arc<DatabaseEditor>,action: impl FnOnce(&mut T),) -> FlowyResult<()>where@@ -23,7 +24,7 @@ whereaction(&mut type_option);let bytes = type_option.protobuf_bytes().to_vec();editor- .update_field_type_option(field_id, bytes, old_field_rev)+ .update_field_type_option(view_id, field_id, bytes, old_field_rev).await?;}@@ -31,17 +32,19 @@ where}pub async fn edit_single_select_type_option(+ view_id: &str,field_id: &str,- editor: Arc<DatabaseRevisionEditor>,+ editor: Arc<DatabaseEditor>,action: impl FnOnce(&mut SingleSelectTypeOptionPB),) -> FlowyResult<()> {- edit_field_type_option(field_id, editor, action).await+ edit_field_type_option(view_id, field_id, editor, action).await}pub async fn edit_multi_select_type_option(+ view_id: &str,field_id: &str,- editor: Arc<DatabaseRevisionEditor>,+ editor: Arc<DatabaseEditor>,action: impl FnOnce(&mut MultiSelectTypeOptionPB),) -> FlowyResult<()> {- edit_field_type_option(field_id, editor, action).await+ edit_field_type_option(view_id, field_id, editor, action).await}diff --git a/frontend/rust-lib/flowy-database/src/services/group/controller.rs b/frontend/rust-lib/flowy-database/src/services/group/controller.rsindex de00b4b865..3432530396 100644--- a/frontend/rust-lib/flowy-database/src/services/group/controller.rs+++ b/frontend/rust-lib/flowy-database/src/services/group/controller.rs@@ -66,7 +66,7 @@ pub struct MoveGroupRowContext<'a> {/// G: the group generator, [GroupGenerator]/// P: the parser that impl [CellProtobufBlobParser] for the CellBytespub struct GenericGroupController<C, T, G, P> {- pub field_id: String,+ pub grouping_field_id: String,pub type_option: Option<T>,pub group_ctx: GroupContext<C>,group_action_phantom: PhantomData<G>,@@ -80,15 +80,16 @@ whereG: GroupGenerator<Context = GroupContext<C>, TypeOptionType = T>,{pub async fn new(- field_rev: &Arc<FieldRevision>,+ grouping_field_rev: &Arc<FieldRevision>,mut configuration: GroupContext<C>,) -> FlowyResult<Self> {- let type_option = field_rev.get_type_option::<T>(field_rev.ty);- let generated_group_context = G::generate_groups(field_rev, &configuration, &type_option);+ let type_option = grouping_field_rev.get_type_option::<T>(grouping_field_rev.ty);+ let generated_group_context =+ G::generate_groups(grouping_field_rev, &configuration, &type_option);let _ = configuration.init_groups(generated_group_context)?;Ok(Self {- field_id: field_rev.id.clone(),+ grouping_field_id: grouping_field_rev.id.clone(),type_option,group_ctx: configuration,group_action_phantom: PhantomData,@@ -180,7 +181,7 @@ whereSelf: GroupCustomize<CellData = P::Object>,{fn field_id(&self) -> &str {- &self.field_id+ &self.grouping_field_id}fn groups(&self) -> Vec<&Group> {@@ -199,7 +200,7 @@ wherefield_rev: &FieldRevision,) -> FlowyResult<()> {for row_rev in row_revs {- let cell_rev = match row_rev.cells.get(&self.field_id) {+ let cell_rev = match row_rev.cells.get(&self.grouping_field_id) {None => self.placeholder_cell(),Some(cell_rev) => Some(cell_rev.clone()),};@@ -288,7 +289,7 @@ wheredeleted_group: None,row_changesets: vec![],};- if let Some(cell_rev) = row_rev.cells.get(&self.field_id) {+ if let Some(cell_rev) = row_rev.cells.get(&self.grouping_field_id) {let cell_bytes = get_type_cell_protobuf(cell_rev.type_cell_data.clone(), field_rev, None).1;let cell_data = cell_bytes.parser::<P>()?;if !cell_data.is_empty() {@@ -321,7 +322,7 @@ wheredeleted_group: None,row_changesets: vec![],};- let cell_rev = match context.row_rev.cells.get(&self.field_id) {+ let cell_rev = match context.row_rev.cells.get(&self.grouping_field_id) {Some(cell_rev) => Some(cell_rev.clone()),None => self.placeholder_cell(),};diff --git a/frontend/rust-lib/flowy-database/src/services/group/group_util.rs b/frontend/rust-lib/flowy-database/src/services/group/group_util.rsindex fb38a700ab..9caa39a70b 100644--- a/frontend/rust-lib/flowy-database/src/services/group/group_util.rs+++ b/frontend/rust-lib/flowy-database/src/services/group/group_util.rs@@ -21,7 +21,7 @@ use std::sync::Arc;/// # Arguments////// * `view_id`: the id of the view-/// * `field_rev`: the grouping field+/// * `grouping_field_rev`: the grouping field/// * `row_revs`: the rows will be separated into different groups/// * `configuration_reader`: a reader used to read the group configuration from disk/// * `configuration_writer`: as writer used to write the group configuration to disk@@ -29,7 +29,7 @@ use std::sync::Arc;#[tracing::instrument(level = "trace", skip_all, err)]pub async fn make_group_controller<R, W>(view_id: String,- field_rev: Arc<FieldRevision>,+ grouping_field_rev: Arc<FieldRevision>,row_revs: Vec<Arc<RowRevision>>,configuration_reader: R,configuration_writer: W,@@ -38,68 +38,68 @@ whereR: GroupConfigurationReader,W: GroupConfigurationWriter,{- let field_type: FieldType = field_rev.ty.into();+ let grouping_field_type: FieldType = grouping_field_rev.ty.into();let mut group_controller: Box<dyn GroupController>;let configuration_reader = Arc::new(configuration_reader);let configuration_writer = Arc::new(configuration_writer);- match field_type {+ match grouping_field_type {FieldType::SingleSelect => {let configuration = SelectOptionGroupContext::new(view_id,- field_rev.clone(),+ grouping_field_rev.clone(),configuration_reader,configuration_writer,).await?;- let controller = SingleSelectGroupController::new(&field_rev, configuration).await?;+ let controller = SingleSelectGroupController::new(&grouping_field_rev, configuration).await?;group_controller = Box::new(controller);},FieldType::MultiSelect => {let configuration = SelectOptionGroupContext::new(view_id,- field_rev.clone(),+ grouping_field_rev.clone(),configuration_reader,configuration_writer,).await?;- let controller = MultiSelectGroupController::new(&field_rev, configuration).await?;+ let controller = MultiSelectGroupController::new(&grouping_field_rev, configuration).await?;group_controller = Box::new(controller);},FieldType::Checkbox => {let configuration = CheckboxGroupContext::new(view_id,- field_rev.clone(),+ grouping_field_rev.clone(),configuration_reader,configuration_writer,).await?;- let controller = CheckboxGroupController::new(&field_rev, configuration).await?;+ let controller = CheckboxGroupController::new(&grouping_field_rev, configuration).await?;group_controller = Box::new(controller);},FieldType::URL => {let configuration = URLGroupContext::new(view_id,- field_rev.clone(),+ grouping_field_rev.clone(),configuration_reader,configuration_writer,).await?;- let controller = URLGroupController::new(&field_rev, configuration).await?;+ let controller = URLGroupController::new(&grouping_field_rev, configuration).await?;group_controller = Box::new(controller);},_ => {- group_controller = Box::new(DefaultGroupController::new(&field_rev));+ group_controller = Box::new(DefaultGroupController::new(&grouping_field_rev));},}// Separates the rows into different groups- group_controller.fill_groups(&row_revs, &field_rev)?;+ group_controller.fill_groups(&row_revs, &grouping_field_rev)?;Ok(group_controller)}-pub fn find_group_field(+pub fn find_grouping_field(field_revs: &[Arc<FieldRevision>],_layout: &LayoutRevision,) -> Option<Arc<FieldRevision>> {diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/block_index.rs b/frontend/rust-lib/flowy-database/src/services/persistence/block_index.rsindex d359b4d5c3..03676eeff7 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/block_index.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/block_index.rs@@ -1,4 +1,4 @@-use crate::services::persistence::GridDatabase;+use crate::services::persistence::DatabaseDBConnection;use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};use flowy_error::FlowyResult;use flowy_sqlite::{@@ -8,17 +8,17 @@ use flowy_sqlite::{use std::sync::Arc;/// Allow getting the block id from row id.-pub struct BlockIndexCache {- database: Arc<dyn GridDatabase>,+pub struct BlockRowIndexer {+ database: Arc<dyn DatabaseDBConnection>,}-impl BlockIndexCache {- pub fn new(database: Arc<dyn GridDatabase>) -> Self {+impl BlockRowIndexer {+ pub fn new(database: Arc<dyn DatabaseDBConnection>) -> Self {Self { database }}pub fn get_block_id(&self, row_id: &str) -> FlowyResult<String> {- let conn = self.database.db_connection()?;+ let conn = self.database.get_db_connection()?;let block_id = dsl::grid_block_index_table.filter(grid_block_index_table::row_id.eq(row_id)).select(grid_block_index_table::block_id)@@ -28,7 +28,7 @@ impl BlockIndexCache {}pub fn insert(&self, block_id: &str, row_id: &str) -> FlowyResult<()> {- let conn = self.database.db_connection()?;+ let conn = self.database.get_db_connection()?;let item = IndexItem {row_id: row_id.to_string(),block_id: block_id.to_string(),diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/database_ref.rs b/frontend/rust-lib/flowy-database/src/services/persistence/database_ref.rsnew file mode 100644index 0000000000..32fc4a8675--- /dev/null+++ b/frontend/rust-lib/flowy-database/src/services/persistence/database_ref.rs@@ -0,0 +1,123 @@+use crate::services::persistence::DatabaseDBConnection;+use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};+use flowy_error::FlowyResult;+use flowy_sqlite::{+ prelude::*,+ schema::{database_refs, database_refs::dsl},+};+use std::sync::Arc;++pub struct DatabaseRefIndexer {+ database: Arc<dyn DatabaseDBConnection>,+}++impl DatabaseRefIndexer {+ pub fn new(database: Arc<dyn DatabaseDBConnection>) -> Self {+ Self { database }+ }++ pub fn bind(+ &self,+ database_id: &str,+ view_id: &str,+ is_base: bool,+ name: &str,+ ) -> FlowyResult<()> {+ let conn = self.database.get_db_connection()?;+ let ref_id = make_ref_id(database_id, view_id);+ let record = DatabaseRefRecord {+ ref_id,+ name: name.to_string(),+ is_base,+ view_id: view_id.to_string(),+ database_id: database_id.to_string(),+ };+ let _ = diesel::replace_into(database_refs::table)+ .values(record)+ .execute(&*conn)?;+ Ok(())+ }++ pub fn unbind(&self, view_id: &str) -> FlowyResult<()> {+ let conn = self.database.get_db_connection()?;+ diesel::delete(dsl::database_refs.filter(database_refs::view_id.eq(view_id)))+ .execute(&*conn)?;+ Ok(())+ }++ pub fn get_ref_views_with_database(&self, database_id: &str) -> FlowyResult<Vec<DatabaseRef>> {+ let conn = self.database.get_db_connection()?;+ let views = dsl::database_refs+ .filter(database_refs::database_id.like(database_id))+ .load::<DatabaseRefRecord>(&*conn)?+ .into_iter()+ .map(|record| record.into())+ .collect::<Vec<_>>();+ tracing::trace!("database:{} has {} ref views", database_id, views.len());+ Ok(views)+ }++ pub fn get_database_with_view(&self, view_id: &str) -> FlowyResult<DatabaseInfo> {+ let conn = self.database.get_db_connection()?;+ let record = dsl::database_refs+ .filter(database_refs::view_id.eq(view_id))+ .first::<DatabaseRefRecord>(&*conn)?;+ Ok(record.into())+ }++ pub fn get_all_databases(&self) -> FlowyResult<Vec<DatabaseInfo>> {+ let conn = self.database.get_db_connection()?;+ let database_infos = dsl::database_refs+ .filter(database_refs::is_base.eq(true))+ .load::<DatabaseRefRecord>(&*conn)?+ .into_iter()+ .map(|record| record.into())+ .collect::<Vec<DatabaseInfo>>();++ Ok(database_infos)+ }+}++fn make_ref_id(database_id: &str, view_id: &str) -> String {+ format!("{}:{}", database_id, view_id)+}++#[derive(PartialEq, Clone, Debug, Queryable, Identifiable, Insertable, Associations)]+#[table_name = "database_refs"]+#[primary_key(ref_id)]+struct DatabaseRefRecord {+ ref_id: String,+ name: String,+ is_base: bool,+ view_id: String,+ database_id: String,+}++pub struct DatabaseRef {+ pub view_id: String,+ pub name: String,+ pub database_id: String,+}+impl std::convert::From<DatabaseRefRecord> for DatabaseRef {+ fn from(record: DatabaseRefRecord) -> Self {+ Self {+ view_id: record.view_id,+ name: record.name,+ database_id: record.database_id,+ }+ }+}++pub struct DatabaseInfo {+ pub name: String,+ pub database_id: String,+}++impl std::convert::From<DatabaseRefRecord> for DatabaseInfo {+ fn from(record: DatabaseRefRecord) -> Self {+ Self {+ name: record.name,+ database_id: record.database_id,+ }+ }+}diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/kv.rs b/frontend/rust-lib/flowy-database/src/services/persistence/kv.rsindex f99646135b..f3da8c8911 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/kv.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/kv.rs@@ -1,4 +1,4 @@-use crate::services::persistence::GridDatabase;+use crate::services::persistence::DatabaseDBConnection;use ::diesel::{query_dsl::*, ExpressionMethods};use bytes::Bytes;use diesel::SqliteConnection;@@ -34,11 +34,11 @@ pub trait KVTransaction {}pub struct DatabaseKVPersistence {- database: Arc<dyn GridDatabase>,+ database: Arc<dyn DatabaseDBConnection>,}impl DatabaseKVPersistence {- pub fn new(database: Arc<dyn GridDatabase>) -> Self {+ pub fn new(database: Arc<dyn DatabaseDBConnection>) -> Self {Self { database }}@@ -46,7 +46,7 @@ impl DatabaseKVPersistence {whereF: for<'a> FnOnce(SqliteTransaction<'a>) -> FlowyResult<O>,{- let conn = self.database.db_connection()?;+ let conn = self.database.get_db_connection()?;conn.immediate_transaction::<_, FlowyError, _>(|| {let sql_transaction = SqliteTransaction { conn: &conn };f(sql_transaction)@@ -148,12 +148,3 @@ impl<'a> KVTransaction for SqliteTransaction<'a> {Ok(())}}--// impl<T: TryInto<Bytes, Error = ::protobuf::ProtobufError> + GridIdentifiable> std::convert::From<T> for KeyValue {-// fn from(value: T) -> Self {-// let key = value.id().to_string();-// let bytes: Bytes = value.try_into().unwrap();-// let value = bytes.to_vec();-// KeyValue { key, value }-// }-// }diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_ref_indexing.rs b/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_ref_indexing.rsnew file mode 100644index 0000000000..c80d50a755--- /dev/null+++ b/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_ref_indexing.rs@@ -0,0 +1,47 @@+use crate::manager::DatabaseUser;+use crate::services::database_view::make_database_view_revision_pad;+use crate::services::persistence::database_ref::DatabaseRefIndexer;++use flowy_error::{FlowyError, FlowyResult};+use flowy_sqlite::kv::KV;++use flowy_sqlite::{+ prelude::*,+ schema::{grid_view_rev_table, grid_view_rev_table::dsl},+};+use lib_infra::util::md5;++use std::sync::Arc;++const DATABASE_REF_INDEXING: &str = "database_ref_indexing";++pub async fn indexing_database_view_refs(+ user_id: &str,+ user: Arc<dyn DatabaseUser>,+ database_ref_indexer: Arc<DatabaseRefIndexer>,+) -> FlowyResult<()> {+ let key = md5(format!("{}{}", user_id, DATABASE_REF_INDEXING));+ if KV::get_bool(&key) {+ return Ok(());+ }+ tracing::trace!("Indexing database view refs");+ let pool = user.db_pool()?;+ let view_ids = dsl::grid_view_rev_table+ .select(grid_view_rev_table::object_id)+ .distinct()+ .load::<String>(&*pool.get().map_err(|e| FlowyError::internal().context(e))?)?;++ for view_id in view_ids {+ if let Ok((pad, _)) = make_database_view_revision_pad(&view_id, user.clone()).await {+ tracing::trace!(+ "Indexing database:{} with view:{}",+ pad.database_id,+ pad.view_id+ );+ let _ = database_ref_indexer.bind(&pad.database_id, &pad.view_id, true, &pad.name);+ }+ }++ KV::set_bool(&key, true);+ Ok(())+}diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/migration.rs b/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_rev_struct_migration.rssimilarity index 51%rename from frontend/rust-lib/flowy-database/src/services/persistence/migration.rsrename to frontend/rust-lib/flowy-database/src/services/persistence/migration/database_rev_struct_migration.rsindex 4ba86ff329..c467901160 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/migration.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/migration/database_rev_struct_migration.rs@@ -1,6 +1,7 @@-use crate::manager::DatabaseUser;+#![allow(clippy::all)]+#![allow(dead_code)]+#![allow(unused_variables)]use crate::services::persistence::rev_sqlite::SQLiteDatabaseRevisionPersistence;-use crate::services::persistence::GridDatabase;use bytes::Bytes;use database_model::DatabaseRevision;use flowy_client_sync::client_database::{@@ -9,57 +10,45 @@ use flowy_client_sync::client_database::{use flowy_error::FlowyResult;use flowy_revision::reset::{RevisionResettable, RevisionStructReset};use flowy_sqlite::kv::KV;+use flowy_sqlite::ConnectionPool;use lib_infra::util::md5;use revision_model::Revision;use std::sync::Arc;const V1_MIGRATION: &str = "GRID_V1_MIGRATION";-pub(crate) struct DatabaseMigration {- user: Arc<dyn DatabaseUser>,- database: Arc<dyn GridDatabase>,-}--impl DatabaseMigration {- pub fn new(user: Arc<dyn DatabaseUser>, database: Arc<dyn GridDatabase>) -> Self {- Self { user, database }+pub async fn migration_database_rev_struct(+ user_id: &str,+ database_id: &str,+ pool: Arc<ConnectionPool>,+) -> FlowyResult<()> {+ let key = migration_flag_key(&user_id, V1_MIGRATION, database_id);+ if KV::get_bool(&key) {+ return Ok(());}+ let object = DatabaseRevisionResettable {+ database_id: database_id.to_owned(),+ };+ let disk_cache = SQLiteDatabaseRevisionPersistence::new(&user_id, pool);+ let reset = RevisionStructReset::new(&user_id, object, Arc::new(disk_cache));+ reset.run().await?;- pub async fn run_v1_migration(&self, grid_id: &str) -> FlowyResult<()> {- let user_id = self.user.user_id()?;- let key = migration_flag_key(&user_id, V1_MIGRATION, grid_id);- if KV::get_bool(&key) {- return Ok(());- }- self.migration_grid_rev_struct(grid_id).await?;- tracing::trace!("Run grid:{} v1 migration", grid_id);- KV::set_bool(&key, true);- Ok(())- }-- pub async fn migration_grid_rev_struct(&self, grid_id: &str) -> FlowyResult<()> {- let object = GridRevisionResettable {- grid_id: grid_id.to_owned(),- };- let user_id = self.user.user_id()?;- let pool = self.database.db_pool()?;- let disk_cache = SQLiteDatabaseRevisionPersistence::new(&user_id, pool);- let reset = RevisionStructReset::new(&user_id, object, Arc::new(disk_cache));- reset.run().await- }+ tracing::trace!("Run database:{} v1 migration", database_id);+ KV::set_bool(&key, true);+ Ok(())}fn migration_flag_key(user_id: &str, version: &str, grid_id: &str) -> String {md5(format!("{}{}{}", user_id, version, grid_id,))}-pub struct GridRevisionResettable {- grid_id: String,+struct DatabaseRevisionResettable {+ database_id: String,}-impl RevisionResettable for GridRevisionResettable {+impl RevisionResettable for DatabaseRevisionResettable {fn target_id(&self) -> &str {- &self.grid_id+ &self.database_id}fn reset_data(&self, revisions: Vec<Revision>) -> FlowyResult<Bytes> {diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/migration/mod.rs b/frontend/rust-lib/flowy-database/src/services/persistence/migration/mod.rsnew file mode 100644index 0000000000..613224c5b9--- /dev/null+++ b/frontend/rust-lib/flowy-database/src/services/persistence/migration/mod.rs@@ -0,0 +1,49 @@+mod database_ref_indexing;+mod database_rev_struct_migration;++use crate::manager::DatabaseUser;+use crate::services::persistence::database_ref::DatabaseRefIndexer;+use crate::services::persistence::migration::database_ref_indexing::indexing_database_view_refs;+use crate::services::persistence::migration::database_rev_struct_migration::migration_database_rev_struct;+use crate::services::persistence::DatabaseDBConnection;+use flowy_error::FlowyResult;+use std::sync::Arc;++pub(crate) struct DatabaseMigration {+ #[allow(dead_code)]+ user: Arc<dyn DatabaseUser>,+ database: Arc<dyn DatabaseDBConnection>,+ database_ref_indexer: Arc<DatabaseRefIndexer>,+}++impl DatabaseMigration {+ pub fn new(+ user: Arc<dyn DatabaseUser>,+ database: Arc<dyn DatabaseDBConnection>,+ database_ref_indexer: Arc<DatabaseRefIndexer>,+ ) -> Self {+ Self {+ user,+ database,+ database_ref_indexer,+ }+ }++ pub async fn run(&self, user_id: &str) -> FlowyResult<()> {+ let _ = indexing_database_view_refs(+ user_id,+ self.user.clone(),+ self.database_ref_indexer.clone(),+ )+ .await;+ Ok(())+ }++ #[allow(dead_code)]+ pub async fn database_rev_struct_migration(&self, grid_id: &str) -> FlowyResult<()> {+ let user_id = self.user.user_id()?;+ let pool = self.database.get_db_pool()?;+ migration_database_rev_struct(&user_id, grid_id, pool).await?;+ Ok(())+ }+}diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/mod.rs b/frontend/rust-lib/flowy-database/src/services/persistence/mod.rsindex a8cd551ffc..70bc472840 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/mod.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/mod.rs@@ -3,15 +3,16 @@ use flowy_sqlite::{ConnectionPool, DBConnection};use std::sync::Arc;pub mod block_index;+pub mod database_ref;pub mod kv;pub mod migration;pub mod rev_sqlite;-pub trait GridDatabase: Send + Sync {- fn db_pool(&self) -> Result<Arc<ConnectionPool>, FlowyError>;+pub trait DatabaseDBConnection: Send + Sync {+ fn get_db_pool(&self) -> Result<Arc<ConnectionPool>, FlowyError>;- fn db_connection(&self) -> Result<DBConnection, FlowyError> {- let pool = self.db_pool()?;+ fn get_db_connection(&self) -> Result<DBConnection, FlowyError> {+ let pool = self.get_db_pool()?;let conn = pool.get().map_err(|e| FlowyError::internal().context(e))?;Ok(conn)}diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/grid_block_sqlite_impl.rs b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/block_impl.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/grid_block_sqlite_impl.rsrename to frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/block_impl.rsdiff --git a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/grid_sqlite_impl.rs b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/database_impl.rssimilarity index 81%rename from frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/grid_sqlite_impl.rsrename to frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/database_impl.rsindex 5ac6f1f9d9..d146a01116 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/grid_sqlite_impl.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/database_impl.rs@@ -22,7 +22,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseRevisionPersistencfn create_revision_records(&self, revision_records: Vec<SyncRecord>) -> Result<(), Self::Error> {let conn = self.pool.get().map_err(internal_error)?;- GridRevisionSql::create(revision_records, &conn)?;+ DatabaseRevisionSql::create(revision_records, &conn)?;Ok(())}@@ -36,7 +36,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseRevisionPersistencrev_ids: Option<Vec<i64>>,) -> Result<Vec<SyncRecord>, Self::Error> {let conn = self.pool.get().map_err(internal_error)?;- let records = GridRevisionSql::read(&self.user_id, object_id, rev_ids, &conn)?;+ let records = DatabaseRevisionSql::read(&self.user_id, object_id, rev_ids, &conn)?;Ok(records)}@@ -47,7 +47,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseRevisionPersistenc) -> Result<Vec<SyncRecord>, Self::Error> {let conn = &*self.pool.get().map_err(internal_error)?;let revisions =- GridRevisionSql::read_with_range(&self.user_id, object_id, range.clone(), conn)?;+ DatabaseRevisionSql::read_with_range(&self.user_id, object_id, range.clone(), conn)?;Ok(revisions)}@@ -55,7 +55,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseRevisionPersistenclet conn = &*self.pool.get().map_err(internal_error)?;conn.immediate_transaction::<_, FlowyError, _>(|| {for changeset in changesets {- GridRevisionSql::update(changeset, conn)?;+ DatabaseRevisionSql::update(changeset, conn)?;}Ok(())})?;@@ -68,7 +68,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseRevisionPersistencrev_ids: Option<Vec<i64>>,) -> Result<(), Self::Error> {let conn = &*self.pool.get().map_err(internal_error)?;- GridRevisionSql::delete(object_id, rev_ids, conn)?;+ DatabaseRevisionSql::delete(object_id, rev_ids, conn)?;Ok(())}@@ -80,8 +80,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseRevisionPersistenc) -> Result<(), Self::Error> {let conn = self.pool.get().map_err(internal_error)?;conn.immediate_transaction::<_, FlowyError, _>(|| {- GridRevisionSql::delete(object_id, deleted_rev_ids, &conn)?;- GridRevisionSql::create(inserted_records, &conn)?;+ DatabaseRevisionSql::delete(object_id, deleted_rev_ids, &conn)?;+ DatabaseRevisionSql::create(inserted_records, &conn)?;Ok(())})}@@ -96,8 +96,8 @@ impl SQLiteDatabaseRevisionPersistence {}}-struct GridRevisionSql();-impl GridRevisionSql {+struct DatabaseRevisionSql();+impl DatabaseRevisionSql {fn create(revision_records: Vec<SyncRecord>, conn: &SqliteConnection) -> Result<(), FlowyError> {// Batch insert: https://diesel.rs/guides/all-about-inserts.htmllet records = revision_records@@ -108,7 +108,7 @@ impl GridRevisionSql {record.revision.object_id,record.revision.rev_id);- let rev_state: GridRevisionState = record.state.into();+ let rev_state: DatabaseRevisionState = record.state.into();(dsl::object_id.eq(record.revision.object_id),dsl::base_rev_id.eq(record.revision.base_rev_id),@@ -126,7 +126,7 @@ impl GridRevisionSql {}fn update(changeset: RevisionChangeset, conn: &SqliteConnection) -> Result<(), FlowyError> {- let state: GridRevisionState = changeset.state.clone().into();+ let state: DatabaseRevisionState = changeset.state.clone().into();let filter = dsl::grid_rev_table.filter(dsl::rev_id.eq(changeset.rev_id)).filter(dsl::object_id.eq(changeset.object_id));@@ -153,7 +153,7 @@ impl GridRevisionSql {}let rows = sql.order(dsl::rev_id.asc())- .load::<GridRevisionTable>(conn)?;+ .load::<DatabaseRevisionTable>(conn)?;let records = rows.into_iter().map(|row| mk_revision_record_from_table(user_id, row))@@ -173,7 +173,7 @@ impl GridRevisionSql {.filter(dsl::rev_id.le(range.end)).filter(dsl::object_id.eq(object_id)).order(dsl::rev_id.asc())- .load::<GridRevisionTable>(conn)?;+ .load::<DatabaseRevisionTable>(conn)?;let revisions = rev_tables.into_iter()@@ -205,34 +205,34 @@ impl GridRevisionSql {}}-#[derive(PartialEq, Clone, Debug, Queryable, Identifiable, Insertable, Associations)]+#[derive(PartialEq, Eq, Clone, Debug, Queryable, Identifiable, Insertable, Associations)]#[table_name = "grid_rev_table"]-struct GridRevisionTable {+pub struct DatabaseRevisionTable {id: i32,- object_id: String,- base_rev_id: i64,- rev_id: i64,- data: Vec<u8>,- state: GridRevisionState,+ pub object_id: String,+ pub base_rev_id: i64,+ pub rev_id: i64,+ pub data: Vec<u8>,+ state: DatabaseRevisionState,}#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash, FromSqlRow, AsExpression)]#[repr(i32)]#[sql_type = "Integer"]-pub enum GridRevisionState {+pub enum DatabaseRevisionState {Sync = 0,Ack = 1,}-impl_sql_integer_expression!(GridRevisionState);-impl_rev_state_map!(GridRevisionState);+impl_sql_integer_expression!(DatabaseRevisionState);+impl_rev_state_map!(DatabaseRevisionState);-impl std::default::Default for GridRevisionState {+impl std::default::Default for DatabaseRevisionState {fn default() -> Self {- GridRevisionState::Sync+ DatabaseRevisionState::Sync}}-fn mk_revision_record_from_table(_user_id: &str, table: GridRevisionTable) -> SyncRecord {+fn mk_revision_record_from_table(_user_id: &str, table: DatabaseRevisionTable) -> SyncRecord {let md5 = md5(&table.data);let revision = Revision::new(&table.object_id,diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/mod.rs b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/mod.rsindex bc7fa5de63..a71d59776f 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/mod.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/mod.rs@@ -1,9 +1,9 @@-mod grid_block_sqlite_impl;-mod grid_snapshot;-mod grid_sqlite_impl;-mod grid_view_sqlite_impl;+mod block_impl;+mod database_impl;+mod snapshot_impl;+mod view_impl;-pub use grid_block_sqlite_impl::*;-pub use grid_snapshot::*;-pub use grid_sqlite_impl::*;-pub use grid_view_sqlite_impl::*;+pub use block_impl::*;+pub use database_impl::*;+pub use snapshot_impl::*;+pub use view_impl::*;diff --git a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/grid_snapshot.rs b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/snapshot_impl.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/grid_snapshot.rsrename to frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/snapshot_impl.rsdiff --git a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/grid_view_sqlite_impl.rs b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/view_impl.rssimilarity index 88%rename from frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/grid_view_sqlite_impl.rsrename to frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/view_impl.rsindex 1418b93df3..df076b62e7 100644--- a/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/grid_view_sqlite_impl.rs+++ b/frontend/rust-lib/flowy-database/src/services/persistence/rev_sqlite/view_impl.rs@@ -12,12 +12,12 @@ use lib_infra::util::md5;use revision_model::{Revision, RevisionRange};use std::sync::Arc;-pub struct SQLiteGridViewRevisionPersistence {+pub struct SQLiteDatabaseViewRevisionPersistence {user_id: String,pub(crate) pool: Arc<ConnectionPool>,}-impl SQLiteGridViewRevisionPersistence {+impl SQLiteDatabaseViewRevisionPersistence {pub fn new(user_id: &str, pool: Arc<ConnectionPool>) -> Self {Self {user_id: user_id.to_owned(),@@ -26,7 +26,7 @@ impl SQLiteGridViewRevisionPersistence {}}-impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteGridViewRevisionPersistence {+impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDatabaseViewRevisionPersistence {type Error = FlowyError;fn create_revision_records(&self, revision_records: Vec<SyncRecord>) -> Result<(), Self::Error> {@@ -108,7 +108,7 @@ impl GridViewRevisionSql {record.revision.object_id,record.revision.rev_id);- let rev_state: GridViewRevisionState = record.state.into();+ let rev_state: DatabaseViewRevisionState = record.state.into();(dsl::object_id.eq(record.revision.object_id),dsl::base_rev_id.eq(record.revision.base_rev_id),@@ -126,7 +126,7 @@ impl GridViewRevisionSql {}fn update(changeset: RevisionChangeset, conn: &SqliteConnection) -> Result<(), FlowyError> {- let state: GridViewRevisionState = changeset.state.clone().into();+ let state: DatabaseViewRevisionState = changeset.state.clone().into();let filter = dsl::grid_view_rev_table.filter(dsl::rev_id.eq(changeset.rev_id)).filter(dsl::object_id.eq(changeset.object_id));@@ -153,7 +153,7 @@ impl GridViewRevisionSql {}let rows = sql.order(dsl::rev_id.asc())- .load::<GridViewRevisionTable>(conn)?;+ .load::<DatabaseViewRevisionTable>(conn)?;let records = rows.into_iter().map(|row| mk_revision_record_from_table(user_id, row))@@ -173,7 +173,7 @@ impl GridViewRevisionSql {.filter(dsl::rev_id.le(range.end)).filter(dsl::object_id.eq(object_id)).order(dsl::rev_id.asc())- .load::<GridViewRevisionTable>(conn)?;+ .load::<DatabaseViewRevisionTable>(conn)?;let revisions = rev_tables.into_iter()@@ -207,32 +207,32 @@ impl GridViewRevisionSql {#[derive(PartialEq, Clone, Debug, Queryable, Identifiable, Insertable, Associations)]#[table_name = "grid_view_rev_table"]-struct GridViewRevisionTable {+struct DatabaseViewRevisionTable {id: i32,object_id: String,base_rev_id: i64,rev_id: i64,data: Vec<u8>,- state: GridViewRevisionState,+ state: DatabaseViewRevisionState,}#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash, FromSqlRow, AsExpression)]#[repr(i32)]#[sql_type = "Integer"]-pub enum GridViewRevisionState {+pub enum DatabaseViewRevisionState {Sync = 0,Ack = 1,}-impl_sql_integer_expression!(GridViewRevisionState);-impl_rev_state_map!(GridViewRevisionState);+impl_sql_integer_expression!(DatabaseViewRevisionState);+impl_rev_state_map!(DatabaseViewRevisionState);-impl std::default::Default for GridViewRevisionState {+impl std::default::Default for DatabaseViewRevisionState {fn default() -> Self {- GridViewRevisionState::Sync+ DatabaseViewRevisionState::Sync}}-fn mk_revision_record_from_table(_user_id: &str, table: GridViewRevisionTable) -> SyncRecord {+fn mk_revision_record_from_table(_user_id: &str, table: DatabaseViewRevisionTable) -> SyncRecord {let md5 = md5(&table.data);let revision = Revision::new(&table.object_id,diff --git a/frontend/rust-lib/flowy-database/src/services/row/row_builder.rs b/frontend/rust-lib/flowy-database/src/services/row/row_builder.rsindex 2fed1c880c..24cec2cf4d 100644--- a/frontend/rust-lib/flowy-database/src/services/row/row_builder.rs+++ b/frontend/rust-lib/flowy-database/src/services/row/row_builder.rs@@ -8,18 +8,18 @@ use indexmap::IndexMap;use std::collections::HashMap;use std::sync::Arc;-pub struct RowRevisionBuilder<'a> {+pub struct RowRevisionBuilder {block_id: String,- field_rev_map: HashMap<&'a String, Arc<FieldRevision>>,+ field_rev_map: HashMap<String, Arc<FieldRevision>>,payload: CreateRowRevisionPayload,}-impl<'a> RowRevisionBuilder<'a> {- pub fn new(block_id: &str, fields: &'a [Arc<FieldRevision>]) -> Self {+impl RowRevisionBuilder {+ pub fn new(block_id: &str, fields: Vec<Arc<FieldRevision>>) -> Self {let field_rev_map = fields.iter()- .map(|field| (&field.id, field.clone()))- .collect::<HashMap<&String, Arc<FieldRevision>>>();+ .map(|field| (field.id.clone(), field.clone()))+ .collect::<HashMap<String, Arc<FieldRevision>>>();let payload = CreateRowRevisionPayload {row_id: gen_row_id(),diff --git a/frontend/rust-lib/flowy-database/src/util.rs b/frontend/rust-lib/flowy-database/src/util.rsindex 36d18b1348..b96046d3ef 100644--- a/frontend/rust-lib/flowy-database/src/util.rs+++ b/frontend/rust-lib/flowy-database/src/util.rs@@ -62,8 +62,10 @@ pub fn make_default_board() -> BuildDatabaseContext {database_builder.add_field(single_select_field);for i in 0..3 {- let mut row_builder =- RowRevisionBuilder::new(database_builder.block_id(), database_builder.field_revs());+ let mut row_builder = RowRevisionBuilder::new(+ database_builder.block_id(),+ database_builder.field_revs().clone(),+ );row_builder.insert_select_option_cell(&single_select_field_id, vec![to_do_option.id.clone()]);let data = format!("Card {}", i + 1);row_builder.insert_text_cell(&text_field_id, data);@@ -147,8 +149,10 @@ pub fn make_default_board_2() -> BuildDatabaseContext {database_builder.add_field(multi_select_field);for i in 0..3 {- let mut row_builder =- RowRevisionBuilder::new(database_builder.block_id(), database_builder.field_revs());+ let mut row_builder = RowRevisionBuilder::new(+ database_builder.block_id(),+ database_builder.field_revs().clone(),+ );row_builder.insert_select_option_cell(&single_select_field_id, vec![to_do_option.id.clone()]);match i {0 => {@@ -174,8 +178,10 @@ pub fn make_default_board_2() -> BuildDatabaseContext {}for i in 0..3 {- let mut row_builder =- RowRevisionBuilder::new(database_builder.block_id(), database_builder.field_revs());+ let mut row_builder = RowRevisionBuilder::new(+ database_builder.block_id(),+ database_builder.field_revs().clone(),+ );row_builder.insert_select_option_cell(&single_select_field_id, vec![doing_option.id.clone()]);match i {0 => {@@ -202,8 +208,10 @@ pub fn make_default_board_2() -> BuildDatabaseContext {}for i in 0..2 {- let mut row_builder =- RowRevisionBuilder::new(database_builder.block_id(), database_builder.field_revs());+ let mut row_builder = RowRevisionBuilder::new(+ database_builder.block_id(),+ database_builder.field_revs().clone(),+ );row_builder.insert_select_option_cell(&single_select_field_id, vec![done_option.id.clone()]);match i {0 => {diff --git a/frontend/rust-lib/flowy-database/tests/grid/block_test/block_test.rs b/frontend/rust-lib/flowy-database/tests/database/block_test/block_test.rssimilarity index 90%rename from frontend/rust-lib/flowy-database/tests/grid/block_test/block_test.rsrename to frontend/rust-lib/flowy-database/tests/database/block_test/block_test.rsindex fb2cb22367..6828e8bace 100644--- a/frontend/rust-lib/flowy-database/tests/grid/block_test/block_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/block_test/block_test.rs@@ -1,5 +1,5 @@-use crate::grid::block_test::script::DatabaseRowTest;-use crate::grid::block_test::script::RowScript::*;+use crate::database::block_test::script::DatabaseRowTest;+use crate::database::block_test::script::RowScript::*;use database_model::{DatabaseBlockMetaRevision, DatabaseBlockMetaRevisionChangeset};diff --git a/frontend/rust-lib/flowy-database/tests/grid/block_test/mod.rs b/frontend/rust-lib/flowy-database/tests/database/block_test/mod.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/block_test/mod.rsrename to frontend/rust-lib/flowy-database/tests/database/block_test/mod.rsdiff --git a/frontend/rust-lib/flowy-database/tests/grid/block_test/row_test.rs b/frontend/rust-lib/flowy-database/tests/database/block_test/row_test.rssimilarity index 94%rename from frontend/rust-lib/flowy-database/tests/grid/block_test/row_test.rsrename to frontend/rust-lib/flowy-database/tests/database/block_test/row_test.rsindex ade6439733..3e31f985dd 100644--- a/frontend/rust-lib/flowy-database/tests/grid/block_test/row_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/block_test/row_test.rs@@ -1,6 +1,6 @@-use crate::grid::block_test::script::RowScript::*;-use crate::grid::block_test::script::{CreateRowScriptBuilder, DatabaseRowTest};-use crate::grid::mock_data::{COMPLETED, FACEBOOK, GOOGLE, PAUSED, TWITTER};+use crate::database::block_test::script::RowScript::*;+use crate::database::block_test::script::{CreateRowScriptBuilder, DatabaseRowTest};+use crate::database::mock_data::{COMPLETED, FACEBOOK, GOOGLE, PAUSED, TWITTER};use database_model::RowChangeset;use flowy_database::entities::FieldType;use flowy_database::services::field::{SELECTION_IDS_SEPARATOR, UNCHECK};diff --git a/frontend/rust-lib/flowy-database/tests/grid/block_test/script.rs b/frontend/rust-lib/flowy-database/tests/database/block_test/script.rssimilarity index 95%rename from frontend/rust-lib/flowy-database/tests/grid/block_test/script.rsrename to frontend/rust-lib/flowy-database/tests/database/block_test/script.rsindex a54a3424c5..9f47a590d1 100644--- a/frontend/rust-lib/flowy-database/tests/grid/block_test/script.rs+++ b/frontend/rust-lib/flowy-database/tests/database/block_test/script.rs@@ -1,6 +1,6 @@-use crate::grid::block_test::script::RowScript::{AssertCell, CreateRow};-use crate::grid::block_test::util::GridRowTestBuilder;-use crate::grid::database_editor::DatabaseEditorTest;+use crate::database::block_test::script::RowScript::{AssertCell, CreateRow};+use crate::database::block_test::util::DatabaseRowTestBuilder;+use crate::database::database_editor::DatabaseEditorTest;use database_model::{DatabaseBlockMetaRevision, DatabaseBlockMetaRevisionChangeset, RowChangeset, RowRevision,};@@ -56,7 +56,7 @@ pub struct DatabaseRowTest {impl DatabaseRowTest {pub async fn new() -> Self {- let editor_test = DatabaseEditorTest::new_table().await;+ let editor_test = DatabaseEditorTest::new_grid().await;Self { inner: editor_test }}@@ -70,8 +70,8 @@ impl DatabaseRowTest {}}- pub fn row_builder(&self) -> GridRowTestBuilder {- GridRowTestBuilder::new(self.block_id(), &self.field_revs)+ pub fn row_builder(&self) -> DatabaseRowTestBuilder {+ DatabaseRowTestBuilder::new(self.block_id().to_string(), self.field_revs.clone())}pub async fn run_script(&mut self, script: RowScript) {@@ -119,7 +119,7 @@ impl DatabaseRowTest {expected,} => {let id = CellIdParams {- database_id: self.view_id.clone(),+ view_id: self.view_id.clone(),field_id,row_id,};@@ -314,14 +314,14 @@ impl std::ops::DerefMut for DatabaseRowTest {}}-pub struct CreateRowScriptBuilder<'a> {- builder: GridRowTestBuilder<'a>,+pub struct CreateRowScriptBuilder {+ builder: DatabaseRowTestBuilder,data_by_field_type: HashMap<FieldType, CellTestData>,output_by_field_type: HashMap<FieldType, CellTestOutput>,}-impl<'a> CreateRowScriptBuilder<'a> {- pub fn new(test: &'a DatabaseRowTest) -> Self {+impl CreateRowScriptBuilder {+ pub fn new(test: &DatabaseRowTest) -> Self {Self {builder: test.row_builder(),data_by_field_type: HashMap::new(),diff --git a/frontend/rust-lib/flowy-database/tests/grid/block_test/util.rs b/frontend/rust-lib/flowy-database/tests/database/block_test/util.rssimilarity index 89%rename from frontend/rust-lib/flowy-database/tests/grid/block_test/util.rsrename to frontend/rust-lib/flowy-database/tests/database/block_test/util.rsindex c2d377fcdd..13731421a3 100644--- a/frontend/rust-lib/flowy-database/tests/grid/block_test/util.rs+++ b/frontend/rust-lib/flowy-database/tests/database/block_test/util.rs@@ -9,15 +9,15 @@ use std::sync::Arc;use strum::EnumCount;-pub struct GridRowTestBuilder<'a> {- field_revs: &'a [Arc<FieldRevision>],- inner_builder: RowRevisionBuilder<'a>,+pub struct DatabaseRowTestBuilder {+ field_revs: Vec<Arc<FieldRevision>>,+ inner_builder: RowRevisionBuilder,}-impl<'a> GridRowTestBuilder<'a> {- pub fn new(block_id: &str, field_revs: &'a [Arc<FieldRevision>]) -> Self {+impl DatabaseRowTestBuilder {+ pub fn new(block_id: String, field_revs: Vec<Arc<FieldRevision>>) -> Self {assert_eq!(field_revs.len(), FieldType::COUNT);- let inner_builder = RowRevisionBuilder::new(block_id, field_revs);+ let inner_builder = RowRevisionBuilder::new(&block_id, field_revs.clone());Self {field_revs,inner_builder,@@ -137,15 +137,15 @@ impl<'a> GridRowTestBuilder<'a> {}}-impl<'a> std::ops::Deref for GridRowTestBuilder<'a> {- type Target = RowRevisionBuilder<'a>;+impl std::ops::Deref for DatabaseRowTestBuilder {+ type Target = RowRevisionBuilder;fn deref(&self) -> &Self::Target {&self.inner_builder}}-impl<'a> std::ops::DerefMut for GridRowTestBuilder<'a> {+impl std::ops::DerefMut for DatabaseRowTestBuilder {fn deref_mut(&mut self) -> &mut Self::Target {&mut self.inner_builder}diff --git a/frontend/rust-lib/flowy-database/tests/grid/cell_test/mod.rs b/frontend/rust-lib/flowy-database/tests/database/cell_test/mod.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/cell_test/mod.rsrename to frontend/rust-lib/flowy-database/tests/database/cell_test/mod.rsdiff --git a/frontend/rust-lib/flowy-database/tests/grid/cell_test/script.rs b/frontend/rust-lib/flowy-database/tests/database/cell_test/script.rssimilarity index 94%rename from frontend/rust-lib/flowy-database/tests/grid/cell_test/script.rsrename to frontend/rust-lib/flowy-database/tests/database/cell_test/script.rsindex 1a698c314a..0dc72cd6ea 100644--- a/frontend/rust-lib/flowy-database/tests/grid/cell_test/script.rs+++ b/frontend/rust-lib/flowy-database/tests/database/cell_test/script.rs@@ -1,4 +1,4 @@-use crate::grid::database_editor::DatabaseEditorTest;+use crate::database::database_editor::DatabaseEditorTest;use flowy_database::entities::CellChangesetPB;pub enum CellScript {@@ -14,7 +14,7 @@ pub struct DatabaseCellTest {impl DatabaseCellTest {pub async fn new() -> Self {- let inner = DatabaseEditorTest::new_table().await;+ let inner = DatabaseEditorTest::new_grid().await;Self { inner }}diff --git a/frontend/rust-lib/flowy-database/tests/grid/cell_test/test.rs b/frontend/rust-lib/flowy-database/tests/database/cell_test/test.rssimilarity index 93%rename from frontend/rust-lib/flowy-database/tests/grid/cell_test/test.rsrename to frontend/rust-lib/flowy-database/tests/database/cell_test/test.rsindex 8ec7ea9df5..4657c641be 100644--- a/frontend/rust-lib/flowy-database/tests/grid/cell_test/test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/cell_test/test.rs@@ -1,6 +1,6 @@-use crate::grid::cell_test::script::CellScript::*;-use crate::grid::cell_test::script::DatabaseCellTest;-use crate::grid::field_test::util::make_date_cell_string;+use crate::database::cell_test::script::CellScript::*;+use crate::database::cell_test::script::DatabaseCellTest;+use crate::database::field_test::util::make_date_cell_string;use flowy_database::entities::{CellChangesetPB, FieldType};use flowy_database::services::cell::ToCellChangesetString;use flowy_database::services::field::selection_type_option::SelectOptionCellChangeset;@@ -47,7 +47,7 @@ async fn grid_cell_update() {scripts.push(UpdateCell {changeset: CellChangesetPB {- database_id: block_id.to_string(),+ view_id: block_id.to_string(),row_id: row_rev.id.clone(),field_id: field_rev.id.clone(),type_cell_data: data,diff --git a/frontend/rust-lib/flowy-database/tests/grid/database_editor.rs b/frontend/rust-lib/flowy-database/tests/database/database_editor.rssimilarity index 91%rename from frontend/rust-lib/flowy-database/tests/grid/database_editor.rsrename to frontend/rust-lib/flowy-database/tests/database/database_editor.rsindex a49ca7672a..41f70c9d3d 100644--- a/frontend/rust-lib/flowy-database/tests/grid/database_editor.rs+++ b/frontend/rust-lib/flowy-database/tests/database/database_editor.rs@@ -1,9 +1,9 @@-use crate::grid::mock_data::*;+use crate::database::mock_data::*;use bytes::Bytes;use database_model::*;use flowy_database::entities::*;use flowy_database::services::cell::ToCellChangesetString;-use flowy_database::services::database::DatabaseRevisionEditor;+use flowy_database::services::database::DatabaseEditor;use flowy_database::services::field::SelectOptionPB;use flowy_database::services::field::*;use flowy_test::helper::ViewTest;@@ -14,8 +14,9 @@ use strum::EnumCount;pub struct DatabaseEditorTest {pub sdk: FlowySDKTest,+ pub app_id: String,pub view_id: String,- pub editor: Arc<DatabaseRevisionEditor>,+ pub editor: Arc<DatabaseEditor>,pub field_revs: Vec<Arc<FieldRevision>>,pub block_meta_revs: Vec<Arc<DatabaseBlockMetaRevision>>,pub row_revs: Vec<Arc<RowRevision>>,@@ -24,7 +25,7 @@ pub struct DatabaseEditorTest {}impl DatabaseEditorTest {- pub async fn new_table() -> Self {+ pub async fn new_grid() -> Self {Self::new(LayoutTypePB::Grid).await}@@ -53,7 +54,11 @@ impl DatabaseEditorTest {},};- let editor = sdk.grid_manager.open_database(&test.view.id).await.unwrap();+ let editor = sdk+ .database_manager+ .open_database_view(&test.view.id)+ .await+ .unwrap();let field_revs = editor.get_field_revs(None).await.unwrap();let block_meta_revs = editor.get_block_meta_revs().await.unwrap();let row_pbs = editor.get_all_row_revs(&test.view.id).await.unwrap();@@ -63,10 +68,12 @@ impl DatabaseEditorTest {// Because we assert the initialize count of the fields is equal to FieldType::COUNT.assert_eq!(field_revs.len(), FieldType::COUNT);- let grid_id = test.view.id;+ let view_id = test.view.id;+ let app_id = test.app.id;Self {sdk,- view_id: grid_id,+ app_id,+ view_id,editor,field_revs,block_meta_revs,@@ -80,8 +87,8 @@ impl DatabaseEditorTest {self.editor.get_all_row_revs(&self.view_id).await.unwrap()}- pub async fn grid_filters(&self) -> Vec<FilterPB> {- self.editor.get_all_filters().await.unwrap()+ pub async fn database_filters(&self) -> Vec<FilterPB> {+ self.editor.get_all_filters(&self.view_id).await.unwrap()}pub fn get_field_rev(&self, field_id: &str, field_type: FieldType) -> &Arc<FieldRevision> {diff --git a/frontend/rust-lib/flowy-database/tests/grid/snapshot_test/mod.rs b/frontend/rust-lib/flowy-database/tests/database/database_ref_test/mod.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/snapshot_test/mod.rsrename to frontend/rust-lib/flowy-database/tests/database/database_ref_test/mod.rsdiff --git a/frontend/rust-lib/flowy-database/tests/database/database_ref_test/script.rs b/frontend/rust-lib/flowy-database/tests/database/database_ref_test/script.rsnew file mode 100644index 0000000000..bf5984a288--- /dev/null+++ b/frontend/rust-lib/flowy-database/tests/database/database_ref_test/script.rs@@ -0,0 +1,135 @@+use crate::database::block_test::util::DatabaseRowTestBuilder;+use crate::database::database_editor::DatabaseEditorTest;+use database_model::RowRevision;+use flowy_database::services::database::DatabaseEditor;+use flowy_database::services::persistence::database_ref::{DatabaseInfo, DatabaseRef};+use std::collections::HashMap;+use std::sync::Arc;++pub enum DatabaseRefScript {+ LinkGridToDatabase {+ database_id: String,+ },+ #[allow(dead_code)]+ LinkBoardToDatabase {+ database_id: String,+ },+ CreateNewGrid,+ CreateRow {+ view_id: String,+ row_rev: RowRevision,+ },+ AssertNumberOfRows {+ view_id: String,+ expected: usize,+ },+ AssertNumberOfDatabase {+ expected: usize,+ },+}++pub struct DatabaseRefTest {+ inner: DatabaseEditorTest,+}++impl DatabaseRefTest {+ pub async fn new() -> Self {+ let inner = DatabaseEditorTest::new_grid().await;+ Self { inner }+ }++ pub async fn run_scripts(&mut self, scripts: Vec<DatabaseRefScript>) {+ for script in scripts {+ self.run_script(script).await;+ }+ }++ pub async fn block_id(&self, view_id: &str) -> String {+ let editor = self.get_database_editor(view_id).await;+ let mut block_meta_revs = editor.get_block_meta_revs().await.unwrap();+ let block = block_meta_revs.pop().unwrap();+ block.block_id.clone()+ }++ pub async fn all_databases(&self) -> Vec<DatabaseInfo> {+ self+ .inner+ .sdk+ .database_manager+ .get_databases()+ .await+ .unwrap()+ }++ pub async fn all_database_ref_views(&self, database_id: &str) -> Vec<DatabaseRef> {+ self+ .inner+ .sdk+ .database_manager+ .get_database_ref_views(database_id)+ .await+ .unwrap()+ }++ async fn get_database_editor(&self, view_id: &str) -> Arc<DatabaseEditor> {+ self+ .inner+ .sdk+ .database_manager+ .open_database_view(&view_id)+ .await+ .unwrap()+ }++ pub async fn row_builder(&self, view_id: &str) -> DatabaseRowTestBuilder {+ let editor = self.get_database_editor(view_id).await;+ let field_revs = editor.get_field_revs(None).await.unwrap();+ DatabaseRowTestBuilder::new(self.block_id(view_id).await, field_revs)+ }++ pub async fn run_script(&mut self, script: DatabaseRefScript) {+ match script {+ DatabaseRefScript::LinkGridToDatabase { database_id } => {+ let mut ext = HashMap::new();+ ext.insert("database_id".to_owned(), database_id);+ self+ .inner+ .sdk+ .folder_manager+ .create_test_grid_view(&self.inner.app_id, "test link grid", ext)+ .await;+ },+ DatabaseRefScript::LinkBoardToDatabase { database_id } => {+ let mut ext = HashMap::new();+ ext.insert("database_id".to_owned(), database_id);+ self+ .inner+ .sdk+ .folder_manager+ .create_test_board_view(&self.inner.app_id, "test link board", ext)+ .await;+ },+ DatabaseRefScript::CreateNewGrid => {+ self+ .inner+ .sdk+ .folder_manager+ .create_test_grid_view(&self.inner.app_id, "Create test grid", HashMap::new())+ .await;+ },+ DatabaseRefScript::AssertNumberOfDatabase { expected } => {+ let databases = self.all_databases().await;+ assert_eq!(databases.len(), expected);+ },+ DatabaseRefScript::CreateRow { view_id, row_rev } => {+ let editor = self.get_database_editor(&view_id).await;+ let _ = editor.insert_rows(vec![row_rev]).await.unwrap();+ },+ DatabaseRefScript::AssertNumberOfRows { view_id, expected } => {+ let editor = self.get_database_editor(&view_id).await;+ let rows = editor.get_all_row_revs(&view_id).await.unwrap();+ assert_eq!(rows.len(), expected);+ },+ }+ }+}diff --git a/frontend/rust-lib/flowy-database/tests/database/database_ref_test/test.rs b/frontend/rust-lib/flowy-database/tests/database/database_ref_test/test.rsnew file mode 100644index 0000000000..aec0451b47--- /dev/null+++ b/frontend/rust-lib/flowy-database/tests/database/database_ref_test/test.rs@@ -0,0 +1,89 @@+use crate::database::database_ref_test::script::DatabaseRefScript::*;+use crate::database::database_ref_test::script::DatabaseRefTest;++#[tokio::test]+async fn database_ref_number_of_database_test() {+ let mut test = DatabaseRefTest::new().await;+ test+ .run_scripts(vec![+ AssertNumberOfDatabase { expected: 1 },+ CreateNewGrid,+ AssertNumberOfDatabase { expected: 2 },+ ])+ .await;+}++#[tokio::test]+async fn database_ref_link_with_existing_database_test() {+ let mut test = DatabaseRefTest::new().await;+ let database = test.all_databases().await.pop().unwrap();+ test+ .run_scripts(vec![+ LinkGridToDatabase {+ database_id: database.database_id,+ },+ AssertNumberOfDatabase { expected: 1 },+ ])+ .await;+}++#[tokio::test]+async fn database_ref_link_with_existing_database_row_test() {+ let mut test = DatabaseRefTest::new().await;+ let database = test.all_databases().await.pop().unwrap();+ test+ .run_scripts(vec![+ LinkGridToDatabase {+ database_id: database.database_id,+ },+ AssertNumberOfDatabase { expected: 1 },+ ])+ .await;+}++#[tokio::test]+async fn database_ref_create_new_row_test() {+ let mut test = DatabaseRefTest::new().await;+ let database = test.all_databases().await.pop().unwrap();+ let database_views = test.all_database_ref_views(&database.database_id).await;+ assert_eq!(database_views.len(), 1);+ let view_id_1 = database_views.get(0).unwrap().view_id.clone();+ test+ .run_scripts(vec![+ AssertNumberOfRows {+ view_id: view_id_1.clone(),+ expected: 6,+ },+ LinkGridToDatabase {+ database_id: database.database_id.clone(),+ },+ AssertNumberOfDatabase { expected: 1 },+ ])+ .await;++ let database_views = test.all_database_ref_views(&database.database_id).await;+ assert_eq!(database_views.len(), 2);+ let view_id_1 = database_views.get(0).unwrap().view_id.clone();+ let view_id_2 = database_views.get(1).unwrap().view_id.clone();++ // Create a new row+ let mut builder = test.row_builder(&view_id_1).await;+ builder.insert_text_cell("hello world");++ test+ .run_scripts(vec![+ CreateRow {+ view_id: view_id_1.clone(),+ row_rev: builder.build(),+ },+ AssertNumberOfRows {+ view_id: view_id_1,+ expected: 7,+ },+ AssertNumberOfRows {+ view_id: view_id_2,+ expected: 7,+ },+ ])+ .await;+}diff --git a/frontend/rust-lib/flowy-database/tests/grid/field_test/mod.rs b/frontend/rust-lib/flowy-database/tests/database/field_test/mod.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/field_test/mod.rsrename to frontend/rust-lib/flowy-database/tests/database/field_test/mod.rsdiff --git a/frontend/rust-lib/flowy-database/tests/grid/field_test/script.rs b/frontend/rust-lib/flowy-database/tests/database/field_test/script.rssimilarity index 96%rename from frontend/rust-lib/flowy-database/tests/grid/field_test/script.rsrename to frontend/rust-lib/flowy-database/tests/database/field_test/script.rsindex fdc2437c96..0dfcb5df6c 100644--- a/frontend/rust-lib/flowy-database/tests/grid/field_test/script.rs+++ b/frontend/rust-lib/flowy-database/tests/database/field_test/script.rs@@ -1,4 +1,4 @@-use crate::grid::database_editor::DatabaseEditorTest;+use crate::database::database_editor::DatabaseEditorTest;use database_model::FieldRevision;use flowy_database::entities::{CreateFieldParams, FieldChangesetParams, FieldType};use flowy_database::services::cell::{stringify_cell_data, TypeCellData};@@ -44,7 +44,7 @@ pub struct DatabaseFieldTest {impl DatabaseFieldTest {pub async fn new() -> Self {- let editor_test = DatabaseEditorTest::new_table().await;+ let editor_test = DatabaseEditorTest::new_grid().await;Self { inner: editor_test }}@@ -106,7 +106,7 @@ impl DatabaseFieldTest {//self.editor- .update_field_type_option(&field_id, type_option, None)+ .update_field_type_option(&self.view_id, &field_id, type_option, None).await.unwrap();self.field_revs = self.editor.get_field_revs(None).await.unwrap();diff --git a/frontend/rust-lib/flowy-database/tests/grid/field_test/test.rs b/frontend/rust-lib/flowy-database/tests/database/field_test/test.rssimilarity index 98%rename from frontend/rust-lib/flowy-database/tests/grid/field_test/test.rsrename to frontend/rust-lib/flowy-database/tests/database/field_test/test.rsindex b8db2c335c..8530359c82 100644--- a/frontend/rust-lib/flowy-database/tests/grid/field_test/test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/field_test/test.rs@@ -1,6 +1,6 @@-use crate::grid::field_test::script::DatabaseFieldTest;-use crate::grid::field_test::script::FieldScript::*;-use crate::grid::field_test::util::*;+use crate::database::field_test::script::DatabaseFieldTest;+use crate::database::field_test::script::FieldScript::*;+use crate::database::field_test::util::*;use bytes::Bytes;use flowy_database::entities::{FieldChangesetParams, FieldType};use flowy_database::services::field::selection_type_option::SelectOptionPB;@@ -63,7 +63,7 @@ async fn grid_update_field_with_empty_change() {let field_rev = (*test.field_revs.clone().pop().unwrap()).clone();let changeset = FieldChangesetParams {field_id: field_rev.id.clone(),- database_id: test.view_id(),+ view_id: test.view_id(),..Default::default()};@@ -96,7 +96,7 @@ async fn grid_update_field() {let changeset = FieldChangesetParams {field_id: single_select_field.id.clone(),- database_id: test.view_id(),+ view_id: test.view_id(),frozen: Some(true),width: Some(1000),..Default::default()diff --git a/frontend/rust-lib/flowy-database/tests/grid/field_test/util.rs b/frontend/rust-lib/flowy-database/tests/database/field_test/util.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/field_test/util.rsrename to frontend/rust-lib/flowy-database/tests/database/field_test/util.rsdiff --git a/frontend/rust-lib/flowy-database/tests/grid/filter_test/checkbox_filter_test.rs b/frontend/rust-lib/flowy-database/tests/database/filter_test/checkbox_filter_test.rssimilarity index 88%rename from frontend/rust-lib/flowy-database/tests/grid/filter_test/checkbox_filter_test.rsrename to frontend/rust-lib/flowy-database/tests/database/filter_test/checkbox_filter_test.rsindex 178e9aad7c..2971b864a4 100644--- a/frontend/rust-lib/flowy-database/tests/grid/filter_test/checkbox_filter_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/filter_test/checkbox_filter_test.rs@@ -1,5 +1,5 @@-use crate::grid::filter_test::script::FilterScript::*;-use crate::grid::filter_test::script::{DatabaseFilterTest, FilterRowChanged};+use crate::database::filter_test::script::FilterScript::*;+use crate::database::filter_test::script::{DatabaseFilterTest, FilterRowChanged};use flowy_database::entities::CheckboxFilterConditionPB;#[tokio::test]diff --git a/frontend/rust-lib/flowy-database/tests/grid/filter_test/checklist_filter_test.rs b/frontend/rust-lib/flowy-database/tests/database/filter_test/checklist_filter_test.rssimilarity index 88%rename from frontend/rust-lib/flowy-database/tests/grid/filter_test/checklist_filter_test.rsrename to frontend/rust-lib/flowy-database/tests/database/filter_test/checklist_filter_test.rsindex 8cb257eadc..6c93afd59e 100644--- a/frontend/rust-lib/flowy-database/tests/grid/filter_test/checklist_filter_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/filter_test/checklist_filter_test.rs@@ -1,5 +1,5 @@-use crate::grid::filter_test::script::FilterScript::*;-use crate::grid::filter_test::script::{DatabaseFilterTest, FilterRowChanged};+use crate::database::filter_test::script::FilterScript::*;+use crate::database::filter_test::script::{DatabaseFilterTest, FilterRowChanged};use flowy_database::entities::ChecklistFilterConditionPB;#[tokio::test]diff --git a/frontend/rust-lib/flowy-database/tests/grid/filter_test/date_filter_test.rs b/frontend/rust-lib/flowy-database/tests/database/filter_test/date_filter_test.rssimilarity index 95%rename from frontend/rust-lib/flowy-database/tests/grid/filter_test/date_filter_test.rsrename to frontend/rust-lib/flowy-database/tests/database/filter_test/date_filter_test.rsindex 79f2ef75e8..aa2d396c09 100644--- a/frontend/rust-lib/flowy-database/tests/grid/filter_test/date_filter_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/filter_test/date_filter_test.rs@@ -1,5 +1,5 @@-use crate::grid::filter_test::script::FilterScript::*;-use crate::grid::filter_test::script::{DatabaseFilterTest, FilterRowChanged};+use crate::database::filter_test::script::FilterScript::*;+use crate::database::filter_test::script::{DatabaseFilterTest, FilterRowChanged};use flowy_database::entities::DateFilterConditionPB;#[tokio::test]diff --git a/frontend/rust-lib/flowy-database/tests/grid/filter_test/mod.rs b/frontend/rust-lib/flowy-database/tests/database/filter_test/mod.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/filter_test/mod.rsrename to frontend/rust-lib/flowy-database/tests/database/filter_test/mod.rsdiff --git a/frontend/rust-lib/flowy-database/tests/grid/filter_test/number_filter_test.rs b/frontend/rust-lib/flowy-database/tests/database/filter_test/number_filter_test.rssimilarity index 95%rename from frontend/rust-lib/flowy-database/tests/grid/filter_test/number_filter_test.rsrename to frontend/rust-lib/flowy-database/tests/database/filter_test/number_filter_test.rsindex 11045eb314..142335bd1b 100644--- a/frontend/rust-lib/flowy-database/tests/grid/filter_test/number_filter_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/filter_test/number_filter_test.rs@@ -1,5 +1,5 @@-use crate::grid::filter_test::script::FilterScript::*;-use crate::grid::filter_test::script::{DatabaseFilterTest, FilterRowChanged};+use crate::database::filter_test::script::FilterScript::*;+use crate::database::filter_test::script::{DatabaseFilterTest, FilterRowChanged};use flowy_database::entities::NumberFilterConditionPB;#[tokio::test]diff --git a/frontend/rust-lib/flowy-database/tests/grid/filter_test/script.rs b/frontend/rust-lib/flowy-database/tests/database/filter_test/script.rssimilarity index 96%rename from frontend/rust-lib/flowy-database/tests/grid/filter_test/script.rsrename to frontend/rust-lib/flowy-database/tests/database/filter_test/script.rsindex 3c6b4bc224..e4a0e566e0 100644--- a/frontend/rust-lib/flowy-database/tests/grid/filter_test/script.rs+++ b/frontend/rust-lib/flowy-database/tests/database/filter_test/script.rs@@ -15,7 +15,7 @@ use flowy_sqlite::schema::view_table::dsl::view_table;use flowy_database::services::cell::insert_select_option_cell;use flowy_database::services::filter::FilterType;use flowy_database::services::database_view::DatabaseViewChanged;-use crate::grid::database_editor::DatabaseEditorTest;+use crate::database::database_editor::DatabaseEditorTest;pub struct FilterRowChanged {pub(crate) showing_num_of_rows: usize,@@ -106,7 +106,7 @@ pub struct DatabaseFilterTest {impl DatabaseFilterTest {pub async fn new() -> Self {- let editor_test = DatabaseEditorTest::new_table().await;+ let editor_test = DatabaseEditorTest::new_grid().await;Self {inner: editor_test,recv: None,@@ -118,7 +118,7 @@ impl DatabaseFilterTest {}pub async fn get_all_filters(&self) -> Vec<FilterPB> {- self.editor.get_all_filters().await.unwrap()+ self.editor.get_all_filters(&self.view_id).await.unwrap()}pub async fn run_scripts(&mut self, scripts: Vec<FilterScript>) {@@ -238,11 +238,11 @@ impl DatabaseFilterTest {self.insert_filter(payload).await;}FilterScript::AssertFilterCount { count } => {- let filters = self.editor.get_all_filters().await.unwrap();+ let filters = self.editor.get_all_filters(&self.view_id).await.unwrap();assert_eq!(count as usize, filters.len());}FilterScript::AssertFilterContent { filter_type: filter_id, condition, content} => {- let filter = self.editor.get_filters(filter_id).await.unwrap().pop().unwrap();+ let filter = self.editor.get_filters(&self.view_id, filter_id).await.unwrap().pop().unwrap();assert_eq!(&filter.content, &content);assert_eq!(filter.condition as u32, condition);@@ -254,7 +254,7 @@ impl DatabaseFilterTest {let _ = self.editor.delete_filter(params).await.unwrap();}FilterScript::AssertGridSetting { expected_setting } => {- let setting = self.editor.get_setting().await.unwrap();+ let setting = self.editor.get_setting(&self.view_id).await.unwrap();assert_eq!(expected_setting, setting);}FilterScript::AssertNumberOfVisibleRows { expected } => {diff --git a/frontend/rust-lib/flowy-database/tests/grid/filter_test/select_option_filter_test.rs b/frontend/rust-lib/flowy-database/tests/database/filter_test/select_option_filter_test.rssimilarity index 96%rename from frontend/rust-lib/flowy-database/tests/grid/filter_test/select_option_filter_test.rsrename to frontend/rust-lib/flowy-database/tests/database/filter_test/select_option_filter_test.rsindex f50a19f76a..8afad84cce 100644--- a/frontend/rust-lib/flowy-database/tests/grid/filter_test/select_option_filter_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/filter_test/select_option_filter_test.rs@@ -1,5 +1,5 @@-use crate::grid::filter_test::script::FilterScript::*;-use crate::grid::filter_test::script::{DatabaseFilterTest, FilterRowChanged};+use crate::database::filter_test::script::FilterScript::*;+use crate::database::filter_test::script::{DatabaseFilterTest, FilterRowChanged};use flowy_database::entities::{FieldType, SelectOptionConditionPB};#[tokio::test]diff --git a/frontend/rust-lib/flowy-database/tests/grid/filter_test/text_filter_test.rs b/frontend/rust-lib/flowy-database/tests/database/filter_test/text_filter_test.rssimilarity index 96%rename from frontend/rust-lib/flowy-database/tests/grid/filter_test/text_filter_test.rsrename to frontend/rust-lib/flowy-database/tests/database/filter_test/text_filter_test.rsindex 56e41daea8..91df7bd58b 100644--- a/frontend/rust-lib/flowy-database/tests/grid/filter_test/text_filter_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/filter_test/text_filter_test.rs@@ -1,5 +1,5 @@-use crate::grid::filter_test::script::FilterScript::*;-use crate::grid::filter_test::script::*;+use crate::database::filter_test::script::FilterScript::*;+use crate::database::filter_test::script::*;use flowy_database::entities::{AlterFilterPayloadPB, FieldType, TextFilterConditionPB, TextFilterPB,};@@ -39,7 +39,7 @@ async fn grid_filter_text_is_not_empty_test() {];test.run_scripts(scripts).await;- let filter = test.grid_filters().await.pop().unwrap();+ let filter = test.database_filters().await.pop().unwrap();let field_rev = test.get_first_field_rev(FieldType::RichText).clone();test.run_scripts(vec![@@ -204,7 +204,7 @@ async fn grid_filter_delete_test() {];test.run_scripts(scripts).await;- let filter = test.grid_filters().await.pop().unwrap();+ let filter = test.database_filters().await.pop().unwrap();test.run_scripts(vec![DeleteFilter {diff --git a/frontend/rust-lib/flowy-database/tests/grid/group_test/mod.rs b/frontend/rust-lib/flowy-database/tests/database/group_test/mod.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/group_test/mod.rsrename to frontend/rust-lib/flowy-database/tests/database/group_test/mod.rsdiff --git a/frontend/rust-lib/flowy-database/tests/grid/group_test/script.rs b/frontend/rust-lib/flowy-database/tests/database/group_test/script.rssimilarity index 92%rename from frontend/rust-lib/flowy-database/tests/grid/group_test/script.rsrename to frontend/rust-lib/flowy-database/tests/database/group_test/script.rsindex cf9bb7d3ef..bf6abcba27 100644--- a/frontend/rust-lib/flowy-database/tests/grid/group_test/script.rs+++ b/frontend/rust-lib/flowy-database/tests/database/group_test/script.rs@@ -1,4 +1,4 @@-use crate::grid::database_editor::DatabaseEditorTest;+use crate::database::database_editor::DatabaseEditorTest;use database_model::{FieldRevision, RowChangeset};use flowy_database::entities::{CreateRowParams, FieldType, GroupPB, LayoutTypePB, MoveGroupParams, MoveGroupRowParams, RowPB,@@ -87,7 +87,7 @@ impl DatabaseGroupTest {assert_eq!(row_count, self.group_at_index(group_index).await.rows.len());},GroupScript::AssertGroupCount(count) => {- let groups = self.editor.load_groups().await.unwrap();+ let groups = self.editor.load_groups(&self.view_id).await.unwrap();assert_eq!(count, groups.len());},GroupScript::MoveRow {@@ -96,7 +96,7 @@ impl DatabaseGroupTest {to_group_index,to_row_index,} => {- let groups: Vec<GroupPB> = self.editor.load_groups().await.unwrap().items;+ let groups: Vec<GroupPB> = self.editor.load_groups(&self.view_id).await.unwrap().items;let from_row = groups.get(from_group_index).unwrap()@@ -106,7 +106,7 @@ impl DatabaseGroupTest {let to_group = groups.get(to_group_index).unwrap();let to_row = to_group.rows.get(to_row_index).unwrap();let params = MoveGroupRowParams {- view_id: self.inner.view_id.clone(),+ view_id: self.view_id.clone(),from_row_id: from_row.id.clone(),to_group_id: to_group.group_id.clone(),to_row_id: Some(to_row.id.clone()),@@ -127,7 +127,7 @@ impl DatabaseGroupTest {GroupScript::CreateRow { group_index } => {let group = self.group_at_index(group_index).await;let params = CreateRowParams {- view_id: self.editor.database_id.clone(),+ view_id: self.view_id.clone(),start_row_id: None,group_id: Some(group.group_id.clone()),layout: LayoutTypePB::Board,@@ -212,7 +212,7 @@ impl DatabaseGroupTest {let from_group = self.group_at_index(from_group_index).await;let to_group = self.group_at_index(to_group_index).await;let params = MoveGroupParams {- view_id: self.editor.database_id.clone(),+ view_id: self.view_id.clone(),from_group_id: from_group.group_id,to_group_id: to_group.group_id,};@@ -237,13 +237,17 @@ impl DatabaseGroupTest {.await;},GroupScript::GroupByField { field_id } => {- self.editor.group_by_field(&field_id).await.unwrap();+ self+ .editor+ .group_by_field(&self.view_id, &field_id)+ .await+ .unwrap();},}}pub async fn group_at_index(&self, index: usize) -> GroupPB {- let groups = self.editor.load_groups().await.unwrap().items;+ let groups = self.editor.load_groups(&self.view_id).await.unwrap().items;groups.get(index).unwrap().clone()}@@ -285,9 +289,14 @@ impl DatabaseGroupTest {action: impl FnOnce(&mut SingleSelectTypeOptionPB),) {let single_select = self.get_single_select_field().await;- edit_single_select_type_option(&single_select.id, self.editor.clone(), action)- .await- .unwrap();+ edit_single_select_type_option(+ &self.view_id,+ &single_select.id,+ self.editor.clone(),+ action,+ )+ .await+ .unwrap();}pub async fn get_url_field(&self) -> Arc<FieldRevision> {diff --git a/frontend/rust-lib/flowy-database/tests/grid/group_test/test.rs b/frontend/rust-lib/flowy-database/tests/database/group_test/test.rssimilarity index 98%rename from frontend/rust-lib/flowy-database/tests/grid/group_test/test.rsrename to frontend/rust-lib/flowy-database/tests/database/group_test/test.rsindex 42984f47f5..87504ba61f 100644--- a/frontend/rust-lib/flowy-database/tests/grid/group_test/test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/group_test/test.rs@@ -1,5 +1,5 @@-use crate::grid::group_test::script::DatabaseGroupTest;-use crate::grid::group_test::script::GroupScript::*;+use crate::database::group_test::script::DatabaseGroupTest;+use crate::database::group_test::script::GroupScript::*;use flowy_database::services::field::SelectOptionPB;diff --git a/frontend/rust-lib/flowy-database/tests/grid/group_test/url_group_test.rs b/frontend/rust-lib/flowy-database/tests/database/group_test/url_group_test.rssimilarity index 96%rename from frontend/rust-lib/flowy-database/tests/grid/group_test/url_group_test.rsrename to frontend/rust-lib/flowy-database/tests/database/group_test/url_group_test.rsindex 5be04108ab..83a38b07d3 100644--- a/frontend/rust-lib/flowy-database/tests/grid/group_test/url_group_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/group_test/url_group_test.rs@@ -1,5 +1,5 @@-use crate::grid::group_test::script::DatabaseGroupTest;-use crate::grid::group_test::script::GroupScript::*;+use crate::database::group_test::script::DatabaseGroupTest;+use crate::database::group_test::script::GroupScript::*;#[tokio::test]async fn group_group_by_url() {diff --git a/frontend/rust-lib/flowy-database/tests/grid/mock_data/board_mock_data.rs b/frontend/rust-lib/flowy-database/tests/database/mock_data/board_mock_data.rssimilarity index 89%rename from frontend/rust-lib/flowy-database/tests/grid/mock_data/board_mock_data.rsrename to frontend/rust-lib/flowy-database/tests/database/mock_data/board_mock_data.rsindex b6beb26ba3..19407c8369 100644--- a/frontend/rust-lib/flowy-database/tests/grid/mock_data/board_mock_data.rs+++ b/frontend/rust-lib/flowy-database/tests/database/mock_data/board_mock_data.rs@@ -1,8 +1,8 @@// #![allow(clippy::all)]// #![allow(dead_code)]// #![allow(unused_imports)]-use crate::grid::block_test::util::GridRowTestBuilder;-use crate::grid::mock_data::{+use crate::database::block_test::util::DatabaseRowTestBuilder;+use crate::database::mock_data::{COMPLETED, FACEBOOK, FIRST_THING, GOOGLE, PAUSED, PLANNED, SECOND_THING, THIRD_THING, TWITTER,};@@ -18,12 +18,11 @@ use strum::IntoEnumIterator;// Kanban board unit test mock datapub fn make_test_board() -> BuildDatabaseContext {- let mut grid_builder = DatabaseBuilder::new();+ let mut database_builder = DatabaseBuilder::new();// Iterate through the FieldType to create the corresponding Field.for field_type in FieldType::iter() {let field_type: FieldType = field_type;- // Thematch field_type {FieldType::RichText => {let text_field = FieldBuilder::new(RichTextTypeOptionBuilder::default())@@ -31,7 +30,7 @@ pub fn make_test_board() -> BuildDatabaseContext {.visibility(true).primary(true).build();- grid_builder.add_field(text_field);+ database_builder.add_field(text_field);},FieldType::Number => {// Number@@ -40,7 +39,7 @@ pub fn make_test_board() -> BuildDatabaseContext {.name("Price").visibility(true).build();- grid_builder.add_field(number_field);+ database_builder.add_field(number_field);},FieldType::DateTime => {// Date@@ -51,7 +50,7 @@ pub fn make_test_board() -> BuildDatabaseContext {.name("Time").visibility(true).build();- grid_builder.add_field(date_field);+ database_builder.add_field(date_field);},FieldType::SingleSelect => {// Single Select@@ -63,7 +62,7 @@ pub fn make_test_board() -> BuildDatabaseContext {.name("Status").visibility(true).build();- grid_builder.add_field(single_select_field);+ database_builder.add_field(single_select_field);},FieldType::MultiSelect => {// MultiSelect@@ -75,7 +74,7 @@ pub fn make_test_board() -> BuildDatabaseContext {.name("Platform").visibility(true).build();- grid_builder.add_field(multi_select_field);+ database_builder.add_field(multi_select_field);},FieldType::Checkbox => {// Checkbox@@ -84,13 +83,13 @@ pub fn make_test_board() -> BuildDatabaseContext {.name("is urgent").visibility(true).build();- grid_builder.add_field(checkbox_field);+ database_builder.add_field(checkbox_field);},FieldType::URL => {// URLlet url = URLTypeOptionBuilder::default();let url_field = FieldBuilder::new(url).name("link").visibility(true).build();- grid_builder.add_field(url_field);+ database_builder.add_field(url_field);},FieldType::Checklist => {let checklist = ChecklistTypeOptionBuilder::default()@@ -101,16 +100,16 @@ pub fn make_test_board() -> BuildDatabaseContext {.name("TODO").visibility(true).build();- grid_builder.add_field(checklist_field);+ database_builder.add_field(checklist_field);},}}// We have many assumptions base on the number of the rows, so do not change the number of the loop.for i in 0..5 {- let block_id = grid_builder.block_id().to_owned();- let field_revs = grid_builder.field_revs();- let mut row_builder = GridRowTestBuilder::new(&block_id, field_revs);+ let block_id = database_builder.block_id().to_owned();+ let field_revs = database_builder.field_revs().clone();+ let mut row_builder = DatabaseRowTestBuilder::new(block_id.clone(), field_revs);match i {0 => {for field_type in FieldType::iter() {@@ -202,7 +201,7 @@ pub fn make_test_board() -> BuildDatabaseContext {}let row_rev = row_builder.build();- grid_builder.add_row(row_rev);+ database_builder.add_row(row_rev);}- grid_builder.build()+ database_builder.build()}diff --git a/frontend/rust-lib/flowy-database/tests/grid/mock_data/calendar_mock_data.rs b/frontend/rust-lib/flowy-database/tests/database/mock_data/calendar_mock_data.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/mock_data/calendar_mock_data.rsrename to frontend/rust-lib/flowy-database/tests/database/mock_data/calendar_mock_data.rsdiff --git a/frontend/rust-lib/flowy-database/tests/grid/mock_data/grid_mock_data.rs b/frontend/rust-lib/flowy-database/tests/database/mock_data/grid_mock_data.rssimilarity index 89%rename from frontend/rust-lib/flowy-database/tests/grid/mock_data/grid_mock_data.rsrename to frontend/rust-lib/flowy-database/tests/database/mock_data/grid_mock_data.rsindex 55a163211b..17dedca664 100644--- a/frontend/rust-lib/flowy-database/tests/grid/mock_data/grid_mock_data.rs+++ b/frontend/rust-lib/flowy-database/tests/database/mock_data/grid_mock_data.rs@@ -1,8 +1,8 @@// #![allow(clippy::all)]// #![allow(dead_code)]// #![allow(unused_imports)]-use crate::grid::block_test::util::GridRowTestBuilder;-use crate::grid::mock_data::{+use crate::database::block_test::util::DatabaseRowTestBuilder;+use crate::database::mock_data::{COMPLETED, FACEBOOK, FIRST_THING, GOOGLE, PAUSED, PLANNED, SECOND_THING, THIRD_THING, TWITTER,};@@ -17,7 +17,7 @@ use database_model::*;use strum::IntoEnumIterator;pub fn make_test_grid() -> BuildDatabaseContext {- let mut grid_builder = DatabaseBuilder::new();+ let mut database_builder = DatabaseBuilder::new();// Iterate through the FieldType to create the corresponding Field.for field_type in FieldType::iter() {let field_type: FieldType = field_type;@@ -30,7 +30,7 @@ pub fn make_test_grid() -> BuildDatabaseContext {.visibility(true).primary(true).build();- grid_builder.add_field(text_field);+ database_builder.add_field(text_field);},FieldType::Number => {// Number@@ -39,7 +39,7 @@ pub fn make_test_grid() -> BuildDatabaseContext {.name("Price").visibility(true).build();- grid_builder.add_field(number_field);+ database_builder.add_field(number_field);},FieldType::DateTime => {// Date@@ -50,7 +50,7 @@ pub fn make_test_grid() -> BuildDatabaseContext {.name("Time").visibility(true).build();- grid_builder.add_field(date_field);+ database_builder.add_field(date_field);},FieldType::SingleSelect => {// Single Select@@ -62,7 +62,7 @@ pub fn make_test_grid() -> BuildDatabaseContext {.name("Status").visibility(true).build();- grid_builder.add_field(single_select_field);+ database_builder.add_field(single_select_field);},FieldType::MultiSelect => {// MultiSelect@@ -74,7 +74,7 @@ pub fn make_test_grid() -> BuildDatabaseContext {.name("Platform").visibility(true).build();- grid_builder.add_field(multi_select_field);+ database_builder.add_field(multi_select_field);},FieldType::Checkbox => {// Checkbox@@ -83,13 +83,13 @@ pub fn make_test_grid() -> BuildDatabaseContext {.name("is urgent").visibility(true).build();- grid_builder.add_field(checkbox_field);+ database_builder.add_field(checkbox_field);},FieldType::URL => {// URLlet url = URLTypeOptionBuilder::default();let url_field = FieldBuilder::new(url).name("link").visibility(true).build();- grid_builder.add_field(url_field);+ database_builder.add_field(url_field);},FieldType::Checklist => {let checklist = ChecklistTypeOptionBuilder::default()@@ -100,15 +100,15 @@ pub fn make_test_grid() -> BuildDatabaseContext {.name("TODO").visibility(true).build();- grid_builder.add_field(checklist_field);+ database_builder.add_field(checklist_field);},}}for i in 0..6 {- let block_id = grid_builder.block_id().to_owned();- let field_revs = grid_builder.field_revs();- let mut row_builder = GridRowTestBuilder::new(&block_id, field_revs);+ let block_id = database_builder.block_id().to_owned();+ let field_revs = database_builder.field_revs().clone();+ let mut row_builder = DatabaseRowTestBuilder::new(block_id, field_revs);match i {0 => {for field_type in FieldType::iter() {@@ -204,7 +204,7 @@ pub fn make_test_grid() -> BuildDatabaseContext {}let row_rev = row_builder.build();- grid_builder.add_row(row_rev);+ database_builder.add_row(row_rev);}- grid_builder.build()+ database_builder.build()}diff --git a/frontend/rust-lib/flowy-database/tests/grid/mock_data/mod.rs b/frontend/rust-lib/flowy-database/tests/database/mock_data/mod.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/mock_data/mod.rsrename to frontend/rust-lib/flowy-database/tests/database/mock_data/mod.rsdiff --git a/frontend/rust-lib/flowy-database/tests/grid/mod.rs b/frontend/rust-lib/flowy-database/tests/database/mod.rssimilarity index 86%rename from frontend/rust-lib/flowy-database/tests/grid/mod.rsrename to frontend/rust-lib/flowy-database/tests/database/mod.rsindex c07432f423..b3aaf61ab5 100644--- a/frontend/rust-lib/flowy-database/tests/grid/mod.rs+++ b/frontend/rust-lib/flowy-database/tests/database/mod.rs@@ -1,6 +1,7 @@mod block_test;mod cell_test;mod database_editor;+mod database_ref_test;mod field_test;mod filter_test;mod group_test;diff --git a/frontend/rust-lib/flowy-database/tests/grid/script.rs b/frontend/rust-lib/flowy-database/tests/database/script.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/script.rsrename to frontend/rust-lib/flowy-database/tests/database/script.rsdiff --git a/frontend/rust-lib/flowy-database/tests/database/snapshot_test/mod.rs b/frontend/rust-lib/flowy-database/tests/database/snapshot_test/mod.rsnew file mode 100644index 0000000000..63d424afaf--- /dev/null+++ b/frontend/rust-lib/flowy-database/tests/database/snapshot_test/mod.rs@@ -0,0 +1,2 @@+mod script;+mod test;diff --git a/frontend/rust-lib/flowy-database/tests/grid/snapshot_test/script.rs b/frontend/rust-lib/flowy-database/tests/database/snapshot_test/script.rssimilarity index 96%rename from frontend/rust-lib/flowy-database/tests/grid/snapshot_test/script.rsrename to frontend/rust-lib/flowy-database/tests/database/snapshot_test/script.rsindex 4d399b3a62..096d968ab5 100644--- a/frontend/rust-lib/flowy-database/tests/grid/snapshot_test/script.rs+++ b/frontend/rust-lib/flowy-database/tests/database/snapshot_test/script.rs@@ -1,4 +1,4 @@-use crate::grid::database_editor::DatabaseEditorTest;+use crate::database::database_editor::DatabaseEditorTest;use database_model::FieldRevision;use flowy_client_sync::client_database::{DatabaseOperations, DatabaseRevisionPad};@@ -34,7 +34,7 @@ pub struct DatabaseSnapshotTest {impl DatabaseSnapshotTest {pub async fn new() -> Self {- let editor_test = DatabaseEditorTest::new_table().await;+ let editor_test = DatabaseEditorTest::new_grid().await;Self {inner: editor_test,current_snapshot: None,diff --git a/frontend/rust-lib/flowy-database/tests/grid/snapshot_test/test.rs b/frontend/rust-lib/flowy-database/tests/database/snapshot_test/test.rssimilarity index 89%rename from frontend/rust-lib/flowy-database/tests/grid/snapshot_test/test.rsrename to frontend/rust-lib/flowy-database/tests/database/snapshot_test/test.rsindex 98bb26813d..cf8bb512ec 100644--- a/frontend/rust-lib/flowy-database/tests/grid/snapshot_test/test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/snapshot_test/test.rs@@ -1,5 +1,5 @@-use crate::grid::field_test::util::create_text_field;-use crate::grid::snapshot_test::script::{DatabaseSnapshotTest, SnapshotScript::*};+use crate::database::field_test::util::create_text_field;+use crate::database::snapshot_test::script::{DatabaseSnapshotTest, SnapshotScript::*};#[tokio::test]async fn snapshot_create_test() {diff --git a/frontend/rust-lib/flowy-database/tests/grid/sort_test/checkbox_and_text_test.rs b/frontend/rust-lib/flowy-database/tests/database/sort_test/checkbox_and_text_test.rssimilarity index 95%rename from frontend/rust-lib/flowy-database/tests/grid/sort_test/checkbox_and_text_test.rsrename to frontend/rust-lib/flowy-database/tests/database/sort_test/checkbox_and_text_test.rsindex a955dbcdea..896c7aa5c8 100644--- a/frontend/rust-lib/flowy-database/tests/grid/sort_test/checkbox_and_text_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/sort_test/checkbox_and_text_test.rs@@ -1,4 +1,4 @@-use crate::grid::sort_test::script::{DatabaseSortTest, SortScript::*};+use crate::database::sort_test::script::{DatabaseSortTest, SortScript::*};use database_model::SortCondition;use flowy_database::entities::FieldType;diff --git a/frontend/rust-lib/flowy-database/tests/grid/sort_test/mod.rs b/frontend/rust-lib/flowy-database/tests/database/sort_test/mod.rssimilarity index 100%rename from frontend/rust-lib/flowy-database/tests/grid/sort_test/mod.rsrename to frontend/rust-lib/flowy-database/tests/database/sort_test/mod.rsdiff --git a/frontend/rust-lib/flowy-database/tests/grid/sort_test/multi_sort_test.rs b/frontend/rust-lib/flowy-database/tests/database/sort_test/multi_sort_test.rssimilarity index 92%rename from frontend/rust-lib/flowy-database/tests/grid/sort_test/multi_sort_test.rsrename to frontend/rust-lib/flowy-database/tests/database/sort_test/multi_sort_test.rsindex 60dcdceb3b..b2677d4dac 100644--- a/frontend/rust-lib/flowy-database/tests/grid/sort_test/multi_sort_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/sort_test/multi_sort_test.rs@@ -1,5 +1,5 @@-use crate::grid::sort_test::script::DatabaseSortTest;-use crate::grid::sort_test::script::SortScript::*;+use crate::database::sort_test::script::DatabaseSortTest;+use crate::database::sort_test::script::SortScript::*;use database_model::SortCondition;use flowy_database::entities::FieldType;diff --git a/frontend/rust-lib/flowy-database/tests/grid/sort_test/script.rs b/frontend/rust-lib/flowy-database/tests/database/sort_test/script.rssimilarity index 96%rename from frontend/rust-lib/flowy-database/tests/grid/sort_test/script.rsrename to frontend/rust-lib/flowy-database/tests/database/sort_test/script.rsindex 492242bd2e..93d4e77bd9 100644--- a/frontend/rust-lib/flowy-database/tests/grid/sort_test/script.rs+++ b/frontend/rust-lib/flowy-database/tests/database/sort_test/script.rs@@ -1,4 +1,4 @@-use crate::grid::database_editor::DatabaseEditorTest;+use crate::database::database_editor::DatabaseEditorTest;use async_stream::stream;use database_model::{FieldRevision, SortCondition, SortRevision};use flowy_database::entities::{AlterSortParams, CellIdParams, DeleteSortParams};@@ -44,7 +44,7 @@ pub struct DatabaseSortTest {impl DatabaseSortTest {pub async fn new() -> Self {- let editor_test = DatabaseEditorTest::new_table().await;+ let editor_test = DatabaseEditorTest::new_grid().await;Self {inner: editor_test,current_sort_rev: None,@@ -101,7 +101,7 @@ impl DatabaseSortTest {let rows = self.editor.get_database(&self.view_id).await.unwrap().rows;for row in rows {let params = CellIdParams {- database_id: self.view_id.clone(),+ view_id: self.view_id.clone(),field_id: field_id.clone(),row_id: row.id,};diff --git a/frontend/rust-lib/flowy-database/tests/grid/sort_test/single_sort_test.rs b/frontend/rust-lib/flowy-database/tests/database/sort_test/single_sort_test.rssimilarity index 99%rename from frontend/rust-lib/flowy-database/tests/grid/sort_test/single_sort_test.rsrename to frontend/rust-lib/flowy-database/tests/database/sort_test/single_sort_test.rsindex 50c2ff4177..c41974572c 100644--- a/frontend/rust-lib/flowy-database/tests/grid/sort_test/single_sort_test.rs+++ b/frontend/rust-lib/flowy-database/tests/database/sort_test/single_sort_test.rs@@ -1,4 +1,4 @@-use crate::grid::sort_test::script::{DatabaseSortTest, SortScript::*};+use crate::database::sort_test::script::{DatabaseSortTest, SortScript::*};use database_model::SortCondition;use flowy_database::entities::FieldType;diff --git a/frontend/rust-lib/flowy-database/tests/grid/grid_editor.rs b/frontend/rust-lib/flowy-database/tests/grid/grid_editor.rsdeleted file mode 100644index d503a20b0b..0000000000--- a/frontend/rust-lib/flowy-database/tests/grid/grid_editor.rs+++ /dev/null@@ -1,619 +0,0 @@-#![allow(clippy::all)]-#![allow(dead_code)]-#![allow(unused_imports)]-use crate::grid::block_test::util::GridRowTestBuilder;-use bytes::Bytes;-use database_model::*;-use flowy_client_sync::client_database::DatabaseBuilder;-use flowy_database::entities::*;-use flowy_database::services::cell::ToCellChangesetString;-use flowy_database::services::field::SelectOptionPB;-use flowy_database::services::field::*;-use flowy_database::services::grid_editor::{DatabaseRevisionEditor, GridRevisionSerde};-use flowy_database::services::row::{CreateRowRevisionPayload, RowRevisionBuilder};-use flowy_database::services::setting::GridSettingChangesetBuilder;-use flowy_error::FlowyResult;-use flowy_revision::REVISION_WRITE_INTERVAL_IN_MILLIS;-use flowy_test::helper::ViewTest;-use flowy_test::FlowySDKTest;-use std::collections::HashMap;-use std::sync::Arc;-use std::time::Duration;-use strum::EnumCount;-use strum::IntoEnumIterator;-use tokio::time::sleep;--pub struct GridEditorTest {- pub sdk: FlowySDKTest,- pub view_id: String,- pub editor: Arc<DatabaseRevisionEditor>,- pub field_revs: Vec<Arc<FieldRevision>>,- pub block_meta_revs: Vec<Arc<GridBlockMetaRevision>>,- pub row_revs: Vec<Arc<RowRevision>>,- pub field_count: usize,- pub row_by_row_id: HashMap<String, RowPB>,-}--impl GridEditorTest {- pub async fn new_table() -> Self {- Self::new(DatabaseViewLayout::Grid).await- }-- pub async fn new_board() -> Self {- Self::new(DatabaseViewLayout::Board).await- }-- pub async fn new(layout: DatabaseViewLayout) -> Self {- let sdk = FlowySDKTest::default();- let _ = sdk.init_user().await;- let test = match layout {- DatabaseViewLayout::Grid => {- let build_context = make_test_grid();- let view_data: Bytes = build_context.into();- ViewTest::new_grid_view(&sdk, view_data.to_vec()).await- },- DatabaseViewLayout::Board => {- let build_context = make_test_board();- let view_data: Bytes = build_context.into();- ViewTest::new_board_view(&sdk, view_data.to_vec()).await- },- DatabaseViewLayout::Calendar => {- let build_context = make_test_calendar();- let view_data: Bytes = build_context.into();- ViewTest::new_calendar_view(&sdk, view_data.to_vec()).await- },- };-- let editor = sdk.grid_manager.open_database(&test.view.id).await.unwrap();- let field_revs = editor.get_field_revs(None).await.unwrap();- let block_meta_revs = editor.get_block_meta_revs().await.unwrap();- let row_pbs = editor.get_all_row_revs(&test.view.id).await.unwrap();- assert_eq!(block_meta_revs.len(), 1);-- // It seems like you should add the field in the make_test_grid() function.- // Because we assert the initialize count of the fields is equal to FieldType::COUNT.- assert_eq!(field_revs.len(), FieldType::COUNT);-- let grid_id = test.view.id;- Self {- sdk,- view_id: grid_id,- editor,- field_revs,- block_meta_revs,- row_revs: row_pbs,- field_count: FieldType::COUNT,- row_by_row_id: HashMap::default(),- }- }-- pub async fn get_row_revs(&self) -> Vec<Arc<RowRevision>> {- self.editor.get_all_row_revs(&self.view_id).await.unwrap()- }-- pub async fn grid_filters(&self) -> Vec<FilterPB> {- self.editor.get_all_filters().await.unwrap()- }-- pub fn get_field_rev(&self, field_id: &str, field_type: FieldType) -> &Arc<FieldRevision> {- self- .field_revs- .iter()- .filter(|field_rev| {- let t_field_type: FieldType = field_rev.ty.into();- field_rev.id == field_id && t_field_type == field_type- })- .collect::<Vec<_>>()- .pop()- .unwrap()- }-- /// returns the first `FieldRevision` in the build-in test grid.- /// Not support duplicate `FieldType` in test grid yet.- pub fn get_first_field_rev(&self, field_type: FieldType) -> &Arc<FieldRevision> {- self- .field_revs- .iter()- .filter(|field_rev| {- let t_field_type: FieldType = field_rev.ty.into();- t_field_type == field_type- })- .collect::<Vec<_>>()- .pop()- .unwrap()- }-- pub fn get_multi_select_type_option(&self, field_id: &str) -> Vec<SelectOptionPB> {- let field_type = FieldType::MultiSelect;- let field_rev = self.get_field_rev(field_id, field_type.clone());- let type_option = field_rev- .get_type_option::<MultiSelectTypeOptionPB>(field_type.into())- .unwrap();- type_option.options- }-- pub fn get_single_select_type_option(&self, field_id: &str) -> SingleSelectTypeOptionPB {- let field_type = FieldType::SingleSelect;- let field_rev = self.get_field_rev(field_id, field_type.clone());- let type_option = field_rev- .get_type_option::<SingleSelectTypeOptionPB>(field_type.into())- .unwrap();- type_option- }-- pub fn get_checklist_type_option(&self, field_id: &str) -> ChecklistTypeOptionPB {- let field_type = FieldType::Checklist;- let field_rev = self.get_field_rev(field_id, field_type.clone());- let type_option = field_rev- .get_type_option::<ChecklistTypeOptionPB>(field_type.into())- .unwrap();- type_option- }- pub fn get_checkbox_type_option(&self, field_id: &str) -> CheckboxTypeOptionPB {- let field_type = FieldType::Checkbox;- let field_rev = self.get_field_rev(field_id, field_type.clone());- let type_option = field_rev- .get_type_option::<CheckboxTypeOptionPB>(field_type.into())- .unwrap();- type_option- }-- pub fn block_id(&self) -> &str {- &self.block_meta_revs.last().unwrap().block_id- }-- pub async fn update_cell<T: ToCellChangesetString>(- &mut self,- field_id: &str,- row_id: String,- cell_changeset: T,- ) {- let field_rev = self- .field_revs- .iter()- .find(|field_rev| field_rev.id == field_id)- .unwrap();-- self- .editor- .update_cell_with_changeset(&row_id, &field_rev.id, cell_changeset)- .await- .unwrap();- }-- pub(crate) async fn update_text_cell(&mut self, row_id: String, content: &str) {- let field_rev = self- .field_revs- .iter()- .find(|field_rev| {- let field_type: FieldType = field_rev.ty.into();- field_type == FieldType::RichText- })- .unwrap()- .clone();-- self- .update_cell(&field_rev.id, row_id, content.to_string())- .await;- }-- pub(crate) async fn update_single_select_cell(&mut self, row_id: String, option_id: &str) {- let field_rev = self- .field_revs- .iter()- .find(|field_rev| {- let field_type: FieldType = field_rev.ty.into();- field_type == FieldType::SingleSelect- })- .unwrap()- .clone();-- let cell_changeset = SelectOptionCellChangeset::from_insert_option_id(&option_id);- self- .update_cell(&field_rev.id, row_id, cell_changeset)- .await;- }-}--pub const GOOGLE: &str = "Google";-pub const FACEBOOK: &str = "Facebook";-pub const TWITTER: &str = "Twitter";--pub const COMPLETED: &str = "Completed";-pub const PLANNED: &str = "Planned";-pub const PAUSED: &str = "Paused";--pub const FIRST_THING: &str = "Wake up at 6:00 am";-pub const SECOND_THING: &str = "Get some coffee";-pub const THIRD_THING: &str = "Start working";--/// The build-in test data for grid. Currently, there are five rows in this grid, if you want to add-/// more rows or alter the data in this grid. Some tests may fail. So you need to fix the failed tests.-fn make_test_grid() -> BuildDatabaseContext {- let mut grid_builder = DatabaseBuilder::new();- // Iterate through the FieldType to create the corresponding Field.- for field_type in FieldType::iter() {- let field_type: FieldType = field_type;-- // The- match field_type {- FieldType::RichText => {- let text_field = FieldBuilder::new(RichTextTypeOptionBuilder::default())- .name("Name")- .visibility(true)- .primary(true)- .build();- grid_builder.add_field(text_field);- },- FieldType::Number => {- // Number- let number = NumberTypeOptionBuilder::default().set_format(NumberFormat::USD);- let number_field = FieldBuilder::new(number)- .name("Price")- .visibility(true)- .build();- grid_builder.add_field(number_field);- },- FieldType::DateTime => {- // Date- let date = DateTypeOptionBuilder::default()- .date_format(DateFormat::US)- .time_format(TimeFormat::TwentyFourHour);- let date_field = FieldBuilder::new(date)- .name("Time")- .visibility(true)- .build();- grid_builder.add_field(date_field);- },- FieldType::SingleSelect => {- // Single Select- let single_select = SingleSelectTypeOptionBuilder::default()- .add_option(SelectOptionPB::new(COMPLETED))- .add_option(SelectOptionPB::new(PLANNED))- .add_option(SelectOptionPB::new(PAUSED));- let single_select_field = FieldBuilder::new(single_select)- .name("Status")- .visibility(true)- .build();- grid_builder.add_field(single_select_field);- },- FieldType::MultiSelect => {- // MultiSelect- let multi_select = MultiSelectTypeOptionBuilder::default()- .add_option(SelectOptionPB::new(GOOGLE))- .add_option(SelectOptionPB::new(FACEBOOK))- .add_option(SelectOptionPB::new(TWITTER));- let multi_select_field = FieldBuilder::new(multi_select)- .name("Platform")- .visibility(true)- .build();- grid_builder.add_field(multi_select_field);- },- FieldType::Checkbox => {- // Checkbox- let checkbox = CheckboxTypeOptionBuilder::default();- let checkbox_field = FieldBuilder::new(checkbox)- .name("is urgent")- .visibility(true)- .build();- grid_builder.add_field(checkbox_field);- },- FieldType::URL => {- // URL- let url = URLTypeOptionBuilder::default();- let url_field = FieldBuilder::new(url).name("link").visibility(true).build();- grid_builder.add_field(url_field);- },- FieldType::Checklist => {- let checklist = ChecklistTypeOptionBuilder::default()- .add_option(SelectOptionPB::new(FIRST_THING))- .add_option(SelectOptionPB::new(SECOND_THING))- .add_option(SelectOptionPB::new(THIRD_THING));- let checklist_field = FieldBuilder::new(checklist)- .name("TODO")- .visibility(true)- .build();- grid_builder.add_field(checklist_field);- },- }- }-- for i in 0..6 {- let block_id = grid_builder.block_id().to_owned();- let field_revs = grid_builder.field_revs();- let mut row_builder = GridRowTestBuilder::new(&block_id, field_revs);- match i {- 0 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell("A"),- FieldType::Number => row_builder.insert_number_cell("1"),- FieldType::DateTime => row_builder.insert_date_cell("1647251762"),- FieldType::MultiSelect => row_builder- .insert_multi_select_cell(|mut options| vec![options.remove(0), options.remove(0)]),- FieldType::Checklist => row_builder.insert_checklist_cell(|options| options),- FieldType::Checkbox => row_builder.insert_checkbox_cell("true"),- FieldType::URL => {- row_builder.insert_url_cell("AppFlowy website - https://www.appflowy.io")- },- _ => "".to_owned(),- };- }- },- 1 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell(""),- FieldType::Number => row_builder.insert_number_cell("2"),- FieldType::DateTime => row_builder.insert_date_cell("1647251762"),- FieldType::MultiSelect => row_builder- .insert_multi_select_cell(|mut options| vec![options.remove(0), options.remove(1)]),- FieldType::Checkbox => row_builder.insert_checkbox_cell("true"),- _ => "".to_owned(),- };- }- },- 2 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell("C"),- FieldType::Number => row_builder.insert_number_cell("3"),- FieldType::DateTime => row_builder.insert_date_cell("1647251762"),- FieldType::SingleSelect => {- row_builder.insert_single_select_cell(|mut options| options.remove(0))- },- FieldType::MultiSelect => {- row_builder.insert_multi_select_cell(|mut options| vec![options.remove(1)])- },- FieldType::Checkbox => row_builder.insert_checkbox_cell("false"),- _ => "".to_owned(),- };- }- },- 3 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell("DA"),- FieldType::Number => row_builder.insert_number_cell("4"),- FieldType::DateTime => row_builder.insert_date_cell("1668704685"),- FieldType::SingleSelect => {- row_builder.insert_single_select_cell(|mut options| options.remove(0))- },- FieldType::Checkbox => row_builder.insert_checkbox_cell("false"),- _ => "".to_owned(),- };- }- },- 4 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell("AE"),- FieldType::Number => row_builder.insert_number_cell(""),- FieldType::DateTime => row_builder.insert_date_cell("1668359085"),- FieldType::SingleSelect => {- row_builder.insert_single_select_cell(|mut options| options.remove(1))- },-- FieldType::Checkbox => row_builder.insert_checkbox_cell("false"),- _ => "".to_owned(),- };- }- },- 5 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell("AE"),- FieldType::Number => row_builder.insert_number_cell("5"),- FieldType::DateTime => row_builder.insert_date_cell("1671938394"),- FieldType::SingleSelect => {- row_builder.insert_single_select_cell(|mut options| options.remove(1))- },- FieldType::Checkbox => row_builder.insert_checkbox_cell("true"),- _ => "".to_owned(),- };- }- },- _ => {},- }-- let row_rev = row_builder.build();- grid_builder.add_row(row_rev);- }- grid_builder.build()-}--// Kanban board unit test mock data-fn make_test_board() -> BuildDatabaseContext {- let mut grid_builder = DatabaseBuilder::new();- // Iterate through the FieldType to create the corresponding Field.- for field_type in FieldType::iter() {- let field_type: FieldType = field_type;-- // The- match field_type {- FieldType::RichText => {- let text_field = FieldBuilder::new(RichTextTypeOptionBuilder::default())- .name("Name")- .visibility(true)- .primary(true)- .build();- grid_builder.add_field(text_field);- },- FieldType::Number => {- // Number- let number = NumberTypeOptionBuilder::default().set_format(NumberFormat::USD);- let number_field = FieldBuilder::new(number)- .name("Price")- .visibility(true)- .build();- grid_builder.add_field(number_field);- },- FieldType::DateTime => {- // Date- let date = DateTypeOptionBuilder::default()- .date_format(DateFormat::US)- .time_format(TimeFormat::TwentyFourHour);- let date_field = FieldBuilder::new(date)- .name("Time")- .visibility(true)- .build();- grid_builder.add_field(date_field);- },- FieldType::SingleSelect => {- // Single Select- let single_select = SingleSelectTypeOptionBuilder::default()- .add_option(SelectOptionPB::new(COMPLETED))- .add_option(SelectOptionPB::new(PLANNED))- .add_option(SelectOptionPB::new(PAUSED));- let single_select_field = FieldBuilder::new(single_select)- .name("Status")- .visibility(true)- .build();- grid_builder.add_field(single_select_field);- },- FieldType::MultiSelect => {- // MultiSelect- let multi_select = MultiSelectTypeOptionBuilder::default()- .add_option(SelectOptionPB::new(GOOGLE))- .add_option(SelectOptionPB::new(FACEBOOK))- .add_option(SelectOptionPB::new(TWITTER));- let multi_select_field = FieldBuilder::new(multi_select)- .name("Platform")- .visibility(true)- .build();- grid_builder.add_field(multi_select_field);- },- FieldType::Checkbox => {- // Checkbox- let checkbox = CheckboxTypeOptionBuilder::default();- let checkbox_field = FieldBuilder::new(checkbox)- .name("is urgent")- .visibility(true)- .build();- grid_builder.add_field(checkbox_field);- },- FieldType::URL => {- // URL- let url = URLTypeOptionBuilder::default();- let url_field = FieldBuilder::new(url).name("link").visibility(true).build();- grid_builder.add_field(url_field);- },- FieldType::Checklist => {- let checklist = ChecklistTypeOptionBuilder::default()- .add_option(SelectOptionPB::new(FIRST_THING))- .add_option(SelectOptionPB::new(SECOND_THING))- .add_option(SelectOptionPB::new(THIRD_THING));- let checklist_field = FieldBuilder::new(checklist)- .name("TODO")- .visibility(true)- .build();- grid_builder.add_field(checklist_field);- },- }- }-- // We have many assumptions base on the number of the rows, so do not change the number of the loop.- for i in 0..5 {- let block_id = grid_builder.block_id().to_owned();- let field_revs = grid_builder.field_revs();- let mut row_builder = GridRowTestBuilder::new(&block_id, field_revs);- match i {- 0 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell("A"),- FieldType::Number => row_builder.insert_number_cell("1"),- // 1647251762 => Mar 14,2022- FieldType::DateTime => row_builder.insert_date_cell("1647251762"),- FieldType::SingleSelect => {- row_builder.insert_single_select_cell(|mut options| options.remove(0))- },- FieldType::MultiSelect => row_builder- .insert_multi_select_cell(|mut options| vec![options.remove(0), options.remove(0)]),- FieldType::Checkbox => row_builder.insert_checkbox_cell("true"),- FieldType::URL => row_builder.insert_url_cell("https://appflowy.io"),- _ => "".to_owned(),- };- }- },- 1 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell("B"),- FieldType::Number => row_builder.insert_number_cell("2"),- // 1647251762 => Mar 14,2022- FieldType::DateTime => row_builder.insert_date_cell("1647251762"),- FieldType::SingleSelect => {- row_builder.insert_single_select_cell(|mut options| options.remove(0))- },- FieldType::MultiSelect => row_builder- .insert_multi_select_cell(|mut options| vec![options.remove(0), options.remove(0)]),- FieldType::Checkbox => row_builder.insert_checkbox_cell("true"),- _ => "".to_owned(),- };- }- },- 2 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell("C"),- FieldType::Number => row_builder.insert_number_cell("3"),- // 1647251762 => Mar 14,2022- FieldType::DateTime => row_builder.insert_date_cell("1647251762"),- FieldType::SingleSelect => {- row_builder.insert_single_select_cell(|mut options| options.remove(1))- },- FieldType::MultiSelect => {- row_builder.insert_multi_select_cell(|mut options| vec![options.remove(0)])- },- FieldType::Checkbox => row_builder.insert_checkbox_cell("false"),- FieldType::URL => {- row_builder.insert_url_cell("https://github.com/AppFlowy-IO/AppFlowy")- },- _ => "".to_owned(),- };- }- },- 3 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell("DA"),- FieldType::Number => row_builder.insert_number_cell("4"),- FieldType::DateTime => row_builder.insert_date_cell("1668704685"),- FieldType::SingleSelect => {- row_builder.insert_single_select_cell(|mut options| options.remove(1))- },- FieldType::Checkbox => row_builder.insert_checkbox_cell("false"),- FieldType::URL => row_builder.insert_url_cell("https://appflowy.io"),- _ => "".to_owned(),- };- }- },- 4 => {- for field_type in FieldType::iter() {- match field_type {- FieldType::RichText => row_builder.insert_text_cell("AE"),- FieldType::Number => row_builder.insert_number_cell(""),- FieldType::DateTime => row_builder.insert_date_cell("1668359085"),- FieldType::SingleSelect => {- row_builder.insert_single_select_cell(|mut options| options.remove(2))- },-- FieldType::Checkbox => row_builder.insert_checkbox_cell("false"),- _ => "".to_owned(),- };- }- },- _ => {},- }-- let row_rev = row_builder.build();- grid_builder.add_row(row_rev);- }- grid_builder.build()-}--// Calendar unit test mock data-fn make_test_calendar() -> BuildDatabaseContext {- todo!()-}diff --git a/frontend/rust-lib/flowy-database/tests/grid/grid_test.rs b/frontend/rust-lib/flowy-database/tests/grid/grid_test.rsdeleted file mode 100644index 5ece56b54c..0000000000--- a/frontend/rust-lib/flowy-database/tests/grid/grid_test.rs+++ /dev/null@@ -1,418 +0,0 @@-use crate::grid::script::EditorScript::*;-use crate::grid::script::*;-use chrono::NaiveDateTime;-use database_model::entities::{- CellChangeset, FieldChangesetParams, FieldType, GridBlockInfoChangeset, GridBlockMetaSnapshot,- RowMetaChangeset, TypeOptionDataFormat,-};-use flowy_database::services::field::{- DateCellContentChangeset, DateCellData, MultiSelectTypeOptionPB, SelectOption,- SelectOptionCellContentChangeset, SingleSelectTypeOption, SELECTION_IDS_SEPARATOR,-};-use flowy_database::services::row::{- decode_cell_data_from_type_option_cell_data, CreateRowMetaBuilder,-};--#[tokio::test]-async fn grid_create_field() {- let mut test = GridEditorTest::new().await;- let (text_field_params, text_field_meta) = create_text_field(&test.grid_id);- let (single_select_params, single_select_field) = create_single_select_field(&test.grid_id);- let scripts = vec![- CreateField {- params: text_field_params,- },- AssertFieldEqual {- field_index: test.field_count,- field_meta: text_field_meta,- },- ];- test.run_scripts(scripts).await;-- let scripts = vec![- CreateField {- params: single_select_params,- },- AssertFieldEqual {- field_index: test.field_count,- field_meta: single_select_field,- },- ];- test.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_create_duplicate_field() {- let mut test = GridEditorTest::new().await;- let (params, _) = create_text_field(&test.grid_id);- let field_count = test.field_count;- let expected_field_count = field_count + 1;- let scripts = vec![- CreateField {- params: params.clone(),- },- CreateField { params },- AssertFieldCount(expected_field_count),- ];- test.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_update_field_with_empty_change() {- let mut test = GridEditorTest::new().await;- let (params, field_meta) = create_single_select_field(&test.grid_id);- let changeset = FieldChangesetParams {- field_id: field_meta.id.clone(),- grid_id: test.grid_id.clone(),- ..Default::default()- };-- let scripts = vec![- CreateField { params },- UpdateField { changeset },- AssertFieldEqual {- field_index: test.field_count,- field_meta,- },- ];- test.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_update_field() {- let mut test = GridEditorTest::new().await;- let (single_select_params, single_select_field) = create_single_select_field(&test.grid_id);- let mut cloned_field = single_select_field.clone();-- let mut single_select_type_option = SingleSelectTypeOption::from(&single_select_field);- single_select_type_option- .options- .push(SelectOption::new("Unknown"));- let changeset = FieldChangesetParams {- field_id: single_select_field.id.clone(),- grid_id: test.grid_id.clone(),- frozen: Some(true),- width: Some(1000),- type_option_data: Some(single_select_type_option.protobuf_bytes().to_vec()),- ..Default::default()- };-- cloned_field.frozen = true;- cloned_field.width = 1000;- cloned_field.insert_type_option_entry(&single_select_type_option);-- let scripts = vec![- CreateField {- params: single_select_params,- },- UpdateField { changeset },- AssertFieldEqual {- field_index: test.field_count,- field_meta: cloned_field,- },- ];- test.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_delete_field() {- let mut test = GridEditorTest::new().await;- let expected_field_count = test.field_count;- let (text_params, text_field) = create_text_field(&test.grid_id);- let scripts = vec![- CreateField {- params: text_params,- },- DeleteField {- field_meta: text_field,- },- AssertFieldCount(expected_field_count),- ];- test.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_create_block() {- let grid_block = GridBlockMetaSnapshot::new();- let scripts = vec![- AssertBlockCount(1),- CreateBlock { block: grid_block },- AssertBlockCount(2),- ];- GridEditorTest::new().await.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_update_block() {- let grid_block = GridBlockMetaSnapshot::new();- let mut cloned_grid_block = grid_block.clone();- let changeset = GridBlockInfoChangeset {- block_id: grid_block.block_id.clone(),- start_row_index: Some(2),- row_count: Some(10),- };-- cloned_grid_block.start_row_index = 2;- cloned_grid_block.row_count = 10;-- let scripts = vec![- AssertBlockCount(1),- CreateBlock { block: grid_block },- UpdateBlock { changeset },- AssertBlockCount(2),- AssertBlockEqual {- block_index: 1,- block: cloned_grid_block,- },- ];- GridEditorTest::new().await.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_create_row() {- let scripts = vec![- AssertRowCount(3),- CreateEmptyRow,- CreateEmptyRow,- AssertRowCount(5),- ];- GridEditorTest::new().await.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_create_row2() {- let mut test = GridEditorTest::new().await;- let create_row_context = CreateRowMetaBuilder::new(&test.field_metas).build();- let scripts = vec![- AssertRowCount(3),- CreateRow {- context: create_row_context,- },- AssertRowCount(4),- ];- test.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_update_row() {- let mut test = GridEditorTest::new().await;- let context = CreateRowMetaBuilder::new(&test.field_metas).build();- let changeset = RowMetaChangeset {- row_id: context.row_id.clone(),- height: None,- visibility: None,- cell_by_field_id: Default::default(),- };-- let scripts = vec![- AssertRowCount(3),- CreateRow { context },- UpdateRow {- changeset: changeset.clone(),- },- AssertRow { changeset },- AssertRowCount(4),- ];- test.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_delete_row() {- let mut test = GridEditorTest::new().await;- let context_1 = CreateRowMetaBuilder::new(&test.field_metas).build();- let context_2 = CreateRowMetaBuilder::new(&test.field_metas).build();- let row_ids = vec![context_1.row_id.clone(), context_2.row_id.clone()];- let scripts = vec![- AssertRowCount(3),- CreateRow { context: context_1 },- CreateRow { context: context_2 },- AssertBlockCount(1),- AssertBlock {- block_index: 0,- row_count: 5,- start_row_index: 0,- },- DeleteRow { row_ids },- AssertBlock {- block_index: 0,- row_count: 3,- start_row_index: 0,- },- ];- test.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_row_add_cells_test() {- let mut test = GridEditorTest::new().await;- let mut builder = CreateRowMetaBuilder::new(&test.field_metas);- for field in &test.field_metas {- match field.field_type {- FieldType::RichText => {- builder- .add_cell(&field.id, "hello world".to_owned())- .unwrap();- },- FieldType::Number => {- builder.add_cell(&field.id, "18,443".to_owned()).unwrap();- },- FieldType::DateTime => {- builder- .add_cell(&field.id, make_date_cell_string("1647251762"))- .unwrap();- },- FieldType::SingleSelect => {- let type_option = SingleSelectTypeOption::from(field);- let option = type_option.options.first().unwrap();- builder- .add_select_option_cell(&field.id, option.id.clone())- .unwrap();- },- FieldType::MultiSelect => {- let type_option = MultiSelectTypeOptionPB::from(field);- let ops_ids = type_option- .options- .iter()- .map(|option| option.id.clone())- .collect::<Vec<_>>()- .join(SELECTION_IDS_SEPARATOR);- builder.add_select_option_cell(&field.id, ops_ids).unwrap();- },- FieldType::Checkbox => {- builder.add_cell(&field.id, "false".to_string()).unwrap();- },- FieldType::URL => {- builder.add_cell(&field.id, "1".to_string()).unwrap();- },- }- }- let context = builder.build();- let scripts = vec![CreateRow { context }, AssertGridMetaPad];- test.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_row_add_date_cell_test() {- let mut test = GridEditorTest::new().await;- let mut builder = CreateRowMetaBuilder::new(&test.field_metas);- let mut date_field = None;- let timestamp = 1647390674;- for field in &test.field_metas {- if field.field_type == FieldType::DateTime {- date_field = Some(field.clone());- NaiveDateTime::from_timestamp(123, 0);- // The data should not be empty- assert!(builder.add_cell(&field.id, "".to_string()).is_err());- assert!(builder- .add_cell(&field.id, make_date_cell_string("123"))- .is_ok());- assert!(builder- .add_cell(&field.id, make_date_cell_string(×tamp.to_string()))- .is_ok());- }- }- let context = builder.build();- let date_field = date_field.unwrap();- let cell_data = context- .cell_by_field_id- .get(&date_field.id)- .unwrap()- .clone();- assert_eq!(- decode_cell_data_from_type_option_cell_data(- cell_data.data.clone(),- &date_field,- &date_field.field_type- )- .parse::<DateCellData>()- .unwrap()- .date,- "2022/03/16",- );- let scripts = vec![CreateRow { context }];- test.run_scripts(scripts).await;-}--#[tokio::test]-async fn grid_cell_update() {- let mut test = GridEditorTest::new().await;- let field_metas = &test.field_metas;- let row_metas = &test.row_metas;- let grid_blocks = &test.grid_blocks;- assert_eq!(row_metas.len(), 3);- assert_eq!(grid_blocks.len(), 1);-- let block_id = &grid_blocks.first().unwrap().block_id;- let mut scripts = vec![];- for (index, row_meta) in row_metas.iter().enumerate() {- for field_meta in field_metas {- if index == 0 {- let data = match field_meta.field_type {- FieldType::RichText => "".to_string(),- FieldType::Number => "123".to_string(),- FieldType::DateTime => make_date_cell_string("123"),- FieldType::SingleSelect => {- let type_option = SingleSelectTypeOption::from(field_meta);- SelectOptionCellContentChangeset::from_insert(&type_option.options.first().unwrap().id)- .to_str()- },- FieldType::MultiSelect => {- let type_option = MultiSelectTypeOptionPB::from(field_meta);- SelectOptionCellContentChangeset::from_insert(&type_option.options.first().unwrap().id)- .to_str()- },- FieldType::Checkbox => "1".to_string(),- FieldType::URL => "1".to_string(),- };-- scripts.push(UpdateCell {- changeset: CellChangeset {- database_id: block_id.to_string(),- row_id: row_meta.id.clone(),- field_id: field_meta.id.clone(),- cell_content_changeset: Some(data),- },- is_err: false,- });- }-- if index == 1 {- let (data, is_err) = match field_meta.field_type {- FieldType::RichText => ("1".to_string().repeat(10001), true),- FieldType::Number => ("abc".to_string(), true),- FieldType::DateTime => ("abc".to_string(), true),- FieldType::SingleSelect => (- SelectOptionCellContentChangeset::from_insert("abc").to_str(),- false,- ),- FieldType::MultiSelect => (- SelectOptionCellContentChangeset::from_insert("abc").to_str(),- false,- ),- FieldType::Checkbox => ("2".to_string(), false),- FieldType::URL => ("2".to_string(), false),- };-- scripts.push(UpdateCell {- changeset: CellChangeset {- database_id: block_id.to_string(),- row_id: row_meta.id.clone(),- field_id: field_meta.id.clone(),- cell_content_changeset: Some(data),- },- is_err,- });- }- }- }-- test.run_scripts(scripts).await;-}--fn make_date_cell_string(s: &str) -> String {- serde_json::to_string(&DateCellContentChangeset {- date: Some(s.to_string()),- time: None,- })- .unwrap()-}diff --git a/frontend/rust-lib/flowy-database/tests/main.rs b/frontend/rust-lib/flowy-database/tests/main.rsindex ec055c3bb9..3a9960ec68 100644--- a/frontend/rust-lib/flowy-database/tests/main.rs+++ b/frontend/rust-lib/flowy-database/tests/main.rs@@ -1 +1 @@-mod grid;+mod database;diff --git a/frontend/rust-lib/flowy-document/src/editor/mod.rs b/frontend/rust-lib/flowy-document/src/editor/mod.rsindex 1136d017eb..3966c89e84 100644--- a/frontend/rust-lib/flowy-document/src/editor/mod.rs+++ b/frontend/rust-lib/flowy-document/src/editor/mod.rs@@ -12,5 +12,5 @@ pub use editor::*;// Return the read me document contentpub fn initial_read_me() -> String {let document_content = include_str!("READ_ME.json");- return document_content.to_string();+ document_content.to_string()}diff --git a/frontend/rust-lib/flowy-document/src/event_handler.rs b/frontend/rust-lib/flowy-document/src/event_handler.rsindex cdc63b399a..5011ebd9fd 100644--- a/frontend/rust-lib/flowy-document/src/event_handler.rs+++ b/frontend/rust-lib/flowy-document/src/event_handler.rs@@ -5,7 +5,7 @@ use crate::entities::{use crate::DocumentManager;use flowy_error::FlowyError;-use lib_dispatch::prelude::{data_result, AFPluginData, AFPluginState, DataResult};+use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};use std::convert::TryInto;use std::sync::Arc;@@ -16,7 +16,7 @@ pub(crate) async fn get_document_handler(let context: OpenDocumentPayloadPB = data.into_inner();let editor = manager.open_document_editor(&context.document_id).await?;let document_data = editor.export().await?;- data_result(DocumentDataPB {+ data_result_ok(DocumentDataPB {doc_id: context.document_id,content: document_data,})@@ -39,7 +39,7 @@ pub(crate) async fn export_handler(let params: ExportParams = data.into_inner().try_into()?;let editor = manager.open_document_editor(¶ms.view_id).await?;let document_data = editor.export().await?;- data_result(ExportDataPB {+ data_result_ok(ExportDataPB {data: document_data,export_type: params.export_type,})diff --git a/frontend/rust-lib/flowy-document/tests/main.rs b/frontend/rust-lib/flowy-document/tests/main.rsindex 49f15af608..085249c63f 100644--- a/frontend/rust-lib/flowy-document/tests/main.rs+++ b/frontend/rust-lib/flowy-document/tests/main.rs@@ -1,3 +1,3 @@mod editor;mod new_document;-mod old_document;+// mod old_document;diff --git a/frontend/rust-lib/flowy-error/src/code.rs b/frontend/rust-lib/flowy-error/src/code.rsindex 5e7523b2f7..dd82d4bdfc 100644--- a/frontend/rust-lib/flowy-error/src/code.rs+++ b/frontend/rust-lib/flowy-error/src/code.rs@@ -45,7 +45,7 @@ pub enum ErrorCode {ViewThumbnailInvalid = 13,#[error("View id can not be empty or whitespace")]- ViewIdInvalid = 14,+ ViewIdIsInvalid = 14,#[error("View desc too long")]ViewDescTooLong = 15,diff --git a/frontend/rust-lib/flowy-error/src/errors.rs b/frontend/rust-lib/flowy-error/src/errors.rsindex 6425d03ab5..be02520fe5 100644--- a/frontend/rust-lib/flowy-error/src/errors.rs+++ b/frontend/rust-lib/flowy-error/src/errors.rs@@ -51,7 +51,7 @@ impl FlowyError {static_flowy_error!(invalid_app_id, ErrorCode::AppIdInvalid);static_flowy_error!(view_name, ErrorCode::ViewNameInvalid);static_flowy_error!(view_thumbnail, ErrorCode::ViewThumbnailInvalid);- static_flowy_error!(invalid_view_id, ErrorCode::ViewIdInvalid);+ static_flowy_error!(invalid_view_id, ErrorCode::ViewIdIsInvalid);static_flowy_error!(view_desc, ErrorCode::ViewDescTooLong);static_flowy_error!(view_data, ErrorCode::ViewDataInvalid);static_flowy_error!(unauthorized, ErrorCode::UserUnauthorized);diff --git a/frontend/rust-lib/flowy-folder/src/entities/parser/view/view_id.rs b/frontend/rust-lib/flowy-folder/src/entities/parser/view/view_id.rsindex 6397e6c3a4..83ead5b00b 100644--- a/frontend/rust-lib/flowy-folder/src/entities/parser/view/view_id.rs+++ b/frontend/rust-lib/flowy-folder/src/entities/parser/view/view_id.rs@@ -6,7 +6,7 @@ pub struct ViewIdentify(pub String);impl ViewIdentify {pub fn parse(s: String) -> Result<ViewIdentify, ErrorCode> {if s.trim().is_empty() {- return Err(ErrorCode::ViewIdInvalid);+ return Err(ErrorCode::ViewIdIsInvalid);}Ok(Self(s))diff --git a/frontend/rust-lib/flowy-folder/src/entities/view.rs b/frontend/rust-lib/flowy-folder/src/entities/view.rsindex 7f0752244d..57560ddbd2 100644--- a/frontend/rust-lib/flowy-folder/src/entities/view.rs+++ b/frontend/rust-lib/flowy-folder/src/entities/view.rs@@ -8,6 +8,7 @@ use crate::{};use flowy_derive::{ProtoBuf, ProtoBuf_Enum};use folder_model::{gen_view_id, ViewDataFormatRevision, ViewLayoutTypeRevision, ViewRevision};+use std::collections::HashMap;use std::convert::TryInto;#[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)]@@ -159,13 +160,13 @@ pub struct CreateViewPayloadPB {pub thumbnail: Option<String>,#[pb(index = 5)]- pub data_format: ViewDataFormatPB,+ pub layout: ViewLayoutTypePB,#[pb(index = 6)]- pub layout: ViewLayoutTypePB,+ pub initial_data: Vec<u8>,#[pb(index = 7)]- pub initial_data: Vec<u8>,+ pub ext: HashMap<String, String>,}#[derive(Debug, Clone)]@@ -178,6 +179,7 @@ pub struct CreateViewParams {pub layout: ViewLayoutTypePB,pub view_id: String,pub initial_data: Vec<u8>,+ pub ext: HashMap<String, String>,}impl TryInto<CreateViewParams> for CreateViewPayloadPB {@@ -191,20 +193,31 @@ impl TryInto<CreateViewParams> for CreateViewPayloadPB {None => "".to_string(),Some(thumbnail) => ViewThumbnail::parse(thumbnail)?.0,};+ let data_format = data_format_from_layout(&self.layout);Ok(CreateViewParams {belong_to_id,name,desc: self.desc,- data_format: self.data_format,+ data_format,layout: self.layout,thumbnail,view_id,initial_data: self.initial_data,+ ext: self.ext,})}}+pub fn data_format_from_layout(layout: &ViewLayoutTypePB) -> ViewDataFormatPB {+ match layout {+ ViewLayoutTypePB::Document => ViewDataFormatPB::NodeFormat,+ ViewLayoutTypePB::Grid => ViewDataFormatPB::DatabaseFormat,+ ViewLayoutTypePB::Board => ViewDataFormatPB::DatabaseFormat,+ ViewLayoutTypePB::Calendar => ViewDataFormatPB::DatabaseFormat,+ }+}+#[derive(Default, ProtoBuf, Clone, Debug)]pub struct ViewIdPB {#[pb(index = 1)]diff --git a/frontend/rust-lib/flowy-folder/src/lib.rs b/frontend/rust-lib/flowy-folder/src/lib.rsindex 9fa68c3360..105c0583ee 100644--- a/frontend/rust-lib/flowy-folder/src/lib.rs+++ b/frontend/rust-lib/flowy-folder/src/lib.rs@@ -13,6 +13,9 @@ mod notification;pub mod protobuf;mod util;+#[cfg(feature = "flowy_unit_test")]+pub mod test_helper;+pub mod prelude {pub use crate::{errors::*, event_map::*};}diff --git a/frontend/rust-lib/flowy-folder/src/manager.rs b/frontend/rust-lib/flowy-folder/src/manager.rsindex 84307d927e..76e5a6277a 100644--- a/frontend/rust-lib/flowy-folder/src/manager.rs+++ b/frontend/rust-lib/flowy-folder/src/manager.rs@@ -70,7 +70,7 @@ pub struct FolderManager {pub(crate) view_controller: Arc<ViewController>,pub(crate) trash_controller: Arc<TrashController>,web_socket: Arc<dyn RevisionWebSocket>,- folder_editor: Arc<TokioRwLock<Option<Arc<FolderEditor>>>>,+ pub(crate) folder_editor: Arc<TokioRwLock<Option<Arc<FolderEditor>>>>,}impl FolderManager {@@ -181,7 +181,8 @@ impl FolderManager {let rev_persistence = RevisionPersistence::new(user_id, object_id, disk_cache, configuration);let rev_compactor = FolderRevisionMergeable();- let snapshot_object_id = format!("folder:{}", object_id);+ const FOLDER_SP_PREFIX: &str = "folder";+ let snapshot_object_id = format!("{}:{}", FOLDER_SP_PREFIX, object_id);let snapshot_persistence =SQLiteFolderRevisionSnapshotPersistence::new(&snapshot_object_id, pool);let rev_manager = RevisionManager::new(@@ -257,7 +258,7 @@ impl DefaultFolderBuilder {let _ = view_controller.set_latest_view(&view.id);let layout_type = ViewLayoutTypePB::from(view.layout.clone());view_controller- .create_view(&view.id, view_data_type, layout_type, view_data)+ .create_view(&view.id, &view.name, view_data_type, layout_type, view_data).await?;}}@@ -275,41 +276,38 @@ impl DefaultFolderBuilder {}}-#[cfg(feature = "flowy_unit_test")]-impl FolderManager {- pub async fn folder_editor(&self) -> Arc<FolderEditor> {- self.folder_editor.read().await.clone().unwrap()- }-}-pub trait ViewDataProcessor {- fn create_view(- &self,- user_id: &str,- view_id: &str,- layout: ViewLayoutTypePB,- view_data: Bytes,- ) -> FutureResult<(), FlowyError>;-+ /// Closes the view and releases the resources that this view has in+ /// the backendfn close_view(&self, view_id: &str) -> FutureResult<(), FlowyError>;+ /// Gets the data of the this view.+ /// For example, the data can be used to duplicate the view.fn get_view_data(&self, view: &ViewPB) -> FutureResult<Bytes, FlowyError>;- fn create_default_view(+ /// Create a view with the pre-defined data.+ /// For example, the initial data of the grid/calendar/kanban board when+ /// you create a new view.+ fn create_view_with_build_in_data(&self,user_id: &str,view_id: &str,+ name: &str,layout: ViewLayoutTypePB,data_format: ViewDataFormatPB,- ) -> FutureResult<Bytes, FlowyError>;+ ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError>;- fn create_view_with_data(+ /// Create a view with custom data+ fn create_view_with_custom_data(&self,user_id: &str,view_id: &str,+ name: &str,data: Vec<u8>,layout: ViewLayoutTypePB,- ) -> FutureResult<Bytes, FlowyError>;+ ext: HashMap<String, String>,+ ) -> FutureResult<(), FlowyError>;fn data_types(&self) -> Vec<ViewDataFormatPB>;}diff --git a/frontend/rust-lib/flowy-folder/src/services/app/event_handler.rs b/frontend/rust-lib/flowy-folder/src/services/app/event_handler.rsindex 09f88923bf..02bb796998 100644--- a/frontend/rust-lib/flowy-folder/src/services/app/event_handler.rs+++ b/frontend/rust-lib/flowy-folder/src/services/app/event_handler.rs@@ -6,7 +6,7 @@ use crate::{services::{AppController, TrashController, ViewController},};use folder_model::TrashRevision;-use lib_dispatch::prelude::{data_result, AFPluginData, AFPluginState, DataResult};+use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};use std::{convert::TryInto, sync::Arc};pub(crate) async fn create_app_handler(@@ -16,7 +16,7 @@ pub(crate) async fn create_app_handler(let params: CreateAppParams = data.into_inner().try_into()?;let detail = controller.create_app_from_params(params).await?;- data_result(detail)+ data_result_ok(detail)}pub(crate) async fn delete_app_handler(@@ -55,7 +55,7 @@ pub(crate) async fn read_app_handler(let params: AppIdPB = data.into_inner();if let Some(mut app_rev) = app_controller.read_app(params.clone()).await? {app_rev.belongings = view_controller.read_views_belong_to(¶ms.value).await?;- data_result(app_rev.into())+ data_result_ok(app_rev.into())} else {Err(FlowyError::record_not_found())}diff --git a/frontend/rust-lib/flowy-folder/src/services/trash/event_handler.rs b/frontend/rust-lib/flowy-folder/src/services/trash/event_handler.rsindex 28777da438..3e829928c0 100644--- a/frontend/rust-lib/flowy-folder/src/services/trash/event_handler.rs+++ b/frontend/rust-lib/flowy-folder/src/services/trash/event_handler.rs@@ -3,7 +3,7 @@ use crate::{errors::FlowyError,services::TrashController,};-use lib_dispatch::prelude::{data_result, AFPluginData, AFPluginState, DataResult};+use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};use std::sync::Arc;#[tracing::instrument(level = "debug", skip(controller), err)]@@ -11,7 +11,7 @@ pub(crate) async fn read_trash_handler(controller: AFPluginState<Arc<TrashController>>,) -> DataResult<RepeatedTrashPB, FlowyError> {let repeated_trash = controller.read_trash().await?;- data_result(repeated_trash)+ data_result_ok(repeated_trash)}#[tracing::instrument(level = "debug", skip(identifier, controller), err)]diff --git a/frontend/rust-lib/flowy-folder/src/services/view/controller.rs b/frontend/rust-lib/flowy-folder/src/services/view/controller.rsindex ab3d244180..2db75a1985 100644--- a/frontend/rust-lib/flowy-folder/src/services/view/controller.rs+++ b/frontend/rust-lib/flowy-folder/src/services/view/controller.rs@@ -18,11 +18,13 @@ use bytes::Bytes;use flowy_sqlite::kv::KV;use folder_model::{gen_view_id, ViewRevision};use futures::{FutureExt, StreamExt};+use lib_infra::util::timestamp;+use std::collections::HashMap;use std::{collections::HashSet, sync::Arc};const LATEST_VIEW_ID: &str = "latest_view_id";-pub(crate) struct ViewController {+pub struct ViewController {user: Arc<dyn WorkspaceUser>,cloud_service: Arc<dyn FolderCouldServiceV1>,persistence: Arc<FolderPersistence>,@@ -55,43 +57,61 @@ impl ViewController {#[tracing::instrument(level = "trace", skip(self, params), fields(name = %params.name), err)]pub(crate) async fn create_view_from_params(&self,- mut params: CreateViewParams,+ params: CreateViewParams,) -> Result<ViewRevision, FlowyError> {let processor = self.get_data_processor(params.data_format.clone())?;let user_id = self.user.user_id()?;- if params.initial_data.is_empty() {- tracing::trace!("Create view with build-in data");- let view_data = processor- .create_default_view(- &user_id,- ¶ms.view_id,- params.layout.clone(),- params.data_format.clone(),- )- .await?;- params.initial_data = view_data.to_vec();- } else {- tracing::trace!("Create view with view data");- let view_data = processor- .create_view_with_data(- &user_id,- ¶ms.view_id,- params.initial_data.clone(),- params.layout.clone(),- )- .await?;- self- .create_view(- ¶ms.view_id,- params.data_format.clone(),- params.layout.clone(),- view_data,- )- .await?;- };+ match params.initial_data.is_empty() {+ true => {+ tracing::trace!("Create view with build-in data");+ processor+ .create_view_with_build_in_data(+ &user_id,+ ¶ms.view_id,+ ¶ms.name,+ params.layout.clone(),+ params.data_format.clone(),+ params.ext.clone(),+ )+ .await?;+ },+ false => {+ tracing::trace!("Create view with view data");+ processor+ .create_view_with_custom_data(+ &user_id,+ ¶ms.view_id,+ ¶ms.name,+ params.initial_data.clone(),+ params.layout.clone(),+ params.ext.clone(),+ )+ .await?;+ },+ }++ let trash_controller = self.trash_controller.clone();+ let view_rev = self+ .persistence+ .begin_transaction(|transaction| {+ let time = timestamp();+ let view_rev = ViewRevision::new(+ params.view_id,+ params.belong_to_id,+ params.name,+ params.desc,+ params.data_format.into(),+ params.layout.into(),+ time,+ time,+ );+ let belong_to_id = view_rev.app_id.clone();+ transaction.create_view(view_rev.clone())?;+ notify_views_changed(&belong_to_id, trash_controller, &transaction)?;+ Ok(view_rev)+ })+ .await?;- let view_rev = self.create_view_on_server(params).await?;- self.create_view_on_local(view_rev.clone()).await?;Ok(view_rev)}@@ -99,6 +119,7 @@ impl ViewController {pub(crate) async fn create_view(&self,view_id: &str,+ name: &str,data_type: ViewDataFormatPB,layout_type: ViewLayoutTypePB,view_data: Bytes,@@ -109,27 +130,18 @@ impl ViewController {let user_id = self.user.user_id()?;let processor = self.get_data_processor(data_type)?;processor- .create_view(&user_id, view_id, layout_type, view_data)+ .create_view_with_custom_data(+ &user_id,+ view_id,+ name,+ view_data.to_vec(),+ layout_type,+ HashMap::default(),+ ).await?;Ok(())}- pub(crate) async fn create_view_on_local(- &self,- view_rev: ViewRevision,- ) -> Result<(), FlowyError> {- let trash_controller = self.trash_controller.clone();- self- .persistence- .begin_transaction(|transaction| {- let belong_to_id = view_rev.app_id.clone();- transaction.create_view(view_rev)?;- notify_views_changed(&belong_to_id, trash_controller, &transaction)?;- Ok(())- })- .await- }-#[tracing::instrument(level = "debug", skip(self, view_id), err)]pub(crate) async fn read_view(&self, view_id: &str) -> Result<ViewRevision, FlowyError> {let view_rev = self@@ -252,6 +264,7 @@ impl ViewController {layout: view_rev.layout.into(),initial_data: view_data.to_vec(),view_id: gen_view_id(),+ ext: Default::default(),};let _ = self.create_view_from_params(duplicate_params).await?;@@ -316,16 +329,6 @@ impl ViewController {}impl ViewController {- #[tracing::instrument(level = "debug", skip(self, params), err)]- async fn create_view_on_server(- &self,- params: CreateViewParams,- ) -> Result<ViewRevision, FlowyError> {- let token = self.user.token()?;- let view_rev = self.cloud_service.create_view(&token, params).await?;- Ok(view_rev)- }-#[tracing::instrument(level = "debug", skip(self), err)]fn update_view_on_server(&self, params: UpdateViewParams) -> Result<(), FlowyError> {let token = self.user.token()?;diff --git a/frontend/rust-lib/flowy-folder/src/services/view/event_handler.rs b/frontend/rust-lib/flowy-folder/src/services/view/event_handler.rsindex dc7f8843b8..1152275745 100644--- a/frontend/rust-lib/flowy-folder/src/services/view/event_handler.rs+++ b/frontend/rust-lib/flowy-folder/src/services/view/event_handler.rs@@ -13,7 +13,7 @@ use crate::{services::{TrashController, ViewController},};use folder_model::TrashRevision;-use lib_dispatch::prelude::{data_result, AFPluginData, AFPluginState, DataResult};+use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};use std::{convert::TryInto, sync::Arc};pub(crate) async fn create_view_handler(@@ -22,7 +22,7 @@ pub(crate) async fn create_view_handler() -> DataResult<ViewPB, FlowyError> {let params: CreateViewParams = data.into_inner().try_into()?;let view_rev = controller.create_view_from_params(params).await?;- data_result(view_rev.into())+ data_result_ok(view_rev.into())}pub(crate) async fn read_view_handler(@@ -31,7 +31,7 @@ pub(crate) async fn read_view_handler() -> DataResult<ViewPB, FlowyError> {let view_id: ViewIdPB = data.into_inner();let view_rev = controller.read_view(&view_id.value).await?;- data_result(view_rev.into())+ data_result_ok(view_rev.into())}#[tracing::instrument(level = "debug", skip(data, controller), err)]diff --git a/frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs b/frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rsindex 6bfbd224c4..d15f86b1be 100644--- a/frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs+++ b/frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs@@ -8,7 +8,7 @@ use crate::{manager::FolderManager,services::{get_current_workspace, read_workspace_apps, WorkspaceController},};-use lib_dispatch::prelude::{data_result, AFPluginData, AFPluginState, DataResult};+use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};use std::{convert::TryInto, sync::Arc};#[tracing::instrument(level = "debug", skip(data, controller), err)]@@ -19,7 +19,7 @@ pub(crate) async fn create_workspace_handler(let controller = controller.get_ref().clone();let params: CreateWorkspaceParams = data.into_inner().try_into()?;let workspace_rev = controller.create_workspace_from_params(params).await?;- data_result(workspace_rev.into())+ data_result_ok(workspace_rev.into())}#[tracing::instrument(level = "debug", skip(controller), err)]@@ -33,7 +33,7 @@ pub(crate) async fn read_workspace_apps_handler(.map(|app_rev| app_rev.into()).collect();let repeated_app = RepeatedAppPB { items };- data_result(repeated_app)+ data_result_ok(repeated_app)}#[tracing::instrument(level = "debug", skip(data, controller), err)]@@ -43,7 +43,7 @@ pub(crate) async fn open_workspace_handler() -> DataResult<WorkspacePB, FlowyError> {let params: WorkspaceIdPB = data.into_inner();let workspaces = controller.open_workspace(params).await?;- data_result(workspaces)+ data_result_ok(workspaces)}#[tracing::instrument(level = "debug", skip(data, folder), err)]@@ -71,7 +71,7 @@ pub(crate) async fn read_workspaces_handler(Ok(workspaces)}).await?;- data_result(workspaces)+ data_result_ok(workspaces)}#[tracing::instrument(level = "debug", skip(folder), err)]@@ -99,5 +99,5 @@ pub async fn read_cur_workspace_handler(workspace,latest_view,};- data_result(setting)+ data_result_ok(setting)}diff --git a/frontend/rust-lib/flowy-folder/src/test_helper.rs b/frontend/rust-lib/flowy-folder/src/test_helper.rsnew file mode 100644index 0000000000..5b9970ef3e--- /dev/null+++ b/frontend/rust-lib/flowy-folder/src/test_helper.rs@@ -0,0 +1,63 @@+use crate::entities::{data_format_from_layout, CreateViewParams, ViewLayoutTypePB};+use crate::manager::FolderManager;+use crate::services::folder_editor::FolderEditor;+use folder_model::gen_view_id;+use std::collections::HashMap;+use std::sync::Arc;++#[cfg(feature = "flowy_unit_test")]+impl FolderManager {+ pub async fn folder_editor(&self) -> Arc<FolderEditor> {+ self.folder_editor.read().await.clone().unwrap()+ }++ pub async fn create_test_grid_view(+ &self,+ app_id: &str,+ name: &str,+ ext: HashMap<String, String>,+ ) -> String {+ self+ .create_test_view(app_id, name, ViewLayoutTypePB::Grid, ext)+ .await+ }++ pub async fn create_test_board_view(+ &self,+ app_id: &str,+ name: &str,+ ext: HashMap<String, String>,+ ) -> String {+ self+ .create_test_view(app_id, name, ViewLayoutTypePB::Board, ext)+ .await+ }++ async fn create_test_view(+ &self,+ app_id: &str,+ name: &str,+ layout: ViewLayoutTypePB,+ ext: HashMap<String, String>,+ ) -> String {+ let view_id = gen_view_id();+ let data_format = data_format_from_layout(&layout);+ let params = CreateViewParams {+ belong_to_id: app_id.to_string(),+ name: name.to_string(),+ desc: "".to_string(),+ thumbnail: "".to_string(),+ data_format,+ layout,+ view_id: view_id.clone(),+ initial_data: vec![],+ ext,+ };+ self+ .view_controller+ .create_view_from_params(params)+ .await+ .unwrap();+ view_id+ }+}diff --git a/frontend/rust-lib/flowy-folder/tests/workspace/script.rs b/frontend/rust-lib/flowy-folder/tests/workspace/script.rsindex 638c2d5516..d7067cd21a 100644--- a/frontend/rust-lib/flowy-folder/tests/workspace/script.rs+++ b/frontend/rust-lib/flowy-folder/tests/workspace/script.rs@@ -98,7 +98,6 @@ impl FolderTest {&app.id,"Folder View","Folder test view",- ViewDataFormatPB::DeltaFormat,ViewLayoutTypePB::Document,).await;@@ -189,7 +188,7 @@ impl FolderTest {ViewDataFormatPB::NodeFormat => ViewLayoutTypePB::Document,ViewDataFormatPB::DatabaseFormat => ViewLayoutTypePB::Grid,};- let view = create_view(sdk, &self.app.id, &name, &desc, data_type, layout).await;+ let view = create_view(sdk, &self.app.id, &name, &desc, layout).await;self.view = view;},FolderScript::AssertView(view) => {@@ -372,7 +371,6 @@ pub async fn create_view(app_id: &str,name: &str,desc: &str,- data_type: ViewDataFormatPB,layout: ViewLayoutTypePB,) -> ViewPB {let request = CreateViewPayloadPB {@@ -380,9 +378,9 @@ pub async fn create_view(name: name.to_string(),desc: desc.to_string(),thumbnail: None,- data_format: data_type,layout,initial_data: vec![],+ ext: Default::default(),};FolderEventBuilder::new(sdk.clone()).event(CreateView)diff --git a/frontend/rust-lib/flowy-revision/src/rev_manager.rs b/frontend/rust-lib/flowy-revision/src/rev_manager.rsindex fbde49273b..71f1a452bf 100644--- a/frontend/rust-lib/flowy-revision/src/rev_manager.rs+++ b/frontend/rust-lib/flowy-revision/src/rev_manager.rs@@ -1,4 +1,4 @@-use crate::rev_queue::{RevCommand, RevCommandSender, RevQueue};+use crate::rev_queue::{RevCommandSender, RevisionCommand, RevisionQueue};use crate::{RevisionPersistence, RevisionSnapshotController, RevisionSnapshotData,RevisionSnapshotPersistence, WSDataProviderDataSource,@@ -111,7 +111,7 @@ impl<Connection: 'static> RevisionManager<Connection> {rev_compress.clone(),);let (rev_queue, receiver) = mpsc::channel(1000);- let queue = RevQueue::new(+ let queue = RevisionQueue::new(object_id.to_owned(),rev_id_counter.clone(),rev_persistence.clone(),@@ -261,7 +261,7 @@ impl<Connection: 'static> RevisionManager<Connection> {let (ret, rx) = oneshot::channel();self.rev_queue- .send(RevCommand::RevisionData {+ .send(RevisionCommand::RevisionData {data,object_md5,ret,diff --git a/frontend/rust-lib/flowy-revision/src/rev_queue.rs b/frontend/rust-lib/flowy-revision/src/rev_queue.rsindex f430e9aabb..fc235432cf 100644--- a/frontend/rust-lib/flowy-revision/src/rev_queue.rs+++ b/frontend/rust-lib/flowy-revision/src/rev_queue.rs@@ -9,7 +9,7 @@ use tokio::sync::mpsc::{Receiver, Sender};use tokio::sync::oneshot;#[derive(Debug)]-pub(crate) enum RevCommand {+pub(crate) enum RevisionCommand {RevisionData {data: Bytes,object_md5: String,@@ -17,7 +17,8 @@ pub(crate) enum RevCommand {},}-pub(crate) struct RevQueue<Connection> {+/// [RevisionQueue] is used to keep the [RevisionCommand] processing in order.+pub(crate) struct RevisionQueue<Connection> {object_id: String,rev_id_counter: Arc<RevIdCounter>,rev_persistence: Arc<RevisionPersistence<Connection>>,@@ -25,7 +26,7 @@ pub(crate) struct RevQueue<Connection> {receiver: Option<RevCommandReceiver>,}-impl<Connection> RevQueue<Connection>+impl<Connection> RevisionQueue<Connection>whereConnection: 'static,{@@ -69,9 +70,9 @@ where.await;}- async fn handle_command(&self, command: RevCommand) -> Result<(), FlowyError> {+ async fn handle_command(&self, command: RevisionCommand) -> Result<(), FlowyError> {match command {- RevCommand::RevisionData {+ RevisionCommand::RevisionData {data,object_md5: data_md5,ret,@@ -93,6 +94,6 @@ where}}-pub(crate) type RevCommandSender = Sender<RevCommand>;-pub(crate) type RevCommandReceiver = Receiver<RevCommand>;+pub(crate) type RevCommandSender = Sender<RevisionCommand>;+pub(crate) type RevCommandReceiver = Receiver<RevisionCommand>;pub(crate) type Ret<T> = oneshot::Sender<Result<T, FlowyError>>;diff --git a/frontend/rust-lib/flowy-revision/tests/revision_test/local_revision_test.rs b/frontend/rust-lib/flowy-revision/tests/revision_test/local_revision_test.rsindex 7bda4525dd..64b44af4f5 100644--- a/frontend/rust-lib/flowy-revision/tests/revision_test/local_revision_test.rs+++ b/frontend/rust-lib/flowy-revision/tests/revision_test/local_revision_test.rs@@ -235,21 +235,21 @@ async fn revision_merge_per_100_revision_test2() {.await;}-#[tokio::test]-async fn revision_merge_per_1000_revision_test() {- let test = RevisionTest::new_with_configuration(1000).await;- for i in 0..100000 {- test- .run_script(AddLocalRevision {- content: format!("{}", i),- })- .await;- }-- test- .run_scripts(vec![AssertNumberOfSyncRevisions { num: 100 }])- .await;-}+// #[tokio::test]+// async fn revision_merge_per_1000_revision_test() {+// let test = RevisionTest::new_with_configuration(1000).await;+// for i in 0..100000 {+// test+// .run_script(AddLocalRevision {+// content: format!("{}", i),+// })+// .await;+// }+//+// test+// .run_scripts(vec![AssertNumberOfSyncRevisions { num: 100 }])+// .await;+// }#[tokio::test]async fn revision_compress_revision_test() {diff --git a/frontend/rust-lib/flowy-sqlite/migrations/2023-02-25-022539_database_refs/down.sql b/frontend/rust-lib/flowy-sqlite/migrations/2023-02-25-022539_database_refs/down.sqlnew file mode 100644index 0000000000..8ced41d566--- /dev/null+++ b/frontend/rust-lib/flowy-sqlite/migrations/2023-02-25-022539_database_refs/down.sql@@ -0,0 +1,2 @@+-- This file should undo anything in `up.sql`+DROP TABLE database_refs;\ No newline at end of filediff --git a/frontend/rust-lib/flowy-sqlite/migrations/2023-02-25-022539_database_refs/up.sql b/frontend/rust-lib/flowy-sqlite/migrations/2023-02-25-022539_database_refs/up.sqlnew file mode 100644index 0000000000..17aabefb4a--- /dev/null+++ b/frontend/rust-lib/flowy-sqlite/migrations/2023-02-25-022539_database_refs/up.sql@@ -0,0 +1,8 @@+-- Your SQL goes here+CREATE TABLE database_refs (+ ref_id TEXT NOT NULL PRIMARY KEY DEFAULT '',+ name TEXT NOT NULL DEFAULT '',+ is_base Boolean NOT NULL DEFAULT false,+ view_id TEXT NOT NULL DEFAULT '',+ database_id TEXT NOT NULL DEFAULT ''+);\ No newline at end of filediff --git a/frontend/rust-lib/flowy-sqlite/src/schema.rs b/frontend/rust-lib/flowy-sqlite/src/schema.rsindex ef57bbaecd..643c6cabd6 100644--- a/frontend/rust-lib/flowy-sqlite/src/schema.rs+++ b/frontend/rust-lib/flowy-sqlite/src/schema.rs@@ -15,6 +15,16 @@ diesel::table! {}}+diesel::table! {+ database_refs (ref_id) {+ ref_id -> Text,+ name -> Text,+ is_base -> Bool,+ view_id -> Text,+ database_id -> Text,+ }+}+diesel::table! {document_rev_snapshot (snapshot_id) {snapshot_id -> Text,@@ -179,20 +189,21 @@ diesel::table! {}diesel::allow_tables_to_appear_in_same_query!(- app_table,- document_rev_snapshot,- document_rev_table,- folder_rev_snapshot,- grid_block_index_table,- grid_meta_rev_table,- grid_rev_snapshot,- grid_rev_table,- grid_view_rev_table,- kv_table,- rev_snapshot,- rev_table,- trash_table,- user_table,- view_table,- workspace_table,+ app_table,+ database_refs,+ document_rev_snapshot,+ document_rev_table,+ folder_rev_snapshot,+ grid_block_index_table,+ grid_meta_rev_table,+ grid_rev_snapshot,+ grid_rev_table,+ grid_view_rev_table,+ kv_table,+ rev_snapshot,+ rev_table,+ trash_table,+ user_table,+ view_table,+ workspace_table,);diff --git a/frontend/rust-lib/flowy-test/Cargo.toml b/frontend/rust-lib/flowy-test/Cargo.tomlindex 7038d031c5..a381b41c2d 100644--- a/frontend/rust-lib/flowy-test/Cargo.toml+++ b/frontend/rust-lib/flowy-test/Cargo.toml@@ -9,7 +9,7 @@ edition = "2018"flowy-core = { path = "../flowy-core" }flowy-user = { path = "../flowy-user"}flowy-net = { path = "../flowy-net"}-flowy-folder = { path = "../flowy-folder" }+flowy-folder = { path = "../flowy-folder", features = ["flowy_unit_test"] }flowy-document= { path = "../flowy-document" }lib-dispatch = { path = "../lib-dispatch" }diff --git a/frontend/rust-lib/flowy-test/src/helper.rs b/frontend/rust-lib/flowy-test/src/helper.rsindex 3b426450ae..dc275549fa 100644--- a/frontend/rust-lib/flowy-test/src/helper.rs+++ b/frontend/rust-lib/flowy-test/src/helper.rs@@ -25,16 +25,11 @@ pub struct ViewTest {impl ViewTest {#[allow(dead_code)]- pub async fn new(- sdk: &FlowySDKTest,- data_format: ViewDataFormatPB,- layout: ViewLayoutTypePB,- data: Vec<u8>,- ) -> Self {+ pub async fn new(sdk: &FlowySDKTest, layout: ViewLayoutTypePB, data: Vec<u8>) -> Self {let workspace = create_workspace(sdk, "Workspace", "").await;open_workspace(sdk, &workspace.id).await;let app = create_app(sdk, "App", "AppFlowy GitHub Project", &workspace.id).await;- let view = create_view(sdk, &app.id, data_format, layout, data).await;+ let view = create_view(sdk, &app.id, layout, data).await;Self {sdk: sdk.clone(),workspace,@@ -44,41 +39,19 @@ impl ViewTest {}pub async fn new_grid_view(sdk: &FlowySDKTest, data: Vec<u8>) -> Self {- Self::new(- sdk,- ViewDataFormatPB::DatabaseFormat,- ViewLayoutTypePB::Grid,- data,- )- .await+ Self::new(sdk, ViewLayoutTypePB::Grid, data).await}pub async fn new_board_view(sdk: &FlowySDKTest, data: Vec<u8>) -> Self {- Self::new(- sdk,- ViewDataFormatPB::DatabaseFormat,- ViewLayoutTypePB::Board,- data,- )- .await+ Self::new(sdk, ViewLayoutTypePB::Board, data).await}pub async fn new_calendar_view(sdk: &FlowySDKTest, data: Vec<u8>) -> Self {- Self::new(- sdk,- ViewDataFormatPB::DatabaseFormat,- ViewLayoutTypePB::Calendar,- data,- )- .await+ Self::new(sdk, ViewLayoutTypePB::Calendar, data).await}pub async fn new_document_view(sdk: &FlowySDKTest) -> Self {- let view_data_format = match sdk.document_version() {- DocumentVersionPB::V0 => ViewDataFormatPB::DeltaFormat,- DocumentVersionPB::V1 => ViewDataFormatPB::NodeFormat,- };- Self::new(sdk, view_data_format, ViewLayoutTypePB::Document, vec![]).await+ Self::new(sdk, ViewLayoutTypePB::Document, vec![]).await}}@@ -126,23 +99,22 @@ async fn create_app(sdk: &FlowySDKTest, name: &str, desc: &str, workspace_id: &sasync fn create_view(sdk: &FlowySDKTest,app_id: &str,- data_format: ViewDataFormatPB,layout: ViewLayoutTypePB,data: Vec<u8>,) -> ViewPB {- let request = CreateViewPayloadPB {+ let payload = CreateViewPayloadPB {belong_to_id: app_id.to_string(),name: "View A".to_string(),desc: "".to_string(),thumbnail: Some("http://1.png".to_string()),- data_format,layout,initial_data: data,+ ext: Default::default(),};FolderEventBuilder::new(sdk.clone()).event(CreateView)- .payload(request)+ .payload(payload).async_send().await.parse::<ViewPB>()diff --git a/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rs b/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rsindex eaaafbdea4..fc994fa004 100644--- a/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rs+++ b/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rs@@ -13,7 +13,7 @@ pub async fn sign_in() -> DataResult<UserProfilePB, FlowyError> {let params: SignInParams = data.into_inner().try_into()?;let user_profile: UserProfilePB = session.sign_in(params).await?.into();- data_result(user_profile)+ data_result_ok(user_profile)}#[tracing::instrument(@@ -33,5 +33,5 @@ pub async fn sign_up(let params: SignUpParams = data.into_inner().try_into()?;let user_profile: UserProfilePB = session.sign_up(params).await?.into();- data_result(user_profile)+ data_result_ok(user_profile)}diff --git a/frontend/rust-lib/flowy-user/src/handlers/user_handler.rs b/frontend/rust-lib/flowy-user/src/handlers/user_handler.rsindex 6410a6268a..143cef84be 100644--- a/frontend/rust-lib/flowy-user/src/handlers/user_handler.rs+++ b/frontend/rust-lib/flowy-user/src/handlers/user_handler.rs@@ -19,7 +19,7 @@ pub async fn check_user_handler(session: AFPluginState<Arc<UserSession>>,) -> DataResult<UserProfilePB, FlowyError> {let user_profile: UserProfilePB = session.check_user().await?.into();- data_result(user_profile)+ data_result_ok(user_profile)}#[tracing::instrument(level = "debug", skip(session))]@@ -27,7 +27,7 @@ pub async fn get_user_profile_handler(session: AFPluginState<Arc<UserSession>>,) -> DataResult<UserProfilePB, FlowyError> {let user_profile: UserProfilePB = session.get_user_profile().await?.into();- data_result(user_profile)+ data_result_ok(user_profile)}#[tracing::instrument(level = "debug", name = "sign_out", skip(session))]@@ -65,7 +65,7 @@ pub async fn set_appearance_setting(#[tracing::instrument(level = "debug", err)]pub async fn get_appearance_setting() -> DataResult<AppearanceSettingsPB, FlowyError> {match KV::get_str(APPEARANCE_SETTING_CACHE_KEY) {- None => data_result(AppearanceSettingsPB::default()),+ None => data_result_ok(AppearanceSettingsPB::default()),Some(s) => {let setting = match serde_json::from_str(&s) {Ok(setting) => setting,@@ -77,7 +77,7 @@ pub async fn get_appearance_setting() -> DataResult<AppearanceSettingsPB, FlowyEAppearanceSettingsPB::default()},};- data_result(setting)+ data_result_ok(setting)},}}@@ -87,5 +87,5 @@ pub async fn get_user_setting(session: AFPluginState<Arc<UserSession>>,) -> DataResult<UserSettingPB, FlowyError> {let user_setting = session.user_setting()?;- data_result(user_setting)+ data_result_ok(user_setting)}diff --git a/frontend/rust-lib/lib-dispatch/src/response/response.rs b/frontend/rust-lib/lib-dispatch/src/response/response.rsindex feb16f251c..e5d7a06280 100644--- a/frontend/rust-lib/lib-dispatch/src/response/response.rs+++ b/frontend/rust-lib/lib-dispatch/src/response/response.rs@@ -73,7 +73,7 @@ impl AFPluginResponder for AFPluginEventResponse {pub type DataResult<T, E> = std::result::Result<AFPluginData<T>, E>;-pub fn data_result<T, E>(data: T) -> Result<AFPluginData<T>, E>+pub fn data_result_ok<T, E>(data: T) -> Result<AFPluginData<T>, E>whereE: Into<DispatchError>,{diff --git a/frontend/scripts/docker-buildfiles/Dockerfile b/frontend/scripts/docker-buildfiles/Dockerfileindex 6d7fb11142..93ddebcda0 100644--- a/frontend/scripts/docker-buildfiles/Dockerfile+++ b/frontend/scripts/docker-buildfiles/Dockerfile@@ -36,7 +36,7 @@ cargo install --force duckscript_cli && \cargo make appflowy-flutter-deps-tools && \cargo make -p production-linux-x86_64 appflowy-linux-CMD ["/home/makepkg/appflowy/frontend/app_flowy/build/linux/x64/release/bundle/app_flowy"]+CMD ["/home/makepkg/appflowy/frontend/appflowy_flutter/build/linux/x64/release/bundle/appflowy_flutter"]#################FROM archlinux/archlinux@@ -58,6 +58,6 @@ RUN useradd --create-home --uid $uid --gid $gid $userUSER $userWORKDIR /home/$user-COPY --from=builder /home/makepkg/appflowy/frontend/app_flowy/build/linux/x64/release/bundle/ .+COPY --from=builder /home/makepkg/appflowy/frontend/appflowy_flutter/build/linux/x64/release/bundle/ .-CMD ["./app_flowy"]+CMD ["./appflowy_flutter"]diff --git a/frontend/scripts/flatpack-buildfiles/io.appflowy.AppFlowy.desktop b/frontend/scripts/flatpack-buildfiles/io.appflowy.AppFlowy.desktopindex 572fb2a9e7..1e01eb82bb 100644--- a/frontend/scripts/flatpack-buildfiles/io.appflowy.AppFlowy.desktop+++ b/frontend/scripts/flatpack-buildfiles/io.appflowy.AppFlowy.desktop@@ -2,6 +2,6 @@Type=ApplicationName=AppFlowyIcon=io.appflowy.AppFlowy-Exec=env GDK_GL=gles app_flowy %U+Exec=env GDK_GL=gles appflowy_flutter %UCategories=Network;Productivity;Keywords=Notesdiff --git a/frontend/scripts/flatpack-buildfiles/io.appflowy.AppFlowy.yml b/frontend/scripts/flatpack-buildfiles/io.appflowy.AppFlowy.ymlindex f36b4df432..96bcd02e2a 100644--- a/frontend/scripts/flatpack-buildfiles/io.appflowy.AppFlowy.yml+++ b/frontend/scripts/flatpack-buildfiles/io.appflowy.AppFlowy.yml@@ -2,7 +2,7 @@ app-id: io.appflowy.AppFlowyruntime: org.freedesktop.Platformruntime-version: '21.08'sdk: org.freedesktop.Sdk-command: app_flowy+command: appflowy_flutterseparate-locales: falsefinish-args:- --share=ipc@@ -18,10 +18,10 @@ modules:build-commands:# - ls .- cp -r appflowy /app/appflowy- - chmod +x /app/appflowy/app_flowy+ - chmod +x /app/appflowy/appflowy_flutter- install -Dm644 logo.svg /app/share/icons/hicolor/scalable/apps/io.appflowy.AppFlowy.svg- mkdir /app/bin- - ln -s /app/appflowy/app_flowy /app/bin/app_flowy+ - ln -s /app/appflowy/appflowy_flutter /app/bin/appflowy_flutter- install -Dm644 io.appflowy.AppFlowy.desktop /app/share/applications/io.appflowy.AppFlowy.desktopsources:- type: archivediff --git a/frontend/scripts/generate_language_files.cmd b/frontend/scripts/generate_language_files.cmdindex 8980093db6..927e3f3fc3 100644--- a/frontend/scripts/generate_language_files.cmd+++ b/frontend/scripts/generate_language_files.cmd@@ -1,5 +1,5 @@echo 'Generating language files'-cd app_flowy+cd appflowy_fluttercall flutter pub run easy_localization:generate -S assets/translations/call flutter pub run easy_localization:generate -f keys -o locale_keys.g.dart -S assets/translations/ -s en.json\ No newline at end of filediff --git a/frontend/scripts/generate_language_files.sh b/frontend/scripts/generate_language_files.shindex 61215f1a64..550454447c 100644--- a/frontend/scripts/generate_language_files.sh+++ b/frontend/scripts/generate_language_files.sh@@ -1,6 +1,6 @@#!/bin/sh#!/usr/bin/env fishecho 'Generating language files'-cd app_flowy+cd appflowy_flutterflutter pub run easy_localization:generate -S assets/translations/flutter pub run easy_localization:generate -f keys -o locale_keys.g.dart -S assets/translations -s en.jsondiff --git a/frontend/scripts/linux_installer/postinst b/frontend/scripts/linux_installer/postinstindex 6a716d894b..9255abb598 100644--- a/frontend/scripts/linux_installer/postinst+++ b/frontend/scripts/linux_installer/postinst@@ -3,5 +3,5 @@ if [ -e /usr/local/bin/appflowy ]; thenecho "Symlink already exists, skipping."elseecho "Creating Symlink in /usr/local/bin/appflowy"-ln -s /opt/AppFlowy/app_flowy /usr/local/bin/appflowy+ln -s /opt/AppFlowy/appflowy_flutter /usr/local/bin/appflowyfi\ No newline at end of filediff --git a/frontend/scripts/makefile/desktop.toml b/frontend/scripts/makefile/desktop.tomlindex fbcff0334f..e4bc71b7b3 100644--- a/frontend/scripts/makefile/desktop.toml+++ b/frontend/scripts/makefile/desktop.toml@@ -78,7 +78,7 @@ script = [armv7-linux-androideabi \i686-linux-android \x86_64-linux-android- DEST=${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/android/app/src/main/jniLibs+ DEST=${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/android/app/src/main/jniLibsrm -rf $DEST/arm64-v8a \$DEST/armeabi-v7a \$DEST/x86 \@@ -139,7 +139,7 @@ private = truescript = ["""echo "π π π AppFlowy-Core build success"- dart_ffi_dir= set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/packages/appflowy_backend/${TARGET_OS}+ dart_ffi_dir= set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/packages/appflowy_backend/${TARGET_OS}lib = set lib${LIB_NAME}.${LIB_EXT}cp ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/rust-lib/target/${RUST_COMPILE_TARGET}/${BUILD_FLAG}/${lib} \@@ -156,7 +156,7 @@ private = truescript = ["""echo "π π π AppFlowy-Core build success"- dart_ffi_dir= set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/windows/flutter/dart_ffi+ dart_ffi_dir= set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/windows/flutter/dart_ffilib = set ${LIB_NAME}.${LIB_EXT}# copy dll@@ -175,7 +175,7 @@ private = truescript = ["""echo "π π π AppFlowy-Core build success"- dart_ffi_dir= set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/linux/flutter/dart_ffi+ dart_ffi_dir= set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/linux/flutter/dart_ffilib = set lib${LIB_NAME}.${LIB_EXT}# copy dll@@ -241,7 +241,7 @@ script = ["""# Copy the appflowy_backend lib to system temp directory for flutter unit test.lib = set ${LIB_NAME}.${TEST_LIB_EXT}- dest = set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/.sandbox/${lib}+ dest = set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/.sandbox/${lib}rm ${dest}cp ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/rust-lib/target/${TEST_COMPILE_TARGET}/${TEST_BUILD_FLAG}/${lib} \${dest}@@ -255,7 +255,7 @@ script = ["""# Copy the appflowy_backend lib to system temp directory for flutter unit test.lib = set lib${LIB_NAME}.${TEST_LIB_EXT}- dest = set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/.sandbox/${lib}+ dest = set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/.sandbox/${lib}rm ${dest}cp ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/rust-lib/target/${TEST_COMPILE_TARGET}/${TEST_BUILD_FLAG}/${lib} \${dest}diff --git a/frontend/scripts/makefile/flutter.toml b/frontend/scripts/makefile/flutter.tomlindex 51846ee7f6..88632e43a4 100644--- a/frontend/scripts/makefile/flutter.toml+++ b/frontend/scripts/makefile/flutter.toml@@ -75,7 +75,7 @@ linux_alias = "copy-to-product-linux"[tasks.copy-to-product-macos]script = ["""- product_path=${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/product/${APP_VERSION}+ product_path=${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/product/${APP_VERSION}output_path=${product_path}/${TARGET_OS}/${FLUTTER_OUTPUT_DIR}if [ -d "${output_path}" ]; thenrm -rf ${output_path}/@@ -83,7 +83,7 @@ script = [mkdir -p ${output_path}product=${PRODUCT_NAME}.${PRODUCT_EXT}- cp -R ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/build/${TARGET_OS}/Build/Products/${FLUTTER_OUTPUT_DIR}/${product} \+ cp -R ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/build/${TARGET_OS}/Build/Products/${FLUTTER_OUTPUT_DIR}/${product} \${output_path}/${product}""",]@@ -92,7 +92,7 @@ script_runner = "@shell"[tasks.copy-to-product-linux]script = ["""- product_path=${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/product/${APP_VERSION}+ product_path=${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/product/${APP_VERSION}output_path=${product_path}/${TARGET_OS}/${FLUTTER_OUTPUT_DIR}if [ -d "${output_path}" ]; thenrm -rf ${output_path}/@@ -100,11 +100,11 @@ script = [mkdir -p ${output_path}product=${PRODUCT_NAME}- cp -R ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/build/${TARGET_OS}/${LINUX_ARCH}/${BUILD_FLAG}/bundle \+ cp -R ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/build/${TARGET_OS}/${LINUX_ARCH}/${BUILD_FLAG}/bundle \${output_path}/${product}- cp ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/linux/appflowy.desktop.temp ${output_path}/${product}- cp ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/assets/images/flowy_logo.svg ${output_path}/${product}+ cp ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/linux/appflowy.desktop.temp ${output_path}/${product}+ cp ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/assets/images/flowy_logo.svg ${output_path}/${product}""",]script_runner = "@shell"@@ -112,7 +112,7 @@ script_runner = "@shell"[tasks.copy-to-product-windows]script = ["""- product_path= set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/product/${APP_VERSION}+ product_path= set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/product/${APP_VERSION}output_path= set ${product_path}/${TARGET_OS}if is_path_exists ${output_path}rm -r ${output_path}/@@ -120,7 +120,7 @@ script = [mkdir ${output_path}product= set ${PRODUCT_NAME}- glob_cp ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/build/${TARGET_OS}/runner/${FLUTTER_OUTPUT_DIR}/**/* \+ glob_cp ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/build/${TARGET_OS}/runner/${FLUTTER_OUTPUT_DIR}/**/* \${output_path}/${product}""",]@@ -146,27 +146,27 @@ linux_alias = "create-release-archive-linux"[tasks.create-release-archive-linux]script = [- "cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/product/${APP_VERSION}/${TARGET_OS}/Release",+ "cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/product/${APP_VERSION}/${TARGET_OS}/Release","tar -czf ${PRODUCT_NAME}-${TARGET_OS}-x86.tar.gz *",][tasks.create-release-archive-windows]script = [# TODO- # "cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/product/${VERSION}/${TARGET_OS}/Release/${PRODUCT_NAME}",+ # "cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/product/${VERSION}/${TARGET_OS}/Release/${PRODUCT_NAME}",# "tar -czf ${PRODUCT_NAME}-${TARGET_OS}-x86.tar.gz *"][tasks.create-release-archive-macos]script = [# TODO- # "cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/app_flowy/product/${VERSION}/${TARGET_OS}/Release/${PRODUCT_NAME}",+ # "cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/appflowy_flutter/product/${VERSION}/${TARGET_OS}/Release/${PRODUCT_NAME}",# "tar -czf ${PRODUCT_NAME}-${TARGET_OS}-x86.tar.gz *"][tasks.flutter-build]script = ["""- cd app_flowy/+ cd appflowy_flutter/flutter cleanflutter pub getflutter build ${TARGET_OS} --${BUILD_FLAG} --build-name=${APP_VERSION}@@ -175,7 +175,7 @@ script_runner = "@shell"[tasks.flutter-build.windows]script = ["""- cd app_flowy+ cd appflowy_flutterexec cmd.exe /c flutter cleanexec cmd.exe /c flutter pub getexec cmd.exe /c flutter build ${TARGET_OS} --${BUILD_FLAG} --build-name=${APP_VERSION}@@ -186,7 +186,7 @@ script_runner = "@duckscript"script_runner = "@shell"script = ["""- cd app_flowy+ cd appflowy_flutterflutter cleanflutter packages pub getflutter packages pub run easy_localization:generate -S assets/translations/ -f keys -o locale_keys.g.dart -S assets/translations -s en.json@@ -198,7 +198,7 @@ script = [script_runner = "@duckscript"script = ["""- cd ./app_flowy/+ cd ./appflowy_flutter/exec cmd.exe /c flutter cleanexec cmd.exe /c flutter packages pub getexec cmd.exe /c flutter packages pub run easy_localization:generate -S assets/translations/ -f keys -o locale_keys.g.dart -S assets/translations -s en.json@@ -210,7 +210,7 @@ script = [script_runner = "@shell"script = ["""- cd app_flowy+ cd appflowy_flutterflutter packages pub run easy_localization:generate -S assets/translations/ -f keys -o locale_keys.g.dart -S assets/translations -s en.jsonflutter packages pub run build_runner build --delete-conflicting-outputs""",@@ -220,7 +220,7 @@ script = [script_runner = "@duckscript"script = ["""- cd ./app_flowy/+ cd ./appflowy_flutter/exec cmd.exe /c flutter packages pub run easy_localization:generate -S assets/translations/ -f keys -o locale_keys.g.dart -S assets/translations -s en.jsonexec cmd.exe /c flutter packages pub run build_runner build --delete-conflicting-outputs""",diff --git a/frontend/scripts/makefile/tests.toml b/frontend/scripts/makefile/tests.tomlindex a248478849..e0d913f8c3 100644--- a/frontend/scripts/makefile/tests.toml+++ b/frontend/scripts/makefile/tests.toml@@ -22,7 +22,7 @@ env = { RUST_LOG = "info", TEST_RUST_LOG = "info" }dependencies = ["build-test-lib"]description = "Run flutter unit tests"script = '''-cd app_flowy+cd appflowy_flutterflutter test --dart-define=RUST_LOG=${TEST_RUST_LOG} -j, --concurrency=1'''diff --git a/frontend/scripts/makefile/tool.toml b/frontend/scripts/makefile/tool.tomlindex a16f3d34ab..f7c5bd948c 100644--- a/frontend/scripts/makefile/tool.toml+++ b/frontend/scripts/makefile/tool.toml@@ -46,7 +46,7 @@ run_task = { name = "remove_files_with_pattern" }#Dart Clean[tasks.rm_dart_generated_files]-env = { "dart_flowy_sdk_path" = "./app_flowy/packages/appflowy_backend/" }+env = { "dart_flowy_sdk_path" = "./appflowy_flutter/packages/appflowy_backend/" }run_task = { name = ["rm_dart_generated_protobuf_files","rm_dart_generated_event_files",diff --git a/frontend/scripts/windows_installer/inno_setup_config.iss b/frontend/scripts/windows_installer/inno_setup_config.issindex 1c127bb4d8..adb1e30fc1 100644--- a/frontend/scripts/windows_installer/inno_setup_config.iss+++ b/frontend/scripts/windows_installer/inno_setup_config.iss@@ -7,15 +7,15 @@ SolidCompression=yesDefaultDirName={autopf}\AppFlowy\DefaultGroupName=AppFlowySetupIconFile=flowy_logo.ico-UninstallDisplayIcon={app}\app_flowy.exe+UninstallDisplayIcon={app}\appflowy_flutter.exeUninstallDisplayName=AppFlowyAppPublisher=AppFlowy-IOVersionInfoVersion={#AppVersion}[Files]-Source: "AppFlowy\app_flowy.exe";DestDir: "{app}";DestName: "app_flowy.exe"+Source: "AppFlowy\AppFlowy.exe";DestDir: "{app}";DestName: "appflowy_flutter.exe"Source: "AppFlowy\*";DestDir: "{app}"Source: "AppFlowy\data\*";DestDir: "{app}\data\"; Flags: recursesubdirs[Icons]-Name: "{group}\AppFlowy";Filename: "{app}\app_flowy.exe"\ No newline at end of file+Name: "{group}\AppFlowy";Filename: "{app}\appflowy_flutter.exe"\ No newline at end of filediff --git a/shared-lib/database-model/src/database_rev.rs b/shared-lib/database-model/src/database_rev.rsindex 2de186e665..53211ceb6c 100644--- a/shared-lib/database-model/src/database_rev.rs+++ b/shared-lib/database-model/src/database_rev.rs@@ -7,11 +7,11 @@ use std::sync::Arc;pub fn gen_database_id() -> String {// nanoid calculator https://zelark.github.io/nano-id-cc/- nanoid!(10)+ format!("d:{}", nanoid!(10))}pub fn gen_block_id() -> String {- nanoid!(10)+ format!("b:{}", nanoid!(10))}pub fn gen_field_id() -> String {diff --git a/shared-lib/database-model/src/view_rev.rs b/shared-lib/database-model/src/view_rev.rsindex 3010ef8f50..934119b073 100644--- a/shared-lib/database-model/src/view_rev.rs+++ b/shared-lib/database-model/src/view_rev.rs@@ -37,9 +37,17 @@ pub struct DatabaseViewRevision {#[serde(rename = "grid_id")]pub database_id: String,+ #[serde(skip_serializing_if = "String::is_empty")]+ #[serde(default)]+ pub name: String,++ #[serde(default = "DEFAULT_BASE_VALUE")]+ pub is_base: bool,+pub layout: LayoutRevision,#[serde(default)]+ #[serde(skip_serializing_if = "LayoutSettings::is_empty")]pub layout_settings: LayoutSettings,#[serde(default)]@@ -52,12 +60,22 @@ pub struct DatabaseViewRevision {pub sorts: SortConfiguration,}+const DEFAULT_BASE_VALUE: fn() -> bool = || true;+impl DatabaseViewRevision {- pub fn new(database_id: String, view_id: String, layout: LayoutRevision) -> Self {+ pub fn new(+ database_id: String,+ view_id: String,+ is_base: bool,+ name: String,+ layout: LayoutRevision,+ ) -> Self {DatabaseViewRevision {- view_id,database_id,+ view_id,layout,+ is_base,+ name,layout_settings: Default::default(),filters: Default::default(),groups: Default::default(),@@ -77,6 +95,12 @@ pub struct LayoutSettings {inner: IndexMap<LayoutRevision, String>,}+impl LayoutSettings {+ pub fn is_empty(&self) -> bool {+ self.inner.is_empty()+ }+}+impl std::ops::Deref for LayoutSettings {type Target = IndexMap<LayoutRevision, String>;@@ -105,6 +129,8 @@ mod tests {let grid_view_revision = DatabaseViewRevision {view_id: "1".to_string(),database_id: "1".to_string(),+ name: "".to_string(),+ is_base: true,layout: Default::default(),layout_settings: Default::default(),filters: Default::default(),@@ -114,7 +140,7 @@ mod tests {let s = serde_json::to_string(&grid_view_revision).unwrap();assert_eq!(s,- r#"{"view_id":"1","grid_id":"1","layout":0,"layout_settings":[],"filters":[],"groups":[],"sorts":[]}"#+ r#"{"view_id":"1","grid_id":"1","is_base":true,"layout":0,"filters":[],"groups":[],"sorts":[]}"#);}}diff --git a/shared-lib/folder-model/src/view_rev.rs b/shared-lib/folder-model/src/view_rev.rsindex c92a629c57..3817f86a46 100644--- a/shared-lib/folder-model/src/view_rev.rs+++ b/shared-lib/folder-model/src/view_rev.rs@@ -3,8 +3,9 @@ use nanoid::nanoid;use serde::{Deserialize, Serialize};use serde_repr::*;pub fn gen_view_id() -> String {- nanoid!(10)+ format!("v:{}", nanoid!(10))}+#[derive(Default, Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]pub struct ViewRevision {pub id: String,diff --git a/shared-lib/lib-ot/tests/node/tree_test.rs b/shared-lib/lib-ot/tests/node/tree_test.rsindex 4e6a7dcf4b..237c311cda 100644--- a/shared-lib/lib-ot/tests/node/tree_test.rs+++ b/shared-lib/lib-ot/tests/node/tree_test.rs@@ -365,7 +365,7 @@ fn nodes_delete_test() {},DeleteNodes {path: path.clone(),- node_data_list: node_data_list.clone(),+ node_data_list,rev_id: 2,},AssertNode {