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: support managing a space on mobile (#6764)
Lucasa46550c25073
diff --git a/.github/workflows/ios_ci.yaml b/.github/workflows/ios_ci.yamlindex ef64a9741d..8c41ec70c1 100644--- a/.github/workflows/ios_ci.yaml+++ b/.github/workflows/ios_ci.yaml@@ -112,6 +112,7 @@ jobs:kill $pidcontinue-on-error: true+ # Integration tests- name: Run integration testsworking-directory: frontend/appflowy_flutter# The integration tests are flaky and sometimes fail with "Connection timed out":diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/data_migration/anon_user_data_migration_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/data_migration/anon_user_data_migration_test.dartindex 054e895b4a..06c27093f9 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/data_migration/anon_user_data_migration_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/data_migration/anon_user_data_migration_test.dart@@ -1,33 +1,10 @@-// ignore_for_file: unused_import--import 'dart:io';-import 'dart:ui';-import 'package:appflowy/env/cloud_env.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';import 'package:appflowy/workspace/application/settings/prelude.dart';import 'package:appflowy/workspace/presentation/settings/pages/account/account.dart';-import 'package:appflowy/workspace/presentation/settings/pages/settings_account_view.dart';-import 'package:appflowy/workspace/presentation/settings/shared/settings_body.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';-import 'package:flowy_infra_ui/style_widget/text_field.dart';-import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:intl/intl.dart';-import 'package:path/path.dart' as p;-import '../../../shared/dir.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';-import '../../board/board_hide_groups_test.dart';void main() {IntegrationTestWidgetsFlutterBinding.ensureInitialized();diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_publish_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_publish_test.dartindex 0aa308ea53..e87cca1911 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_publish_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_publish_test.dart@@ -1,33 +1,17 @@-// ignore_for_file: unused_import-import 'package:appflowy/env/cloud_env.dart';import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart';-import 'package:appflowy/plugins/shared/share/constants.dart';import 'package:appflowy/plugins/shared/share/publish_tab.dart';import 'package:appflowy/plugins/shared/share/share_menu.dart';-import 'package:appflowy/shared/feature_flags.dart';-import 'package:appflowy/shared/patterns/common_patterns.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';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:path/path.dart' as p;import '../../../shared/constants.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';-import '../../../shared/workspace.dart';void main() {IntegrationTestWidgetsFlutterBinding.ensureInitialized();diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/sidebar/sidebar_move_page_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/sidebar/sidebar_move_page_test.dartindex 4179c2afb7..37abd19ebc 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/sidebar/sidebar_move_page_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/sidebar/sidebar_move_page_test.dart@@ -1,35 +1,13 @@-// ignore_for_file: unused_import--import 'dart:io';-import 'package:appflowy/env/cloud_env.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart';-import 'package:appflowy/shared/feature_flags.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_actions.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy/workspace/presentation/widgets/user_avatar.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';import 'package:flutter/gestures.dart';-import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;import 'package:universal_platform/universal_platform.dart';import '../../../shared/constants.dart';-import '../../../shared/database_test_op.dart';-import '../../../shared/dir.dart';-import '../../../shared/emoji.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/appflowy_cloud_auth_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/appflowy_cloud_auth_test.dartindex 36475e7c28..0b649fd6d5 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/appflowy_cloud_auth_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/appflowy_cloud_auth_test.dart@@ -1,21 +1,12 @@-// ignore_for_file: unused_import-import 'package:appflowy/env/cloud_env.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';import 'package:appflowy/workspace/application/settings/prelude.dart';import 'package:appflowy/workspace/presentation/settings/pages/account/account.dart';-import 'package:appflowy/workspace/presentation/settings/pages/settings_account_view.dart';import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/document_sync_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/document_sync_test.dartindex b2c525c384..b6b4ecf025 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/document_sync_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/document_sync_test.dart@@ -1,24 +1,9 @@-// ignore_for_file: unused_import--import 'dart:io';-import 'package:appflowy/env/cloud_env.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/presentation/settings/pages/settings_account_view.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/uuid.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;-import '../../../shared/dir.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/user_setting_sync_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/user_setting_sync_test.dartindex 780748e6fa..e666289bf5 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/user_setting_sync_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/uncategorized/user_setting_sync_test.dart@@ -1,33 +1,11 @@-// ignore_for_file: unused_import--import 'dart:io';-import 'package:appflowy/env/cloud_env.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';import 'package:appflowy/workspace/application/settings/prelude.dart';import 'package:appflowy/workspace/presentation/settings/pages/account/account_user_profile.dart';-import 'package:appflowy/workspace/presentation/settings/pages/settings_account_view.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy/workspace/presentation/widgets/user_avatar.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/uuid.dart';-import 'package:flowy_infra_ui/style_widget/text_field.dart';-import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;-import '../../../shared/database_test_op.dart';-import '../../../shared/dir.dart';-import '../../../shared/emoji.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';-import '../../board/board_hide_groups_test.dart';void main() {IntegrationTestWidgetsFlutterBinding.ensureInitialized();diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/change_name_and_icon_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/change_name_and_icon_test.dartindex 30bc9e3830..594f13995f 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/change_name_and_icon_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/change_name_and_icon_test.dart@@ -1,21 +1,10 @@-// ignore_for_file: unused_import-import 'package:appflowy/env/cloud_env.dart';-import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/shared/feature_flags.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/uuid.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';import '../../../shared/workspace.dart';diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/collaborative_workspace_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/collaborative_workspace_test.dartindex 903dc95fcc..53f5db6d07 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/collaborative_workspace_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/collaborative_workspace_test.dart@@ -1,32 +1,13 @@-// ignore_for_file: unused_import--import 'dart:io';-import 'package:appflowy/env/cloud_env.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart';import 'package:appflowy/shared/feature_flags.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_actions.dart';import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy/workspace/presentation/widgets/user_avatar.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';-import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;-import '../../../shared/database_test_op.dart';-import '../../../shared/dir.dart';-import '../../../shared/emoji.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/share_menu_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/share_menu_test.dartindex 8512222f15..c2dc378386 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/share_menu_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/share_menu_test.dart@@ -1,29 +1,17 @@-// ignore_for_file: unused_import-import 'package:appflowy/env/cloud_env.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart';import 'package:appflowy/plugins/shared/share/constants.dart';import 'package:appflowy/plugins/shared/share/share_menu.dart';-import 'package:appflowy/shared/feature_flags.dart';import 'package:appflowy/shared/patterns/common_patterns.dart';import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;import '../../../shared/constants.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';-import '../../../shared/workspace.dart';void main() {IntegrationTestWidgetsFlutterBinding.ensureInitialized();diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_icon_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_icon_test.dartindex 71d7c8c2eb..e9ad06caee 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_icon_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_icon_test.dart@@ -1,35 +1,11 @@-// ignore_for_file: unused_import--import 'dart:io';-import 'package:appflowy/env/cloud_env.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart';-import 'package:appflowy/shared/feature_flags.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_actions.dart';import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart';import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy/workspace/presentation/widgets/user_avatar.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';-import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;-import 'package:universal_platform/universal_platform.dart';-import '../../../shared/constants.dart';-import '../../../shared/database_test_op.dart';-import '../../../shared/dir.dart';-import '../../../shared/emoji.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';import '../../../shared/workspace.dart';diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_settings_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_settings_test.dartindex c63a934427..8b081c04c6 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_settings_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_settings_test.dart@@ -1,46 +1,23 @@-// ignore_for_file: unused_import--import 'dart:io';-import 'package:appflowy/env/cloud_env.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart';import 'package:appflowy/plugins/document/presentation/editor_style.dart';import 'package:appflowy/plugins/shared/share/publish_tab.dart';-import 'package:appflowy/shared/feature_flags.dart';import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_actions.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart';-import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart';import 'package:appflowy/workspace/presentation/settings/pages/settings_workspace_view.dart';-import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_item.dart';import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_more_action.dart';-import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_settings_dialog.dart';-import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/home_page_menu.dart';import 'package:appflowy/workspace/presentation/settings/pages/sites/published_page/published_view_item.dart';import 'package:appflowy/workspace/presentation/settings/pages/sites/published_page/published_view_more_action.dart';import 'package:appflowy/workspace/presentation/settings/pages/sites/published_page/published_view_settings_dialog.dart';import 'package:appflowy/workspace/presentation/settings/shared/setting_list_tile.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy/workspace/presentation/widgets/user_avatar.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;import '../../../shared/constants.dart';-import '../../../shared/database_test_op.dart';-import '../../../shared/dir.dart';-import '../../../shared/emoji.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/mobile/cloud/cloud_runner.dart b/frontend/appflowy_flutter/integration_test/mobile/cloud/cloud_runner.dartindex 9cea0ff57f..c2f3d7103a 100644--- a/frontend/appflowy_flutter/integration_test/mobile/cloud/cloud_runner.dart+++ b/frontend/appflowy_flutter/integration_test/mobile/cloud/cloud_runner.dart@@ -1,9 +1,11 @@import 'document/publish_test.dart' as publish_test;import 'document/share_link_test.dart' as share_link_test;+import 'space/space_test.dart' as space_test;import 'workspace/workspace_operations_test.dart' as workspace_operations_test;Future<void> main() async {workspace_operations_test.main();share_link_test.main();publish_test.main();+ space_test.main();}diff --git a/frontend/appflowy_flutter/integration_test/mobile/cloud/document/publish_test.dart b/frontend/appflowy_flutter/integration_test/mobile/cloud/document/publish_test.dartindex dfde191284..a3fcfe128c 100644--- a/frontend/appflowy_flutter/integration_test/mobile/cloud/document/publish_test.dart+++ b/frontend/appflowy_flutter/integration_test/mobile/cloud/document/publish_test.dart@@ -1,40 +1,10 @@-// ignore_for_file: unused_import--import 'dart:io';-import 'dart:math';-import 'package:appflowy/env/cloud_env.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/mobile/application/page_style/document_page_style_bloc.dart';-import 'package:appflowy/mobile/presentation/base/app_bar/app_bar_actions.dart';-import 'package:appflowy/mobile/presentation/base/view_page/app_bar_buttons.dart';-import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet_buttons.dart';-import 'package:appflowy/mobile/presentation/home/home.dart';-import 'package:appflowy/plugins/document/presentation/editor_page.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover_bloc.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/page_style/_page_style_layout.dart';-import 'package:appflowy/shared/patterns/common_patterns.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/application/view/view_ext.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';-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:path/path.dart' as p;import '../../../shared/constants.dart';-import '../../../shared/dir.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/mobile/cloud/document/share_link_test.dart b/frontend/appflowy_flutter/integration_test/mobile/cloud/document/share_link_test.dartindex 3228e785a6..bf0ddc8711 100644--- a/frontend/appflowy_flutter/integration_test/mobile/cloud/document/share_link_test.dart+++ b/frontend/appflowy_flutter/integration_test/mobile/cloud/document/share_link_test.dart@@ -1,39 +1,12 @@-// ignore_for_file: unused_import--import 'dart:io';-import 'package:appflowy/env/cloud_env.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/mobile/application/page_style/document_page_style_bloc.dart';-import 'package:appflowy/mobile/presentation/base/app_bar/app_bar_actions.dart';-import 'package:appflowy/mobile/presentation/base/view_page/app_bar_buttons.dart';-import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet_buttons.dart';-import 'package:appflowy/mobile/presentation/home/home.dart';-import 'package:appflowy/plugins/document/presentation/editor_page.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover_bloc.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/page_style/_page_style_layout.dart';import 'package:appflowy/shared/patterns/common_patterns.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/application/view/view_ext.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';-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:path/path.dart' as p;import '../../../shared/constants.dart';-import '../../../shared/dir.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/mobile/cloud/space/space_test.dart b/frontend/appflowy_flutter/integration_test/mobile/cloud/space/space_test.dartnew file mode 100644index 0000000000..b7bd681b88--- /dev/null+++ b/frontend/appflowy_flutter/integration_test/mobile/cloud/space/space_test.dart@@ -0,0 +1,288 @@+import 'package:appflowy/env/cloud_env.dart';+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';+import 'package:appflowy/mobile/presentation/home/space/manage_space_widget.dart';+import 'package:appflowy/mobile/presentation/home/space/mobile_space_header.dart';+import 'package:appflowy/mobile/presentation/home/space/mobile_space_menu.dart';+import 'package:appflowy/mobile/presentation/home/space/space_menu_bottom_sheet.dart';+import 'package:appflowy/mobile/presentation/home/space/widgets.dart';+import 'package:appflowy/mobile/presentation/home/workspaces/create_workspace_menu.dart';+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';+import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';+import 'package:appflowy/workspace/application/view/view_ext.dart';+import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart';+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/cupertino.dart';+import 'package:flutter/material.dart';+import 'package:flutter_test/flutter_test.dart';+import 'package:integration_test/integration_test.dart';++import '../../../shared/util.dart';++void main() {+ IntegrationTestWidgetsFlutterBinding.ensureInitialized();++ group('space operations:', () {+ Future<void> openSpaceMenu(WidgetTester tester) async {+ final spaceHeader = find.byType(MobileSpaceHeader);+ await tester.tapButton(spaceHeader);+ await tester.pumpUntilFound(find.byType(MobileSpaceMenu));+ }++ Future<void> openSpaceMenuMoreOptions(+ WidgetTester tester,+ ViewPB space,+ ) async {+ final spaceMenuItemTrailing = find.byWidgetPredicate(+ (w) => w is SpaceMenuItemTrailing && w.space.id == space.id,+ );+ final moreOptions = find.descendant(+ of: spaceMenuItemTrailing,+ matching: find.byWidgetPredicate(+ (w) =>+ w is FlowySvg &&+ w.svg.path == FlowySvgs.workspace_three_dots_s.path,+ ),+ );+ await tester.tapButton(moreOptions);+ await tester.pumpUntilFound(find.byType(SpaceMenuMoreOptions));+ }++ // combine the tests together to reduce the CI time+ testWidgets('''+1. create a new space+2. update the space name+3. update the space permission+4. update the space icon+5. delete the space+''', (tester) async {+ await tester.initializeAppFlowy(+ cloudType: AuthenticatorType.appflowyCloudSelfHost,+ );+ await tester.tapGoogleLoginInButton();+ await tester.expectToSeeHomePageWithGetStartedPage();++ // 1. create a new space+ // click the space menu+ await openSpaceMenu(tester);++ // click the create a new space button+ final createNewSpaceButton = find.text(+ LocaleKeys.space_createNewSpace.tr(),+ );+ await tester.pumpUntilFound(createNewSpaceButton);+ await tester.tapButton(createNewSpaceButton);++ // input the new space name+ final inputField = find.descendant(+ of: find.byType(ManageSpaceWidget),+ matching: find.byType(TextField),+ );+ const newSpaceName = 'AppFlowy';+ await tester.enterText(inputField, newSpaceName);+ await tester.pumpAndSettle();++ // change the space permission to private+ final permissionOption = find.byType(ManageSpacePermissionOption);+ await tester.tapButton(permissionOption);+ await tester.pumpAndSettle();++ final privateOption = find.text(LocaleKeys.space_privatePermission.tr());+ await tester.tapButton(privateOption);+ await tester.pumpAndSettle();++ // change the space icon color+ final color = builtInSpaceColors[1];+ final iconOption = find.descendant(+ of: find.byType(ManageSpaceIconOption),+ matching: find.byWidgetPredicate(+ (w) => w is SpaceColorItem && w.color == color,+ ),+ );+ await tester.tapButton(iconOption);+ await tester.pumpAndSettle();++ // change the space icon+ final icon = kIconGroups![0].icons[1];+ final iconItem = find.descendant(+ of: find.byType(ManageSpaceIconOption),+ matching: find.byWidgetPredicate(+ (w) => w is SpaceIconItem && w.icon == icon,+ ),+ );+ await tester.tapButton(iconItem);+ await tester.pumpAndSettle();++ // click the done button+ final doneButton = find.descendant(+ of: find.byWidgetPredicate(+ (w) =>+ w is BottomSheetHeader &&+ w.title == LocaleKeys.space_createSpace.tr(),+ ),+ matching: find.text(LocaleKeys.button_done.tr()),+ );+ await tester.tapButton(doneButton);+ await tester.pumpAndSettle();++ // wait 100ms for the space to be created+ await tester.wait(100);++ // verify the space is created+ await openSpaceMenu(tester);+ final spaceItems = find.byType(MobileSpaceMenuItem);+ // expect to see 3 space items, 2 are built-in, 1 is the new space+ expect(spaceItems, findsNWidgets(3));+ // convert the space item to a widget+ final spaceWidget =+ tester.widgetList<MobileSpaceMenuItem>(spaceItems).last;+ final space = spaceWidget.space;+ expect(space.name, newSpaceName);+ expect(space.spacePermission, SpacePermission.private);+ expect(space.spaceIcon, icon.iconPath);+ expect(space.spaceIconColor, color);++ // open the SpaceMenuMoreOptions menu+ await openSpaceMenuMoreOptions(tester, space);++ // 2. rename the space name+ final renameOption = find.text(LocaleKeys.button_rename.tr());+ await tester.tapButton(renameOption);+ await tester.pumpUntilFound(find.byType(EditWorkspaceNameBottomSheet));++ // input the new space name+ final renameInputField = find.descendant(+ of: find.byType(EditWorkspaceNameBottomSheet),+ matching: find.byType(TextField),+ );+ const renameSpaceName = 'HelloWorld';+ await tester.enterText(renameInputField, renameSpaceName);+ await tester.pumpAndSettle();+ await tester.tapButton(find.text(LocaleKeys.button_confirm.tr()));++ // click the done button+ await tester.pumpAndSettle();++ final renameSuccess = find.text(+ LocaleKeys.space_success_renameSpace.tr(),+ );+ await tester.pumpUntilNotFound(renameSuccess);++ // check the space name is updated+ await openSpaceMenu(tester);+ final renameSpaceItem = find.descendant(+ of: find.byType(MobileSpaceMenuItem),+ matching: find.text(renameSpaceName),+ );+ expect(renameSpaceItem, findsOneWidget);++ // 3. manage the space+ await openSpaceMenuMoreOptions(tester, space);++ final manageOption = find.text(LocaleKeys.space_manage.tr());+ await tester.tapButton(manageOption);+ await tester.pumpUntilFound(find.byType(ManageSpaceWidget));++ // 3.1 rename the space+ final textField = find.descendant(+ of: find.byType(ManageSpaceWidget),+ matching: find.byType(TextField),+ );+ await tester.enterText(textField, 'AppFlowy');+ await tester.pumpAndSettle();++ // 3.2 change the permission+ final permissionOption2 = find.byType(ManageSpacePermissionOption);+ await tester.tapButton(permissionOption2);+ await tester.pumpAndSettle();++ final publicOption = find.text(LocaleKeys.space_publicPermission.tr());+ await tester.tapButton(publicOption);+ await tester.pumpAndSettle();++ // 3.3 change the icon+ // change the space icon color+ final color2 = builtInSpaceColors[2];+ final iconOption2 = find.descendant(+ of: find.byType(ManageSpaceIconOption),+ matching: find.byWidgetPredicate(+ (w) => w is SpaceColorItem && w.color == color2,+ ),+ );+ await tester.tapButton(iconOption2);+ await tester.pumpAndSettle();++ // change the space icon+ final icon2 = kIconGroups![0].icons[2];+ final iconItem2 = find.descendant(+ of: find.byType(ManageSpaceIconOption),+ matching: find.byWidgetPredicate(+ (w) => w is SpaceIconItem && w.icon == icon2,+ ),+ );+ await tester.tapButton(iconItem2);+ await tester.pumpAndSettle();++ // click the done button+ final doneButton2 = find.descendant(+ of: find.byWidgetPredicate(+ (w) =>+ w is BottomSheetHeader &&+ w.title == LocaleKeys.space_manageSpace.tr(),+ ),+ matching: find.text(LocaleKeys.button_done.tr()),+ );+ await tester.tapButton(doneButton2);+ await tester.pumpAndSettle();++ // check the space is updated+ final spaceItems2 = find.byType(MobileSpaceMenuItem);+ final spaceWidget2 =+ tester.widgetList<MobileSpaceMenuItem>(spaceItems2).last;+ final space2 = spaceWidget2.space;+ expect(space2.name, 'AppFlowy');+ expect(space2.spacePermission, SpacePermission.publicToAll);+ expect(space2.spaceIcon, icon2.iconPath);+ expect(space2.spaceIconColor, color2);+ final manageSuccess = find.text(+ LocaleKeys.space_success_updateSpace.tr(),+ );+ await tester.pumpUntilNotFound(manageSuccess);++ // 4. duplicate the space+ await openSpaceMenuMoreOptions(tester, space);+ final duplicateOption = find.text(LocaleKeys.space_duplicate.tr());+ await tester.tapButton(duplicateOption);+ final duplicateSuccess = find.text(+ LocaleKeys.space_success_duplicateSpace.tr(),+ );+ await tester.pumpUntilNotFound(duplicateSuccess);++ // check the space is duplicated+ await openSpaceMenu(tester);+ final spaceItems3 = find.byType(MobileSpaceMenuItem);+ expect(spaceItems3, findsNWidgets(4));++ // 5. delete the space+ await openSpaceMenuMoreOptions(tester, space);+ final deleteOption = find.text(LocaleKeys.button_delete.tr());+ await tester.tapButton(deleteOption);+ final confirmDeleteButton = find.descendant(+ of: find.byType(CupertinoDialogAction),+ matching: find.text(LocaleKeys.button_delete.tr()),+ );+ await tester.tapButton(confirmDeleteButton);+ final deleteSuccess = find.text(+ LocaleKeys.space_success_deleteSpace.tr(),+ );+ await tester.pumpUntilNotFound(deleteSuccess);++ // check the space is deleted+ await openSpaceMenu(tester);+ final spaceItems4 = find.byType(MobileSpaceMenuItem);+ expect(spaceItems4, findsNWidgets(3));+ });+ });+}diff --git a/frontend/appflowy_flutter/integration_test/mobile/cloud/workspace/workspace_operations_test.dart b/frontend/appflowy_flutter/integration_test/mobile/cloud/workspace/workspace_operations_test.dartindex cb156121b9..210d1bcf0e 100644--- a/frontend/appflowy_flutter/integration_test/mobile/cloud/workspace/workspace_operations_test.dart+++ b/frontend/appflowy_flutter/integration_test/mobile/cloud/workspace/workspace_operations_test.dart@@ -1,37 +1,11 @@-// ignore_for_file: unused_import--import 'dart:io';-import 'package:appflowy/env/cloud_env.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/mobile/application/page_style/document_page_style_bloc.dart';-import 'package:appflowy/mobile/presentation/base/app_bar/app_bar_actions.dart';-import 'package:appflowy/mobile/presentation/base/view_page/app_bar_buttons.dart';-import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet_buttons.dart';-import 'package:appflowy/mobile/presentation/home/home.dart';-import 'package:appflowy/plugins/document/presentation/editor_page.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover_bloc.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/page_style/_page_style_layout.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/application/view/view_ext.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;import '../../../shared/constants.dart';-import '../../../shared/dir.dart';-import '../../../shared/mock/mock_file_picker.dart';import '../../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/mobile/document/page_style_test.dart b/frontend/appflowy_flutter/integration_test/mobile/document/page_style_test.dartindex 67d2b05d9d..4d34861850 100644--- a/frontend/appflowy_flutter/integration_test/mobile/document/page_style_test.dart+++ b/frontend/appflowy_flutter/integration_test/mobile/document/page_style_test.dart@@ -1,36 +1,13 @@-// ignore_for_file: unused_import--import 'dart:io';--import 'package:appflowy/env/cloud_env.dart';import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/application/page_style/document_page_style_bloc.dart';-import 'package:appflowy/mobile/presentation/base/app_bar/app_bar_actions.dart';import 'package:appflowy/mobile/presentation/base/view_page/app_bar_buttons.dart';import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet_buttons.dart';-import 'package:appflowy/mobile/presentation/home/home.dart';import 'package:appflowy/plugins/document/presentation/editor_page.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover_bloc.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/page_style/_page_style_layout.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/application/view/view_ext.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;-import '../../shared/dir.dart';-import '../../shared/mock/mock_file_picker.dart';import '../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/mobile/document/title_test.dart b/frontend/appflowy_flutter/integration_test/mobile/document/title_test.dartindex d9af265aa9..01b1d574ce 100644--- a/frontend/appflowy_flutter/integration_test/mobile/document/title_test.dart+++ b/frontend/appflowy_flutter/integration_test/mobile/document/title_test.dart@@ -1,39 +1,10 @@-// ignore_for_file: unused_import--import 'dart:io';--import 'package:appflowy/env/cloud_env.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/mobile/application/page_style/document_page_style_bloc.dart';-import 'package:appflowy/mobile/presentation/base/app_bar/app_bar_actions.dart';-import 'package:appflowy/mobile/presentation/base/view_page/app_bar_buttons.dart';-import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet_buttons.dart';-import 'package:appflowy/mobile/presentation/home/home.dart';-import 'package:appflowy/mobile/presentation/home/section_folder/mobile_home_section_folder_header.dart';import 'package:appflowy/mobile/presentation/presentation.dart';import 'package:appflowy/plugins/document/presentation/editor_page.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover_bloc.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/page_style/_page_style_layout.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/application/view/view_ext.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.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';-import 'package:flowy_infra/uuid.dart';import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;-import '../../shared/dir.dart';-import '../../shared/mock/mock_file_picker.dart';import '../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/mobile/home_page/create_new_page_test.dart b/frontend/appflowy_flutter/integration_test/mobile/home_page/create_new_page_test.dartindex a10052926a..d64ab094de 100644--- a/frontend/appflowy_flutter/integration_test/mobile/home_page/create_new_page_test.dart+++ b/frontend/appflowy_flutter/integration_test/mobile/home_page/create_new_page_test.dart@@ -1,29 +1,8 @@-// ignore_for_file: unused_import--import 'dart:io';--import 'package:appflowy/env/cloud_env.dart';import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/mobile/presentation/home/home.dart';-import 'package:appflowy/mobile/presentation/home/section_folder/mobile_home_section_folder_header.dart';import 'package:appflowy/mobile/presentation/presentation.dart';-import 'package:appflowy/plugins/document/document_page.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;-import '../../shared/dir.dart';-import '../../shared/mock/mock_file_picker.dart';import '../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/integration_test/mobile/sign_in/anonymous_sign_in_test.dart b/frontend/appflowy_flutter/integration_test/mobile/sign_in/anonymous_sign_in_test.dartindex 1a0493b6a7..ab98ca190a 100644--- a/frontend/appflowy_flutter/integration_test/mobile/sign_in/anonymous_sign_in_test.dart+++ b/frontend/appflowy_flutter/integration_test/mobile/sign_in/anonymous_sign_in_test.dart@@ -1,25 +1,7 @@-// ignore_for_file: unused_import--import 'dart:io';--import 'package:appflowy/env/cloud_env.dart';-import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/home/home.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';-import 'package:appflowy/user/application/auth/auth_service.dart';-import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';-import 'package:appflowy/workspace/application/settings/prelude.dart';-import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/uuid.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';-import 'package:path/path.dart' as p;-import '../../shared/dir.dart';-import '../../shared/mock/mock_file_picker.dart';import '../../shared/util.dart';void main() {diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dartindex 647e124172..1e762f75f7 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart@@ -47,6 +47,7 @@ Future<T?> showMobileBottomSheet<T>(Color? barrierColor,double? elevation,bool showDoneButton = false,+ void Function(BuildContext context)? onDone,bool enableDraggableScrollable = false,bool enableScrollable = false,// this field is only used if showDragHandle is true@@ -112,6 +113,7 @@ Future<T?> showMobileBottomSheet<T>(showRemoveButton: showRemoveButton,title: title,onRemove: onRemove,+ onDone: onDone,),);@@ -208,6 +210,7 @@ class BottomSheetHeader extends StatelessWidget {required this.title,required this.showDoneButton,this.onRemove,+ this.onDone,});final bool showBackButton;@@ -216,6 +219,7 @@ class BottomSheetHeader extends StatelessWidget {final String title;final bool showDoneButton;final VoidCallback? onRemove;+ final void Function(BuildContext context)? onDone;@overrideWidget build(BuildContext context) {@@ -257,7 +261,13 @@ class BottomSheetHeader extends StatelessWidget {Align(alignment: Alignment.centerRight,child: BottomSheetDoneButton(- onDone: () => Navigator.pop(context),+ onDone: () {+ if (onDone != null) {+ onDone?.call(context);+ } else {+ Navigator.pop(context);+ }+ },),),],diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/constants.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/constants.dartnew file mode 100644index 0000000000..da7d13a174--- /dev/null+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/constants.dart@@ -0,0 +1,3 @@+class SpaceUIConstants {+ static const itemHeight = 52.0;+}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/manage_space_widget.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/manage_space_widget.dartnew file mode 100644index 0000000000..f24108c945--- /dev/null+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/manage_space_widget.dart@@ -0,0 +1,53 @@+import 'package:appflowy/shared/icon_emoji_picker/icon.dart';+import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart' hide Icon;++import 'widgets.dart';++enum ManageSpaceType {+ create,+ edit,+}++class ManageSpaceWidget extends StatelessWidget {+ const ManageSpaceWidget({+ super.key,+ required this.controller,+ required this.permission,+ required this.selectedColor,+ required this.selectedIcon,+ required this.type,+ });++ final TextEditingController controller;+ final ValueNotifier<SpacePermission> permission;+ final ValueNotifier<String> selectedColor;+ final ValueNotifier<Icon?> selectedIcon;+ final ManageSpaceType type;++ @override+ Widget build(BuildContext context) {+ return Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ mainAxisSize: MainAxisSize.min,+ children: [+ ManageSpaceNameOption(+ controller: controller,+ type: type,+ ),+ ManageSpacePermissionOption(permission: permission),+ ConstrainedBox(+ constraints: const BoxConstraints(+ maxHeight: 560,+ ),+ child: ManageSpaceIconOption(+ selectedColor: selectedColor,+ selectedIcon: selectedIcon,+ ),+ ),+ const VSpace(60),+ ],+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space.dartindex 7346247470..a6545ce053 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space.dart@@ -17,7 +17,9 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';class MobileSpace extends StatelessWidget {- const MobileSpace({super.key});+ const MobileSpace({+ super.key,+ });@overrideWidget build(BuildContext context) {@@ -63,6 +65,8 @@ class MobileSpace extends StatelessWidget {useRootNavigator: true,title: LocaleKeys.space_title.tr(),backgroundColor: Theme.of(context).colorScheme.surface,+ enableScrollable: true,+ bottomSheetPadding: context.bottomSheetPadding(),builder: (_) {return BlocProvider.value(value: context.read<SpaceBloc>(),@@ -96,6 +100,7 @@ class MobileSpace extends StatelessWidget {name: layout.defaultName,layout: layout,index: 0,+ openAfterCreate: true,),);context.read<SpaceBloc>().add(diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space_menu.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space_menu.dartindex 2fe580cecd..489f7c5af2 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space_menu.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space_menu.dart@@ -1,50 +1,74 @@import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/mobile/presentation/base/animated_gesture.dart';+import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';+import 'package:appflowy/mobile/presentation/home/space/space_menu_bottom_sheet.dart';+import 'package:appflowy/mobile/presentation/home/workspaces/create_workspace_menu.dart';+import 'package:appflowy/mobile/presentation/widgets/widgets.dart';+import 'package:appflowy/shared/icon_emoji_picker/icon.dart';+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';+import 'package:appflowy/util/navigator_context_extension.dart';+import 'package:appflowy/util/string_extension.dart';import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';import 'package:appflowy/workspace/application/view/view_ext.dart';+import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_action_type.dart';import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon.dart';+import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart';+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';+import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';+import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flutter/material.dart';+import 'package:flutter/material.dart' hide Icon;import 'package:flutter_bloc/flutter_bloc.dart';+import 'constants.dart';+import 'manage_space_widget.dart';+class MobileSpaceMenu extends StatelessWidget {- const MobileSpaceMenu({super.key});+ const MobileSpaceMenu({+ super.key,+ });@overrideWidget build(BuildContext context) {return BlocBuilder<SpaceBloc, SpaceState>(builder: (context, state) {- return Column(- mainAxisSize: MainAxisSize.min,- children: [- const VSpace(4.0),- for (final space in state.spaces)- SizedBox(- height: 52,- child: _SidebarSpaceMenuItem(- space: space,- isSelected: state.currentSpace?.id == space.id,+ return SingleChildScrollView(+ child: Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ const VSpace(4.0),+ for (final space in state.spaces)+ SizedBox(+ height: SpaceUIConstants.itemHeight,+ child: MobileSpaceMenuItem(+ space: space,+ isSelected: state.currentSpace?.id == space.id,+ ),),+ const Padding(+ padding: EdgeInsets.symmetric(vertical: 8.0),+ child: Divider(+ height: 0.5,+ ),+ ),+ const SizedBox(+ height: SpaceUIConstants.itemHeight,+ child: _CreateSpaceButton(),),- // const Padding(- // padding: EdgeInsets.symmetric(vertical: 8.0),- // child: Divider(- // height: 0.5,- // ),- // ),- // const SizedBox(- // height: 52,- // child: _CreateSpaceButton(),- // ),- ],+ ],+ ),);},);}}-class _SidebarSpaceMenuItem extends StatelessWidget {- const _SidebarSpaceMenuItem({+class MobileSpaceMenuItem extends StatelessWidget {+ const MobileSpaceMenuItem({+ super.key,required this.space,required this.isSelected,});@@ -79,12 +103,11 @@ class _SidebarSpaceMenuItem extends StatelessWidget {cornerRadius: 6.0,),leftIconSize: const Size.square(24),- rightIcon: isSelected- ? const FlowySvg(- FlowySvgs.m_blue_check_s,- blendMode: null,- )- : null,+ rightIcon: SpaceMenuItemTrailing(+ key: ValueKey('${space.id}_space_menu_item_trailing'),+ space: space,+ currentSpace: context.read<SpaceBloc>().state.currentSpace,+ ),onTap: () {context.read<SpaceBloc>().add(SpaceEvent.open(space));Navigator.of(context).pop();@@ -93,40 +116,383 @@ class _SidebarSpaceMenuItem extends StatelessWidget {}}-// class _CreateSpaceButton extends StatelessWidget {-// const _CreateSpaceButton();--// @override-// Widget build(BuildContext context) {-// return FlowyButton(-// text: FlowyText.regular(LocaleKeys.space_createNewSpace.tr()),-// iconPadding: 10,-// leftIcon: const FlowySvg(-// FlowySvgs.space_add_s,-// ),-// leftIconSize: const Size.square(20),-// onTap: () {-// PopoverContainer.of(context).close();-// _showCreateSpaceDialog(context);-// },-// );-// }--// void _showCreateSpaceDialog(BuildContext context) {-// final spaceBloc = context.read<SpaceBloc>();-// showDialog(-// context: context,-// builder: (_) {-// return Dialog(-// shape: RoundedRectangleBorder(-// borderRadius: BorderRadius.circular(12.0),-// ),-// child: BlocProvider.value(-// value: spaceBloc,-// child: const CreateSpacePopup(),-// ),-// );-// },-// );-// }-// }+class _CreateSpaceButton extends StatefulWidget {+ const _CreateSpaceButton();++ @override+ State<_CreateSpaceButton> createState() => _CreateSpaceButtonState();+}++class _CreateSpaceButtonState extends State<_CreateSpaceButton> {+ final controller = TextEditingController();+ final permission = ValueNotifier<SpacePermission>(+ SpacePermission.publicToAll,+ );+ final selectedColor = ValueNotifier<String>(+ builtInSpaceColors.first,+ );+ final selectedIcon = ValueNotifier<Icon?>(+ kIconGroups?.first.icons.first,+ );++ @override+ void dispose() {+ controller.dispose();+ permission.dispose();+ selectedColor.dispose();+ selectedIcon.dispose();++ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return FlowyButton(+ text: FlowyText.regular(LocaleKeys.space_createNewSpace.tr()),+ iconPadding: 10,+ leftIcon: const Padding(+ padding: EdgeInsets.all(2.0),+ child: FlowySvg(+ FlowySvgs.space_add_s,+ ),+ ),+ margin: const EdgeInsets.symmetric(horizontal: 12.0),+ leftIconSize: const Size.square(24),+ onTap: () => _showCreateSpaceDialog(context),+ );+ }++ Future<void> _showCreateSpaceDialog(BuildContext context) async {+ await showMobileBottomSheet(+ context,+ showHeader: true,+ title: LocaleKeys.space_createSpace.tr(),+ showCloseButton: true,+ showDivider: false,+ showDoneButton: true,+ enableScrollable: true,+ showDragHandle: true,+ bottomSheetPadding: context.bottomSheetPadding(),+ onDone: (bottomSheetContext) {+ final iconPath = selectedIcon.value?.iconPath ?? '';+ context.read<SpaceBloc>().add(+ SpaceEvent.create(+ name: controller.text.orDefault(+ LocaleKeys.space_defaultSpaceName.tr(),+ ),+ permission: permission.value,+ iconColor: selectedColor.value,+ icon: iconPath,+ createNewPageByDefault: true,+ openAfterCreate: false,+ ),+ );+ Navigator.pop(bottomSheetContext);+ Navigator.pop(context);++ Log.info(+ 'create space on mobile, name: ${controller.text}, permission: ${permission.value}, color: ${selectedColor.value}, icon: $iconPath',+ );+ },+ padding: const EdgeInsets.symmetric(horizontal: 16),+ builder: (bottomSheetContext) => ManageSpaceWidget(+ controller: controller,+ permission: permission,+ selectedColor: selectedColor,+ selectedIcon: selectedIcon,+ type: ManageSpaceType.create,+ ),+ );++ _resetState();+ }++ void _resetState() {+ controller.clear();+ permission.value = SpacePermission.publicToAll;+ selectedColor.value = builtInSpaceColors.first;+ selectedIcon.value = kIconGroups?.first.icons.first;+ }+}++class SpaceMenuItemTrailing extends StatefulWidget {+ const SpaceMenuItemTrailing({+ super.key,+ required this.space,+ this.currentSpace,+ });++ final ViewPB space;+ final ViewPB? currentSpace;++ @override+ State<SpaceMenuItemTrailing> createState() => _SpaceMenuItemTrailingState();+}++class _SpaceMenuItemTrailingState extends State<SpaceMenuItemTrailing> {+ final controller = TextEditingController();+ final permission = ValueNotifier<SpacePermission>(+ SpacePermission.publicToAll,+ );+ final selectedColor = ValueNotifier<String>(+ builtInSpaceColors.first,+ );+ final selectedIcon = ValueNotifier<Icon?>(+ kIconGroups?.first.icons.first,+ );++ @override+ void dispose() {+ controller.dispose();+ permission.dispose();+ selectedColor.dispose();+ selectedIcon.dispose();++ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ const iconSize = Size.square(20);+ return Row(+ children: [+ const HSpace(12.0),+ // show the check icon if the space is the current space+ if (widget.space.id == widget.currentSpace?.id)+ const FlowySvg(+ FlowySvgs.m_blue_check_s,+ size: iconSize,+ blendMode: null,+ ),+ const HSpace(15.0),+ // more options button+ AnimatedGestureDetector(+ onTapUp: () => _showMoreOptions(context),+ child: const FlowySvg(+ FlowySvgs.workspace_three_dots_s,+ size: iconSize,+ ),+ ),+ const HSpace(8.0),+ ],+ );+ }++ void _showMoreOptions(BuildContext context) {+ final actions = [+ SpaceMoreActionType.rename,+ SpaceMoreActionType.duplicate,+ SpaceMoreActionType.manage,+ SpaceMoreActionType.delete,+ ];++ showMobileBottomSheet(+ context,+ showDragHandle: true,+ showDivider: false,+ useRootNavigator: true,+ backgroundColor: Theme.of(context).colorScheme.surface,+ builder: (bottomSheetContext) {+ return SpaceMenuMoreOptions(+ actions: actions,+ onAction: (action) => _onActions(+ context,+ bottomSheetContext,+ action,+ ),+ );+ },+ );+ }++ void _onActions(+ BuildContext context,+ BuildContext bottomSheetContext,+ SpaceMoreActionType action,+ ) {+ Log.info('execute action in space menu bottom sheet: $action');++ switch (action) {+ case SpaceMoreActionType.rename:+ _showRenameSpaceBottomSheet(context);+ break;+ case SpaceMoreActionType.duplicate:+ _duplicateSpace(context, bottomSheetContext);+ break;+ case SpaceMoreActionType.manage:+ _showManageSpaceBottomSheet(context);+ break;+ case SpaceMoreActionType.delete:+ _deleteSpace(context, bottomSheetContext);+ break;+ default:+ assert(false, 'Unsupported action: $action');+ break;+ }+ }++ void _duplicateSpace(BuildContext context, BuildContext bottomSheetContext) {+ Log.info('duplicate the space: ${widget.space.name}');++ context.read<SpaceBloc>().add(const SpaceEvent.duplicate());++ showToastNotification(+ context,+ message: LocaleKeys.space_success_duplicateSpace.tr(),+ );++ Navigator.of(bottomSheetContext).pop();+ Navigator.of(context).pop();+ }++ void _showRenameSpaceBottomSheet(BuildContext context) {+ Navigator.of(context).pop();++ showMobileBottomSheet(+ context,+ showHeader: true,+ title: LocaleKeys.space_renameSpace.tr(),+ showCloseButton: true,+ showDragHandle: true,+ showDivider: false,+ padding: const EdgeInsets.symmetric(horizontal: 16),+ builder: (bottomSheetContext) {+ return EditWorkspaceNameBottomSheet(+ type: EditWorkspaceNameType.edit,+ workspaceName: widget.space.name,+ hintText: LocaleKeys.space_spaceNamePlaceholder.tr(),+ onSubmitted: (name) {+ // rename the workspace+ Log.info('rename the space, from: ${widget.space.name}, to: $name');+ bottomSheetContext.popToHome();++ context+ .read<SpaceBloc>()+ .add(SpaceEvent.rename(space: widget.space, name: name));++ showToastNotification(+ context,+ message: LocaleKeys.space_success_renameSpace.tr(),+ );+ },+ );+ },+ );+ }++ Future<void> _showManageSpaceBottomSheet(BuildContext context) async {+ controller.text = widget.space.name;+ permission.value = widget.space.spacePermission;+ selectedColor.value =+ widget.space.spaceIconColor ?? builtInSpaceColors.first;+ selectedIcon.value = widget.space.spaceIcon?.icon;++ await showMobileBottomSheet(+ context,+ showHeader: true,+ title: LocaleKeys.space_manageSpace.tr(),+ showCloseButton: true,+ showDivider: false,+ showDoneButton: true,+ enableScrollable: true,+ showDragHandle: true,+ bottomSheetPadding: context.bottomSheetPadding(),+ onDone: (bottomSheetContext) {+ String iconName = '';+ final icon = selectedIcon.value;+ final iconGroup = icon?.iconGroup;+ final iconId = icon?.name;+ if (icon != null && iconGroup != null) {+ iconName = '${iconGroup.name}/$iconId';+ }+ Log.info(+ 'update space on mobile, name: ${controller.text}, permission: ${permission.value}, color: ${selectedColor.value}, icon: $iconName',+ );+ context.read<SpaceBloc>().add(+ SpaceEvent.update(+ space: widget.space,+ name: controller.text.orDefault(+ LocaleKeys.space_defaultSpaceName.tr(),+ ),+ permission: permission.value,+ iconColor: selectedColor.value,+ icon: iconName,+ ),+ );++ showToastNotification(+ context,+ message: LocaleKeys.space_success_updateSpace.tr(),+ );++ Navigator.pop(bottomSheetContext);+ Navigator.pop(context);+ },+ padding: const EdgeInsets.symmetric(horizontal: 16),+ builder: (bottomSheetContext) => ManageSpaceWidget(+ controller: controller,+ permission: permission,+ selectedColor: selectedColor,+ selectedIcon: selectedIcon,+ type: ManageSpaceType.edit,+ ),+ );+ }++ void _deleteSpace(+ BuildContext context,+ BuildContext bottomSheetContext,+ ) {+ Navigator.of(bottomSheetContext).pop();++ _showConfirmDialog(+ context,+ '${LocaleKeys.space_delete.tr()}: ${widget.space.name}',+ LocaleKeys.space_deleteConfirmationDescription.tr(),+ LocaleKeys.button_delete.tr(),+ (_) async {+ context.read<SpaceBloc>().add(SpaceEvent.delete(widget.space));++ showToastNotification(+ context,+ message: LocaleKeys.space_success_deleteSpace.tr(),+ );++ context.popToHome();+ },+ );+ }++ void _showConfirmDialog(+ BuildContext context,+ String title,+ String content,+ String rightButtonText,+ void Function(BuildContext context)? onRightButtonPressed,+ ) {+ showFlowyCupertinoConfirmDialog(+ title: title,+ content: FlowyText(+ content,+ fontSize: 14,+ color: Theme.of(context).hintColor,+ maxLines: 10,+ ),+ leftButton: FlowyText(+ LocaleKeys.button_cancel.tr(),+ fontSize: 17.0,+ figmaLineHeight: 24.0,+ fontWeight: FontWeight.w500,+ color: const Color(0xFF007AFF),+ ),+ rightButton: FlowyText(+ rightButtonText,+ fontSize: 17.0,+ figmaLineHeight: 24.0,+ fontWeight: FontWeight.w400,+ color: const Color(0xFFFE0220),+ ),+ onRightButtonPressed: onRightButtonPressed,+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/space_menu_bottom_sheet.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/space_menu_bottom_sheet.dartnew file mode 100644index 0000000000..2eaf609af0--- /dev/null+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/space_menu_bottom_sheet.dart@@ -0,0 +1,99 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/mobile/presentation/widgets/widgets.dart';+import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_action_type.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/material.dart';++import 'constants.dart';++class SpaceMenuMoreOptions extends StatelessWidget {+ const SpaceMenuMoreOptions({+ super.key,+ required this.onAction,+ required this.actions,+ });++ final void Function(SpaceMoreActionType action) onAction;+ final List<SpaceMoreActionType> actions;++ @override+ Widget build(BuildContext context) {+ return Column(+ crossAxisAlignment: CrossAxisAlignment.stretch,+ children: actions+ .map(+ (action) => _buildActionButton(context, action),+ )+ .toList(),+ );+ }++ Widget _buildActionButton(+ BuildContext context,+ SpaceMoreActionType action,+ ) {+ switch (action) {+ case SpaceMoreActionType.rename:+ return FlowyOptionTile.text(+ text: LocaleKeys.button_rename.tr(),+ height: SpaceUIConstants.itemHeight,+ leftIcon: const FlowySvg(+ FlowySvgs.view_item_rename_s,+ size: Size.square(18),+ ),+ showTopBorder: false,+ showBottomBorder: false,+ onTap: () => onAction(+ SpaceMoreActionType.rename,+ ),+ );+ case SpaceMoreActionType.delete:+ return FlowyOptionTile.text(+ text: LocaleKeys.button_delete.tr(),+ height: SpaceUIConstants.itemHeight,+ textColor: Theme.of(context).colorScheme.error,+ leftIcon: FlowySvg(+ FlowySvgs.trash_s,+ size: const Size.square(18),+ color: Theme.of(context).colorScheme.error,+ ),+ showTopBorder: false,+ showBottomBorder: false,+ onTap: () => onAction(+ SpaceMoreActionType.delete,+ ),+ );+ case SpaceMoreActionType.manage:+ return FlowyOptionTile.text(+ text: LocaleKeys.space_manage.tr(),+ height: SpaceUIConstants.itemHeight,+ leftIcon: const FlowySvg(+ FlowySvgs.settings_s,+ size: Size.square(18),+ ),+ showTopBorder: false,+ showBottomBorder: false,+ onTap: () => onAction(+ SpaceMoreActionType.manage,+ ),+ );+ case SpaceMoreActionType.duplicate:+ return FlowyOptionTile.text(+ text: SpaceMoreActionType.duplicate.name,+ height: SpaceUIConstants.itemHeight,+ leftIcon: const FlowySvg(+ FlowySvgs.duplicate_s,+ size: Size.square(18),+ ),+ showTopBorder: false,+ showBottomBorder: false,+ onTap: () => onAction(+ SpaceMoreActionType.duplicate,+ ),+ );+ default:+ return const SizedBox.shrink();+ }+ }+}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/space_permission_bottom_sheet.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/space_permission_bottom_sheet.dartnew file mode 100644index 0000000000..85ad35a549--- /dev/null+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/space_permission_bottom_sheet.dart@@ -0,0 +1,53 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/mobile/presentation/widgets/widgets.dart';+import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/material.dart';++class SpacePermissionBottomSheet extends StatelessWidget {+ const SpacePermissionBottomSheet({+ super.key,+ required this.onAction,+ required this.permission,+ });++ final SpacePermission permission;+ final void Function(SpacePermission action) onAction;++ @override+ Widget build(BuildContext context) {+ return Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ FlowyOptionTile.text(+ text: LocaleKeys.space_publicPermission.tr(),+ leftIcon: const FlowySvg(+ FlowySvgs.space_permission_public_s,+ ),+ trailing: permission == SpacePermission.publicToAll+ ? const FlowySvg(+ FlowySvgs.m_blue_check_s,+ blendMode: null,+ )+ : null,+ onTap: () => onAction(SpacePermission.publicToAll),+ ),+ FlowyOptionTile.text(+ text: LocaleKeys.space_privatePermission.tr(),+ showTopBorder: false,+ leftIcon: const FlowySvg(+ FlowySvgs.space_permission_private_s,+ ),+ trailing: permission == SpacePermission.private+ ? const FlowySvg(+ FlowySvgs.m_blue_check_s,+ blendMode: null,+ )+ : null,+ onTap: () => onAction(SpacePermission.private),+ ),+ ],+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/widgets.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/widgets.dartnew file mode 100644index 0000000000..089386ce90--- /dev/null+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/widgets.dart@@ -0,0 +1,389 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/mobile/presentation/base/animated_gesture.dart';+import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';+import 'package:appflowy/mobile/presentation/widgets/widgets.dart';+import 'package:appflowy/plugins/document/presentation/editor_plugins/base/string_extension.dart';+import 'package:appflowy/shared/icon_emoji_picker/colors.dart';+import 'package:appflowy/shared/icon_emoji_picker/icon.dart';+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';+import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';+import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart' hide Icon;++import 'constants.dart';+import 'manage_space_widget.dart';+import 'space_permission_bottom_sheet.dart';++class ManageSpaceNameOption extends StatelessWidget {+ const ManageSpaceNameOption({+ super.key,+ required this.controller,+ required this.type,+ });++ final TextEditingController controller;+ final ManageSpaceType type;++ @override+ Widget build(BuildContext context) {+ return Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Padding(+ padding: const EdgeInsets.only(left: 16, bottom: 4),+ child: FlowyText(+ LocaleKeys.space_spaceName.tr(),+ fontSize: 14,+ figmaLineHeight: 20.0,+ fontWeight: FontWeight.w400,+ color: Theme.of(context).hintColor,+ ),+ ),+ FlowyOptionTile.textField(+ controller: controller,+ autofocus: type == ManageSpaceType.create ? true : false,+ textFieldHintText: LocaleKeys.space_spaceNamePlaceholder.tr(),+ ),+ const VSpace(16),+ ],+ );+ }+}++class ManageSpacePermissionOption extends StatelessWidget {+ const ManageSpacePermissionOption({+ super.key,+ required this.permission,+ });++ final ValueNotifier<SpacePermission> permission;++ @override+ Widget build(BuildContext context) {+ return Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Padding(+ padding: const EdgeInsets.only(left: 16, bottom: 4),+ child: FlowyText(+ LocaleKeys.space_permission.tr(),+ fontSize: 14,+ figmaLineHeight: 20.0,+ fontWeight: FontWeight.w400,+ color: Theme.of(context).hintColor,+ ),+ ),+ ValueListenableBuilder(+ valueListenable: permission,+ builder: (context, value, child) => FlowyOptionTile.text(+ height: SpaceUIConstants.itemHeight,+ text: value.i18n,+ leftIcon: FlowySvg(value.icon),+ trailing: const FlowySvg(+ FlowySvgs.arrow_right_s,+ ),+ onTap: () {+ showMobileBottomSheet(+ context,+ showHeader: true,+ title: LocaleKeys.space_permission.tr(),+ showCloseButton: true,+ showDivider: false,+ showDragHandle: true,+ builder: (context) => SpacePermissionBottomSheet(+ permission: value,+ onAction: (value) {+ permission.value = value;+ Navigator.pop(context);+ },+ ),+ );+ },+ ),+ ),+ const VSpace(16),+ ],+ );+ }+}++class ManageSpaceIconOption extends StatefulWidget {+ const ManageSpaceIconOption({+ super.key,+ required this.selectedColor,+ required this.selectedIcon,+ });++ final ValueNotifier<String> selectedColor;+ final ValueNotifier<Icon?> selectedIcon;++ @override+ State<ManageSpaceIconOption> createState() => _ManageSpaceIconOptionState();+}++class _ManageSpaceIconOptionState extends State<ManageSpaceIconOption> {+ @override+ Widget build(BuildContext context) {+ return Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ ..._buildColorOption(context),+ ..._buildSpaceIconOption(context),+ ],+ );+ }++ List<Widget> _buildColorOption(BuildContext context) {+ return [+ Padding(+ padding: const EdgeInsets.only(left: 16, bottom: 4),+ child: FlowyText(+ LocaleKeys.space_mSpaceIconColor.tr(),+ fontSize: 14,+ figmaLineHeight: 20.0,+ fontWeight: FontWeight.w400,+ color: Theme.of(context).hintColor,+ ),+ ),+ ValueListenableBuilder(+ valueListenable: widget.selectedColor,+ builder: (context, selectedColor, child) {+ return FlowyOptionDecorateBox(+ child: Padding(+ padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),+ child: SingleChildScrollView(+ scrollDirection: Axis.horizontal,+ child: Row(+ children: builtInSpaceColors.map((color) {+ return SpaceColorItem(+ color: color,+ selectedColor: selectedColor,+ onSelected: (color) => widget.selectedColor.value = color,+ );+ }).toList(),+ ),+ ),+ ),+ );+ },+ ),+ const VSpace(16),+ ];+ }++ List<Widget> _buildSpaceIconOption(BuildContext context) {+ return [+ Padding(+ padding: const EdgeInsets.only(left: 16, bottom: 4),+ child: FlowyText(+ LocaleKeys.space_mSpaceIcon.tr(),+ fontSize: 14,+ figmaLineHeight: 20.0,+ fontWeight: FontWeight.w400,+ color: Theme.of(context).hintColor,+ ),+ ),+ Expanded(+ child: SizedBox(+ width: double.infinity,+ child: ValueListenableBuilder(+ valueListenable: widget.selectedColor,+ builder: (context, selectedColor, child) {+ return ValueListenableBuilder(+ valueListenable: widget.selectedIcon,+ builder: (context, selectedIcon, child) {+ return FlowyOptionDecorateBox(+ child: Padding(+ padding: const EdgeInsets.symmetric(+ horizontal: 16,+ vertical: 14,+ ),+ child: _buildIconGroups(+ context,+ selectedColor,+ selectedIcon,+ ),+ ),+ );+ },+ );+ },+ ),+ ),+ ),+ const VSpace(16),+ ];+ }++ Widget _buildIconGroups(+ BuildContext context,+ String selectedColor,+ Icon? selectedIcon,+ ) {+ final iconGroups = kIconGroups;+ if (iconGroups == null) {+ return const SizedBox.shrink();+ }++ return ListView.builder(+ itemCount: iconGroups.length,+ itemBuilder: (context, index) {+ final iconGroup = iconGroups[index];+ return Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ FlowyText(+ iconGroup.displayName.capitalize(),+ fontSize: 12,+ figmaLineHeight: 18.0,+ color: context.pickerTextColor,+ ),+ const VSpace(4.0),+ Center(+ child: Wrap(+ spacing: 10.0,+ runSpacing: 8.0,+ children: iconGroup.icons.map((icon) {+ return SpaceIconItem(+ icon: icon,+ isSelected: selectedIcon?.name == icon.name,+ selectedColor: selectedColor,+ onSelectedIcon: (icon) => widget.selectedIcon.value = icon,+ );+ }).toList(),+ ),+ ),+ const VSpace(12.0),+ if (index == iconGroups.length - 1) ...[+ const StreamlinePermit(),+ ],+ ],+ );+ },+ );+ }+}++class SpaceIconItem extends StatelessWidget {+ const SpaceIconItem({+ super.key,+ required this.icon,+ required this.onSelectedIcon,+ required this.isSelected,+ required this.selectedColor,+ });++ final Icon icon;+ final void Function(Icon icon) onSelectedIcon;+ final bool isSelected;+ final String selectedColor;++ @override+ Widget build(BuildContext context) {+ return AnimatedGestureDetector(+ onTapUp: () => onSelectedIcon(icon),+ child: Container(+ width: 36,+ height: 36,+ decoration: isSelected+ ? BoxDecoration(+ color: Color(int.parse(selectedColor)),+ borderRadius: BorderRadius.circular(8.0),+ )+ : ShapeDecoration(+ color: Colors.transparent,+ shape: RoundedRectangleBorder(+ side: const BorderSide(+ width: 0.5,+ color: Color(0x661F2329),+ ),+ borderRadius: BorderRadius.circular(8),+ ),+ ),+ child: Center(+ child: FlowySvg.string(+ icon.content,+ size: const Size.square(18),+ color: isSelected+ ? Theme.of(context).colorScheme.surface+ : context.pickerIconColor,+ opacity: isSelected ? 1.0 : 0.7,+ ),+ ),+ ),+ );+ }+}++class SpaceColorItem extends StatelessWidget {+ const SpaceColorItem({+ super.key,+ required this.color,+ required this.selectedColor,+ required this.onSelected,+ });++ final String color;+ final String selectedColor;+ final void Function(String color) onSelected;++ @override+ Widget build(BuildContext context) {+ final child = Center(+ child: Container(+ width: 28,+ height: 28,+ decoration: BoxDecoration(+ color: Color(int.parse(color)),+ borderRadius: BorderRadius.circular(14),+ ),+ ),+ );++ final decoration = color != selectedColor+ ? null+ : ShapeDecoration(+ color: Colors.transparent,+ shape: RoundedRectangleBorder(+ side: BorderSide(+ width: 1.50,+ color: Theme.of(context).colorScheme.primary,+ ),+ borderRadius: BorderRadius.circular(21),+ ),+ );++ return AnimatedGestureDetector(+ onTapUp: () => onSelected(color),+ child: Container(+ width: 36,+ height: 36,+ decoration: decoration,+ child: child,+ ),+ );+ }+}++extension on SpacePermission {+ String get i18n {+ switch (this) {+ case SpacePermission.publicToAll:+ return LocaleKeys.space_publicPermission.tr();+ case SpacePermission.private:+ return LocaleKeys.space_privatePermission.tr();+ }+ }++ FlowySvgData get icon {+ switch (this) {+ case SpacePermission.publicToAll:+ return FlowySvgs.space_permission_public_s;+ case SpacePermission.private:+ return FlowySvgs.space_permission_private_s;+ }+ }+}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dartindex 12e40cf86c..9d78e39645 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart@@ -182,6 +182,7 @@ class _MobileSpaceTabState extends State<MobileSpaceTab>SpaceEvent.createPage(name: layout.defaultName,layout: layout,+ openAfterCreate: true,),);} else if (layout == ViewLayoutPB.Document) {diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/workspaces/create_workspace_menu.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/workspaces/create_workspace_menu.dartindex 960bea2f34..155af7d4ff 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/workspaces/create_workspace_menu.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/workspaces/create_workspace_menu.dart@@ -32,6 +32,7 @@ class EditWorkspaceNameBottomSheet extends StatefulWidget {required this.type,required this.onSubmitted,required this.workspaceName,+ this.hintText,});final EditWorkspaceNameType type;@@ -40,6 +41,8 @@ class EditWorkspaceNameBottomSheet extends StatefulWidget {// if the workspace name is not empty, it will be used as the initial value of the text field.final String? workspaceName;+ final String? hintText;+@overrideState<EditWorkspaceNameBottomSheet> createState() =>_EditWorkspaceNameBottomSheetState();@@ -77,7 +80,8 @@ class _EditWorkspaceNameBottomSheetStatecontroller: _textFieldController,keyboardType: TextInputType.text,decoration: InputDecoration(- hintText: LocaleKeys.workspace_defaultName.tr(),+ hintText:+ widget.hintText ?? LocaleKeys.workspace_defaultName.tr(),),validator: (value) {if (value == null || value.isEmpty) {diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/workspaces/workspace_menu_bottom_sheet.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/workspaces/workspace_menu_bottom_sheet.dartindex 59cbd867b5..59b381ce10 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/workspaces/workspace_menu_bottom_sheet.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/workspaces/workspace_menu_bottom_sheet.dart@@ -3,7 +3,7 @@ import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/base/animated_gesture.dart';import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';import 'package:appflowy/mobile/presentation/widgets/widgets.dart';-import 'package:appflowy/util/navigator_context_exntesion.dart';+import 'package:appflowy/util/navigator_context_extension.dart';import 'package:appflowy/util/theme_extension.dart';import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart';diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dartindex d1f3dd9d42..0dd0846978 100644--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dart+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dart@@ -4,8 +4,14 @@ part 'icon.g.dart';@JsonSerializable()class IconGroup {- factory IconGroup.fromJson(Map<String, dynamic> json) =>- _$IconGroupFromJson(json);+ factory IconGroup.fromJson(Map<String, dynamic> json) {+ final group = _$IconGroupFromJson(json);+ // Set the iconGroup reference for each icon+ for (final icon in group.icons) {+ icon.iconGroup = group;+ }+ return group;+ }factory IconGroup.fromMapEntry(MapEntry<String, dynamic> entry) =>IconGroup.fromJson({@@ -16,7 +22,12 @@ class IconGroup {IconGroup({required this.name,required this.icons,- });+ }) {+ // Set the iconGroup reference for each icon+ for (final icon in icons) {+ icon.iconGroup = this;+ }+ }final String name;final List<Icon> icons;@@ -56,7 +67,17 @@ class Icon {final List<String> keywords;final String content;+ // Add reference to parent IconGroup+ IconGroup? iconGroup;+String get displayName => name.replaceAll('-', ' ');Map<String, dynamic> toJson() => _$IconToJson(this);++ String get iconPath {+ if (iconGroup == null) {+ return '';+ }+ return '${iconGroup!.name}/$name';+ }}diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dartindex 4ae7e8e76c..bbcb34895d 100644--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart@@ -237,8 +237,8 @@ class _IconPickerState extends State<IconPicker> {).toList(),),const VSpace(12.0),- if (index == widget.iconGroups.length - 1) ...[- const _StreamlinePermit(),+ if (index == kIconGroups!.length - 1) ...[+ const StreamlinePermit(),const VSpace(12.0),],],@@ -319,8 +319,10 @@ class _IconState extends State<_Icon> {}}-class _StreamlinePermit extends StatelessWidget {- const _StreamlinePermit();+class StreamlinePermit extends StatelessWidget {+ const StreamlinePermit({+ super.key,+ });@overrideWidget build(BuildContext context) {diff --git a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dartindex 62e75f6747..3b7d1f5bad 100644--- a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart@@ -51,7 +51,7 @@ GoRouter generateRouter(Widget child) {_encryptSecretScreenRoute(),_workspaceErrorScreenRoute(),// Desktop only- if (!UniversalPlatform.isMobile) _desktopHomeScreenRoute(),+ if (UniversalPlatform.isDesktop) _desktopHomeScreenRoute(),// Mobile onlyif (UniversalPlatform.isMobile) ...[// settingsdiff --git a/frontend/appflowy_flutter/lib/util/navigator_context_exntesion.dart b/frontend/appflowy_flutter/lib/util/navigator_context_extension.dartsimilarity index 100%rename from frontend/appflowy_flutter/lib/util/navigator_context_exntesion.dartrename to frontend/appflowy_flutter/lib/util/navigator_context_extension.dartdiff --git a/frontend/appflowy_flutter/lib/util/string_extension.dart b/frontend/appflowy_flutter/lib/util/string_extension.dartindex 0c6f0210a1..3e66e73052 100644--- a/frontend/appflowy_flutter/lib/util/string_extension.dart+++ b/frontend/appflowy_flutter/lib/util/string_extension.dart@@ -1,9 +1,12 @@import 'dart:io';+import 'package:appflowy/shared/icon_emoji_picker/icon.dart';+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';import 'package:appflowy/shared/patterns/common_patterns.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra/theme_extension.dart';-import 'package:flutter/material.dart';+import 'package:flutter/foundation.dart';+import 'package:flutter/material.dart' hide Icon;extension StringExtension on String {static const _specialCharacters = r'\/:*?"<>| ';@@ -56,3 +59,28 @@ extension NullableStringExtension on String? {return this?.isEmpty ?? true ? defaultValue : this ?? '';}}++extension IconExtension on String {+ Icon? get icon {+ final values = split('/');+ if (values.length != 2) {+ return null;+ }+ final iconGroup = IconGroup(name: values.first, icons: []);+ if (kDebugMode) {+ // Ensure the icon group and icon exist+ assert(kIconGroups!.any((group) => group.name == values.first));+ assert(+ kIconGroups!+ .firstWhere((group) => group.name == values.first)+ .icons+ .any((icon) => icon.name == values.last),+ );+ }+ return Icon(+ content: values.last,+ name: values.last,+ keywords: [],+ )..iconGroup = iconGroup;+ }+}diff --git a/frontend/appflowy_flutter/lib/workspace/application/sidebar/space/space_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/sidebar/space/space_bloc.dartindex 302c2a46ce..c15e1509c1 100644--- a/frontend/appflowy_flutter/lib/workspace/application/sidebar/space/space_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/sidebar/space/space_bloc.dart@@ -6,6 +6,7 @@ import 'package:appflowy/core/config/kv_keys.dart';import 'package:appflowy/shared/list_extension.dart';import 'package:appflowy/startup/startup.dart';import 'package:appflowy/user/application/user_service.dart';+import 'package:appflowy/util/string_extension.dart';import 'package:appflowy/workspace/application/view/prelude.dart';import 'package:appflowy/workspace/application/view/view_ext.dart';import 'package:appflowy/workspace/application/view/view_service.dart';@@ -111,6 +112,7 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {iconColor,permission,createNewPageByDefault,+ openAfterCreate,) async {final space = await _createSpace(name: name,@@ -118,6 +120,9 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {iconColor: iconColor,permission: permission,);++ Log.info('create space: $space');+if (space != null) {emit(state.copyWith(@@ -126,15 +131,18 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {),);add(SpaceEvent.open(space));+ Log.info('open space: ${space.name}(${space.id})');if (createNewPageByDefault) {add(- const SpaceEvent.createPage(+ SpaceEvent.createPage(name: '',index: 0,layout: ViewLayoutPB.Document,+ openAfterCreate: openAfterCreate,),);+ Log.info('create page: ${space.name}(${space.id})');}}},@@ -142,21 +150,40 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {if (state.spaces.length <= 1) {return;}+final deletedSpace = space ?? state.currentSpace;if (deletedSpace == null) {return;}+await ViewBackendService.deleteView(viewId: deletedSpace.id);++ Log.info('delete space: ${deletedSpace.name}(${deletedSpace.id})');},rename: (space, name) async {- add(SpaceEvent.update(name: name));+ add(+ SpaceEvent.update(+ space: space,+ name: name,+ icon: space.spaceIcon,+ iconColor: space.spaceIconColor,+ permission: space.spacePermission,+ ),+ );},- changeIcon: (icon, iconColor) async {- add(SpaceEvent.update(icon: icon, iconColor: iconColor));+ changeIcon: (space, icon, iconColor) async {+ add(+ SpaceEvent.update(+ space: space,+ icon: icon,+ iconColor: iconColor,+ ),+ );},- update: (name, icon, iconColor, permission) async {- final space = state.currentSpace;+ update: (space, name, icon, iconColor, permission) async {+ space ??= state.currentSpace;if (space == null) {+ Log.error('update space failed, space is null');return;}@@ -185,6 +212,10 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {viewId: space.id,extra: jsonEncode(merged),);++ Log.info(+ 'update space: ${space.name}(${space.id}), merged: $merged',+ );} catch (e) {Log.error('Failed to migrating cover: $e');}@@ -200,6 +231,10 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {viewId: space.id,extra: jsonEncode(current),);++ Log.info(+ 'update space: ${space.name}(${space.id}), current: $current',+ );} catch (e) {Log.error('Failed to migrating cover: $e');}@@ -258,7 +293,7 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {await _setSpaceExpandStatus(space, isExpanded);emit(state.copyWith(isExpanded: isExpanded));},- createPage: (name, layout, index) async {+ createPage: (name, layout, index, openAfterCreate) async {final parentViewId = state.currentSpace?.id;if (parentViewId == null) {return;@@ -269,12 +304,13 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {layoutType: layout,parentViewId: parentViewId,index: index,+ openAfterCreate: openAfterCreate,);result.fold((view) {emit(state.copyWith(- lastCreatedPage: view,+ lastCreatedPage: openAfterCreate ? view : null,createPageResult: FlowyResult.success(null),),);@@ -331,14 +367,18 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {final nextSpace = spaces[nextIndex];add(SpaceEvent.open(nextSpace));},- duplicate: () async {- final currentSpace = state.currentSpace;- if (currentSpace == null) {+ duplicate: (space) async {+ space ??= state.currentSpace;+ if (space == null) {+ Log.error('duplicate space failed, space is null');return;}++ Log.info('duplicate space: ${space.name}(${space.id})');+emit(state.copyWith(isDuplicatingSpace: true));- final newSpace = await _duplicateSpace(currentSpace);+ final newSpace = await _duplicateSpace(space);// open the duplicated spaceif (newSpace != null) {add(const SpaceEvent.didReceiveSpaceUpdate());@@ -668,10 +708,8 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {Future<ViewPB?> _duplicateSpace(ViewPB space) async {// if the space is not duplicated, try to create a new space- final icon = space.icon.value.isNotEmpty- ? space.icon.value- : builtInSpaceIcons.first;- final iconColor = space.spaceIconColor ?? builtInSpaceColors.first;+ final icon = space.spaceIcon.orDefault(builtInSpaceIcons.first);+ final iconColor = space.spaceIconColor.orDefault(builtInSpaceColors.first);final newSpace = await _createSpace(name: '${space.name} (copy)',icon: icon,@@ -711,14 +749,22 @@ class SpaceEvent with _$SpaceEvent {required String iconColor,required SpacePermission permission,required bool createNewPageByDefault,+ required bool openAfterCreate,}) = _Create;- const factory SpaceEvent.rename(ViewPB space, String name) = _Rename;- const factory SpaceEvent.changeIcon(+ const factory SpaceEvent.rename({+ required ViewPB space,+ required String name,+ }) = _Rename;+ const factory SpaceEvent.changeIcon({+ ViewPB? space,String? icon,String? iconColor,- ) = _ChangeIcon;- const factory SpaceEvent.duplicate() = _Duplicate;+ }) = _ChangeIcon;+ const factory SpaceEvent.duplicate({+ ViewPB? space,+ }) = _Duplicate;const factory SpaceEvent.update({+ ViewPB? space,String? name,String? icon,String? iconColor,@@ -730,6 +776,7 @@ class SpaceEvent with _$SpaceEvent {required String name,required ViewLayoutPB layout,int? index,+ required bool openAfterCreate,}) = _CreatePage;const factory SpaceEvent.delete(ViewPB? space) = _Delete;const factory SpaceEvent.didReceiveSpaceUpdate() = _DidReceiveSpaceUpdate;diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_new_page_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_new_page_button.dartindex 1358492eb1..d661d3ec91 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_new_page_button.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_new_page_button.dart@@ -73,6 +73,7 @@ class _SidebarNewPageButtonState extends State<SidebarNewPageButton> {name: '',index: 0,layout: ViewLayoutPB.Document,+ openAfterCreate: true,),);} else {diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/create_space_popup.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/create_space_popup.dartindex 88c65a002c..e3ce26e835 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/create_space_popup.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/create_space_popup.dart@@ -48,7 +48,6 @@ class _CreateSpacePopupState extends State<CreateSpacePopup> {SizedBox.square(dimension: 56,child: SpaceIconPopup(-onIconChanged: (icon, iconColor) {spaceIcon = icon;spaceIconColor = iconColor;@@ -87,6 +86,7 @@ class _CreateSpacePopupState extends State<CreateSpacePopup> {iconColor: spaceIconColor!,permission: spacePermission,createNewPageByDefault: true,+ openAfterCreate: true,),);diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dartindex fc73631171..e4be64d5b9 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dart@@ -160,9 +160,14 @@ class _SpaceState extends State<_Space> {ViewPB space,ViewLayoutPB layout,) {- context- .read<SpaceBloc>()- .add(SpaceEvent.createPage(name: '', layout: layout, index: 0));+ context.read<SpaceBloc>().add(+ SpaceEvent.createPage(+ name: '',+ layout: layout,+ index: 0,+ openAfterCreate: true,+ ),+ );context.read<SpaceBloc>().add(SpaceEvent.expand(space, true));}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_header.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_header.dartindex 14d77e9da9..007facbc6b 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_header.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_header.dart@@ -179,8 +179,8 @@ class _SidebarSpaceHeaderState extends State<SidebarSpaceHeader> {: null;context.read<SpaceBloc>().add(SpaceEvent.changeIcon(- name,- iconColor,+ icon: name,+ iconColor: iconColor,),);break;@@ -211,7 +211,12 @@ class _SidebarSpaceHeaderState extends State<SidebarSpaceHeader> {autoSelectAllText: true,hintText: LocaleKeys.space_spaceName.tr(),onConfirm: (name, _) {- context.read<SpaceBloc>().add(SpaceEvent.rename(widget.space, name));+ context.read<SpaceBloc>().add(+ SpaceEvent.rename(+ space: widget.space,+ name: name,+ ),+ );},).show(context);}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_deletion.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_deletion.dartindex 13499ad98f..368cd19138 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_deletion.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_deletion.dart@@ -3,7 +3,7 @@ import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart';import 'package:appflowy/startup/startup.dart';import 'package:appflowy/user/application/user_service.dart';-import 'package:appflowy/util/navigator_context_exntesion.dart';+import 'package:appflowy/util/navigator_context_extension.dart';import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/shared_widget.dart';import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:appflowy_backend/log.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_sign_in_out.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_sign_in_out.dartindex 878ec16d7b..8d15c80181 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_sign_in_out.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_sign_in_out.dart@@ -5,7 +5,7 @@ import 'package:appflowy/startup/startup.dart';import 'package:appflowy/user/application/auth/auth_service.dart';import 'package:appflowy/user/application/prelude.dart';import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/magic_link_sign_in_buttons.dart';-import 'package:appflowy/util/navigator_context_exntesion.dart';+import 'package:appflowy/util/navigator_context_extension.dart';import 'package:appflowy/workspace/presentation/settings/widgets/setting_third_party_login.dart';import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_item.dartindex 8332a8f6f3..99c310c901 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_item.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_item.dart@@ -2,7 +2,7 @@ import 'package:appflowy/core/helpers/url_launcher.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/shared/share/constants.dart';import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/util/navigator_context_exntesion.dart';+import 'package:appflowy/util/navigator_context_extension.dart';import 'package:appflowy/workspace/application/action_navigation/action_navigation_bloc.dart';import 'package:appflowy/workspace/application/action_navigation/navigation_action.dart';import 'package:appflowy/workspace/presentation/settings/pages/sites/constants.dart';diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/files/settings_file_exporter_widget.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/files/settings_file_exporter_widget.dartindex 0e905b78b8..7c8e128ec6 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/files/settings_file_exporter_widget.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/files/settings_file_exporter_widget.dart@@ -1,9 +1,7 @@import 'dart:io';-import 'package:flutter/material.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/util/navigator_context_exntesion.dart';+import 'package:appflowy/util/navigator_context_extension.dart';import 'package:appflowy/workspace/application/export/document_exporter.dart';import 'package:appflowy/workspace/application/settings/settings_file_exporter_cubit.dart';import 'package:appflowy/workspace/application/settings/share/export_service.dart';@@ -18,6 +16,7 @@ import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/file_picker/file_picker_service.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:path/path.dart' as p;diff --git a/frontend/appflowy_flutter/packages/appflowy_backend/lib/ffi.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/ffi.dartindex 91c4149f64..a1eb8947df 100644--- a/frontend/appflowy_flutter/packages/appflowy_backend/lib/ffi.dart+++ b/frontend/appflowy_flutter/packages/appflowy_backend/lib/ffi.dart@@ -2,6 +2,7 @@import 'dart:ffi';import 'dart:io';+// ignore: import_of_legacy_library_into_null_safeimport 'package:ffi/ffi.dart' as ffi;import 'package:flutter/foundation.dart' as Foundation;diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dartindex 13357c31e5..e1b9308e32 100644--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart@@ -196,6 +196,7 @@ class FlowyButton extends StatelessWidget {if (Platform.isIOS || Platform.isAndroid) {return InkWell(+ splashFactory: Platform.isIOS ? NoSplash.splashFactory : null,onTap: disable ? null : onTap,onSecondaryTap: disable ? null : onSecondaryTap,borderRadius: radius ?? Corners.s6Border,diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lockindex 42554d59c2..27ee616618 100644--- a/frontend/appflowy_flutter/pubspec.lock+++ b/frontend/appflowy_flutter/pubspec.lock@@ -1543,10 +1543,10 @@ packages:dependency: transitivedescription:name: platform- sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"+ sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"url: "https://pub.dev"source: hosted- version: "3.1.5"+ version: "3.1.4"plugin_platform_interface:dependency: "direct dev"description:@@ -1941,10 +1941,10 @@ packages:dependency: transitivedescription:name: string_scanner- sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"+ sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"url: "https://pub.dev"source: hosted- version: "1.3.0"+ version: "1.2.0"string_validator:dependency: "direct main"description:@@ -2246,10 +2246,10 @@ packages:dependency: transitivedescription:name: vm_service- sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"+ sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"url: "https://pub.dev"source: hosted- version: "14.2.5"+ version: "14.2.1"watcher:dependency: transitivedescription:diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.jsonindex c36003a66e..c12ad66984 100644--- a/frontend/resources/translations/en.json+++ b/frontend/resources/translations/en.json@@ -2489,7 +2489,7 @@"createSpaceDescription": "Create multiple public and private spaces to better organize your work.","spaceName": "Space name","spaceNamePlaceholder": "e.g. Marketing, Engineering, HR",- "permission": "Permission",+ "permission": "Space permission","publicPermission": "Public","publicPermissionDescription": "All workspace members with full access","privatePermission": "Private",@@ -2511,7 +2511,24 @@"movePageToSpace": "Move page to space","cannotMovePageToDatabase": "Cannot move page to database","switchSpace": "Switch space",- "spaceNameCannotBeEmpty": "Space name cannot be empty"+ "spaceNameCannotBeEmpty": "Space name cannot be empty",+ "success": {+ "deleteSpace": "Space deleted successfully",+ "renameSpace": "Space renamed successfully",+ "duplicateSpace": "Space duplicated successfully",+ "updateSpace": "Space updated successfully"+ },+ "error": {+ "deleteSpace": "Failed to delete space",+ "renameSpace": "Failed to rename space",+ "duplicateSpace": "Failed to duplicate space",+ "updateSpace": "Failed to update space"+ },+ "createSpace": "Create space",+ "manageSpace": "Manage space",+ "renameSpace": "Rename space",+ "mSpaceIconColor": "Space icon color",+ "mSpaceIcon": "Space icon"},"publish": {"hasNotBeenPublished": "This page hasn't been published yet",