From 47bd3faaa915496f70408df5445e3d5ede4bd5b4 Mon Sep 17 00:00:00 2001 From: Adil Hanney Date: Wed, 19 Jul 2023 15:03:55 +0100 Subject: [PATCH 1/2] Automatic `flutter pub get` changes --- example/linux/flutter/generated_plugin_registrant.cc | 4 ++++ example/linux/flutter/generated_plugins.cmake | 1 + example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 ++ example/windows/flutter/generated_plugin_registrant.cc | 3 +++ example/windows/flutter/generated_plugins.cmake | 1 + 5 files changed, 11 insertions(+) diff --git a/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc index 1560fc809..158f759a3 100644 --- a/example/linux/flutter/generated_plugin_registrant.cc +++ b/example/linux/flutter/generated_plugin_registrant.cc @@ -6,10 +6,14 @@ #include "generated_plugin_registrant.h" +#include #include #include void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); + file_selector_plugin_register_with_registrar(file_selector_linux_registrar); g_autoptr(FlPluginRegistrar) pasteboard_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin"); pasteboard_plugin_register_with_registrar(pasteboard_registrar); diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake index 5a3c38825..93c755ee3 100644 --- a/example/linux/flutter/generated_plugins.cmake +++ b/example/linux/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + file_selector_linux pasteboard url_launcher_linux ) diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index 859873381..a6432e6e8 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -6,12 +6,14 @@ import FlutterMacOS import Foundation import device_info_plus +import file_selector_macos import pasteboard import path_provider_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) + FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) PasteboardPlugin.register(with: registry.registrar(forPlugin: "PasteboardPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) diff --git a/example/windows/flutter/generated_plugin_registrant.cc b/example/windows/flutter/generated_plugin_registrant.cc index 02129f58c..7d98a8822 100644 --- a/example/windows/flutter/generated_plugin_registrant.cc +++ b/example/windows/flutter/generated_plugin_registrant.cc @@ -6,10 +6,13 @@ #include "generated_plugin_registrant.h" +#include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { + FileSelectorWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FileSelectorWindows")); PasteboardPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PasteboardPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/example/windows/flutter/generated_plugins.cmake b/example/windows/flutter/generated_plugins.cmake index 82731c9d1..722afbe70 100644 --- a/example/windows/flutter/generated_plugins.cmake +++ b/example/windows/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + file_selector_windows pasteboard url_launcher_windows ) From 020e669a4d68a34d7629407692e5e53a4fa66a9f Mon Sep 17 00:00:00 2001 From: Adil Hanney Date: Wed, 19 Jul 2023 15:05:58 +0100 Subject: [PATCH 2/2] Replace `View.of` with `MediaQuery.of` --- lib/src/widgets/editor.dart | 4 ++-- lib/src/widgets/raw_editor.dart | 2 +- lib/src/widgets/text_block.dart | 2 +- test/widgets/controller_test.dart | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/src/widgets/editor.dart b/lib/src/widgets/editor.dart index 03db3ac6b..d757b813e 100644 --- a/lib/src/widgets/editor.dart +++ b/lib/src/widgets/editor.dart @@ -478,8 +478,8 @@ class QuillEditorState extends State selectionColor = selectionTheme.selectionColor ?? cupertinoTheme.primaryColor.withOpacity(0.40); cursorRadius ??= const Radius.circular(2); - cursorOffset = - Offset(iOSHorizontalOffset / View.of(context).devicePixelRatio, 0); + cursorOffset = Offset( + iOSHorizontalOffset / MediaQuery.of(context).devicePixelRatio, 0); } else { textSelectionControls = materialTextSelectionControls; paintCursorAboveText = false; diff --git a/lib/src/widgets/raw_editor.dart b/lib/src/widgets/raw_editor.dart index 1753c87db..2b3ba3265 100644 --- a/lib/src/widgets/raw_editor.dart +++ b/lib/src/widgets/raw_editor.dart @@ -973,7 +973,7 @@ class RawEditorState extends EditorState widget.selectionColor, widget.enableInteractiveSelection, _hasFocus, - View.of(context).devicePixelRatio, + MediaQuery.of(context).devicePixelRatio, _cursorCont); return editableTextLine; } diff --git a/lib/src/widgets/text_block.dart b/lib/src/widgets/text_block.dart index 3906fb88b..4adaac37b 100644 --- a/lib/src/widgets/text_block.dart +++ b/lib/src/widgets/text_block.dart @@ -159,7 +159,7 @@ class EditableTextBlock extends StatelessWidget { color, enableInteractiveSelection, hasFocus, - View.of(context).devicePixelRatio, + MediaQuery.of(context).devicePixelRatio, cursorCont); final nodeTextDirection = getDirectionOfNode(line); children.add(Directionality( diff --git a/test/widgets/controller_test.dart b/test/widgets/controller_test.dart index 415c51f63..0221d32e9 100644 --- a/test/widgets/controller_test.dart +++ b/test/widgets/controller_test.dart @@ -104,7 +104,7 @@ void main() { test('getAllIndividualSelectionStylesAndEmbed', () { controller ..formatText(0, 2, Attribute.bold) - ..replaceText(2, 2, BlockEmbed.image('/test'),null) + ..replaceText(2, 2, BlockEmbed.image('/test'), null) ..updateSelection(const TextSelection(baseOffset: 0, extentOffset: 4), ChangeSource.REMOTE); final result = controller.getAllIndividualSelectionStylesAndEmbed();