refactor: resolved merge conflicts

AppFlowy-IO · Aug 14, 2023 · 1749983 · 1749983
1 parent 17dedc6
commit 1749983
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/...der/import/import_from_notion_widget.dart → ...bar/import/import_from_notion_widget.dart b/...der/import/import_from_notion_widget.dart → ...bar/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/...nd/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/import/import_panel.dart b/...nd/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/...ader/import/importer/notion_importer.dart → ...ebar/import/importer/notion_importer.dart b/...ader/import/importer/notion_importer.dart → ...ebar/import/importer/notion_importer.dart
@@ -4,15 +4,17 @@ 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';
 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,