From 17499834565272d6a34f824ec895a6544b644e73 Mon Sep 17 00:00:00 2001 From: Mukund-Tandon Date: Mon, 14 Aug 2023 13:29:55 +0530 Subject: [PATCH] refactor: resolved merge conflicts --- .../import/import_from_notion_widget.dart | 5 +++-- .../home/menu/sidebar/import/import_panel.dart | 8 ++++---- .../import/importer/notion_importer.dart | 6 ++++-- 3 files changed, 11 insertions(+), 8 deletions(-) rename frontend/appflowy_flutter/lib/workspace/presentation/home/menu/{app/header => sidebar}/import/import_from_notion_widget.dart (96%) rename frontend/appflowy_flutter/lib/workspace/presentation/home/menu/{app/header => sidebar}/import/importer/notion_importer.dart (97%) diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/import/import_from_notion_widget.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/import_from_notion_widget.dart similarity index 96% rename from frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/import/import_from_notion_widget.dart rename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/import_from_notion_widget.dart index 85a8903055db..11875c5d1c6a 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/import/import_from_notion_widget.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/import_from_notion_widget.dart @@ -1,5 +1,5 @@ import 'package:appflowy/startup/startup.dart'; -import 'package:appflowy/workspace/presentation/home/menu/app/header/import/import_type.dart'; +import 'package:appflowy/workspace/presentation/home/menu/sidebar/import/import_type.dart'; import 'package:appflowy_popover/appflowy_popover.dart'; import 'package:flowy_infra/file_picker/file_picker_service.dart'; import 'package:flowy_infra/image.dart'; @@ -39,7 +39,8 @@ class ImportFromNotionWidget extends StatelessWidget { child: FlowyButton( leftIcon: FlowySvg( name: 'notion_logo', - color: Theme.of(context).colorScheme.tertiary,), + color: Theme.of(context).colorScheme.tertiary, + ), leftIconSize: const Size.square(20), text: FlowyText.medium( LocaleKeys.importPanel_importFromNotionMarkdownZip.tr(), diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/import_panel.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/import_panel.dart index 1679525b1cf8..f8e70b44113b 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/import_panel.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/import_panel.dart @@ -6,7 +6,9 @@ import 'package:appflowy/plugins/document/application/document_data_pb_extension import 'package:appflowy/plugins/document/presentation/editor_plugins/migration/editor_migration.dart'; import 'package:appflowy/startup/startup.dart'; import 'package:appflowy/workspace/application/settings/share/import_service.dart'; +import 'package:appflowy/workspace/presentation/home/menu/sidebar/import/import_from_notion_widget.dart'; import 'package:appflowy/workspace/presentation/home/menu/sidebar/import/import_type.dart'; +import 'package:appflowy/workspace/presentation/home/menu/sidebar/import/importer/notion_importer.dart'; import 'package:appflowy_backend/protobuf/flowy-folder2/protobuf.dart'; import 'package:flowy_infra/file_picker/file_picker_service.dart'; @@ -17,8 +19,6 @@ import 'package:flutter/material.dart'; import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:path/path.dart' as p; -import 'package:appflowy/workspace/presentation/home/menu/app/header/import/import_from_notion_widget.dart'; -import 'package:appflowy/workspace/presentation/home/menu/app/header/import/importer/notion_importer.dart'; typedef ImportCallback = void Function( ImportType? type, @@ -115,8 +115,8 @@ class ImportPanel extends StatelessWidget { ); await notionImporter.importFromNotion(type, path); if (context.mounted) { - FlowyOverlay.pop(context); - } + FlowyOverlay.pop(context); + } importCallback(null, ImportFromNotionType.markdownZip, '', null); } }, diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/import/importer/notion_importer.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/importer/notion_importer.dart similarity index 97% rename from frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/import/importer/notion_importer.dart rename to frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/importer/notion_importer.dart index c111008da29b..c8cfa3e50d5a 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/header/import/importer/notion_importer.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/importer/notion_importer.dart @@ -4,8 +4,8 @@ import 'dart:io'; import 'package:appflowy/startup/startup.dart'; import 'package:appflowy/workspace/application/settings/prelude.dart'; import 'package:appflowy/workspace/application/view/view_service.dart'; -import 'package:appflowy/workspace/presentation/home/menu/app/header/import/import_panel.dart'; -import 'package:appflowy/workspace/presentation/home/menu/app/header/import/import_type.dart'; +import 'package:appflowy/workspace/presentation/home/menu/sidebar/import/import_type.dart'; + import 'package:appflowy_backend/protobuf/flowy-folder2/protobuf.dart'; import 'package:archive/archive_io.dart'; import 'package:collection/collection.dart'; @@ -13,6 +13,8 @@ import 'package:flowy_infra/uuid.dart'; import 'package:flutter/foundation.dart'; import 'package:path/path.dart' as p; +import '../import_panel.dart'; + class NotionImporter { NotionImporter({ required this.parentViewId,