fix: fixed merge conflicts

AppFlowy-IO · Aug 18, 2023 · 6062165 · 6062165
1 parent f2e4e68
commit 6062165
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/frontend/appflowy_flutter/integration_test/util/common_operations.dart b/frontend/appflowy_flutter/integration_test/util/common_operations.dart
@@ -1,3 +1,4 @@
+import 'package:appflowy/generated/flowy_svgs.g.dart';
 import 'package:appflowy/workspace/presentation/home/menu/sidebar/sidebar_new_page_button.dart';
 import 'package:appflowy/workspace/presentation/home/menu/view/draggable_view_item.dart';
 import 'package:appflowy/workspace/presentation/home/menu/view/view_action_type.dart';
@@ -11,8 +12,8 @@ import 'package:appflowy/user/presentation/skip_log_in_screen.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/settings_language_view.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_infra/image.dart';
 import 'package:flowy_infra_ui/widget/buttons/primary_button.dart';
+import 'package:flowy_svg/flowy_svg.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -415,7 +416,7 @@ extension CommonOperations on WidgetTester {
  final pageToggleButton = find.descendant(
  of: findPageName(name),
  matching: find.byWidgetPredicate(
- (widget) => widget is FlowySvg && widget.name == 'home/drop_down_hide',
+ (widget) => widget is FlowySvg && widget.svg == FlowySvgs.drop_menu_hide_m,
  ),
  );
  await tap(pageToggleButton);

diff --git a/...lutter/lib/workspace/presentation/home/menu/sidebar/import/import_from_notion_widget.dart b/...lutter/lib/workspace/presentation/home/menu/sidebar/import/import_from_notion_widget.dart
@@ -1,9 +1,10 @@
+
 import 'package:appflowy/startup/startup.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';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flowy_svg/flowy_svg.dart';
 import 'package:flutter/material.dart';
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -38,7 +39,7 @@ class ImportFromNotionWidget extends StatelessWidget {
  triggerActions: PopoverTriggerFlags.none,
  child: FlowyButton(
  leftIcon: FlowySvg(
- name: 'notion_logo',
+ const FlowySvgData('notion_logo'),
  color: Theme.of(context).colorScheme.tertiary,
  ),
  leftIconSize: const Size.square(20),