chore: Windows implements migration to protocol_handler_windows package

leanflutter · Jan 28, 2024 · a7d636e · a7d636e
1 parent 0d9d80e
commit a7d636e
Show file tree

Hide file tree

Showing 31 changed files with 523 additions and 288 deletions.
diff --git a/README-ZH.md b/README-ZH.md
@@ -21,7 +21,7 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
-- [protocol_handler](#protocol_handler)
+- [protocol\_handler](#protocol_handler)
   - [平台支持](#平台支持)
   - [截图](#截图)
   - [快速开始](#快速开始)
@@ -252,10 +252,11 @@ dependencies:
 #include "flutter_window.h"
 #include "utils.h"
 
-+#include <protocol_handler/protocol_handler_plugin.h>
++#include <protocol_handler_windows/protocol_handler_windows_plugin_c_api.h>
 
 int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
                       _In_ wchar_t *command_line, _In_ int show_command) {
++  // Replace protocol_handler_example with your_window_title.
 +  HWND hwnd = ::FindWindow(L"FLUTTER_RUNNER_WIN32_WINDOW", L"protocol_handler_example");
 +  if (hwnd != NULL) {
 +    DispatchToProtocolHandler(hwnd);

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ English | [简体中文](./README-ZH.md)
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
-- [protocol_handler](#protocol_handler)
+- [protocol\_handler](#protocol_handler)
   - [Platform Support](#platform-support)
   - [Screenshots](#screenshots)
   - [Quick Start](#quick-start)
@@ -253,10 +253,11 @@ Change the file `windows/runner/main.cpp` as follows:
 #include "flutter_window.h"
 #include "utils.h"
 
-+#include <protocol_handler/protocol_handler_plugin.h>
++#include <protocol_handler_windows/protocol_handler_windows_plugin_c_api.h>
 
 int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
                       _In_ wchar_t *command_line, _In_ int show_command) {
++  // Replace protocol_handler_example with your_window_title.
 +  HWND hwnd = ::FindWindow(L"FLUTTER_RUNNER_WIN32_WINDOW", L"protocol_handler_example");
 +  if (hwnd != NULL) {
 +    DispatchToProtocolHandler(hwnd);

diff --git a/packages/protocol_handler/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/protocol_handler/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,9 +6,11 @@ import FlutterMacOS
 import Foundation
 
 import protocol_handler_macos
+import screen_retriever
 import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   ProtocolHandlerMacosPlugin.register(with: registry.registrar(forPlugin: "ProtocolHandlerMacosPlugin"))
+  ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
   WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
 }
diff --git a/packages/protocol_handler/example/windows/flutter/generated_plugin_registrant.cc b/packages/protocol_handler/example/windows/flutter/generated_plugin_registrant.cc
@@ -6,12 +6,15 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <protocol_handler/protocol_handler_plugin.h>
+#include <protocol_handler_windows/protocol_handler_windows_plugin_c_api.h>
+#include <screen_retriever/screen_retriever_plugin.h>
 #include <window_manager/window_manager_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  ProtocolHandlerPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("ProtocolHandlerPlugin"));
+  ProtocolHandlerWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ProtocolHandlerWindowsPluginCApi"));
+  ScreenRetrieverPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
   WindowManagerPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("WindowManagerPlugin"));
 }
diff --git a/packages/protocol_handler/example/windows/flutter/generated_plugins.cmake b/packages/protocol_handler/example/windows/flutter/generated_plugins.cmake
@@ -3,7 +3,8 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  protocol_handler
+  protocol_handler_windows
+  screen_retriever
   window_manager
 )
 

diff --git a/packages/protocol_handler/example/windows/runner/main.cpp b/packages/protocol_handler/example/windows/runner/main.cpp
@@ -5,10 +5,11 @@
 #include "flutter_window.h"
 #include "utils.h"
 
-#include <protocol_handler/protocol_handler_plugin.h>
+#include <protocol_handler_windows/protocol_handler_windows_plugin_c_api.h>
 
 int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
                       _In_ wchar_t *command_line, _In_ int show_command) {
+  // Replace protocol_handler_example with your_window_title.
   HWND hwnd = ::FindWindow(L"FLUTTER_RUNNER_WIN32_WINDOW", L"protocol_handler_example");
   if (hwnd != NULL) {
     DispatchToProtocolHandler(hwnd);

diff --git a/packages/protocol_handler/lib/src/protocol_handler.dart b/packages/protocol_handler/lib/src/protocol_handler.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
-import 'package:protocol_handler/src/protocol_registrar.dart';
 import 'package:protocol_handler_platform_interface/protocol_handler_platform_interface.dart';
 
 class ProtocolHandler {
@@ -61,16 +60,16 @@ class ProtocolHandler {
     }
   }
 
+  /// A broadcast stream of incoming protocol urls.
+  Stream<String?> get onUrlReceived => _platform.onUrlReceived;
+
   /// Register a custom protocol
   ///
   /// [scheme] is the custom protocol scheme, e.g. `myapp`
   Future<void> register(String scheme) {
-    return protocolRegistrar.register(scheme);
+    return _platform.register(scheme);
   }
 
-  /// A broadcast stream of incoming protocol urls.
-  Stream<String?> get onUrlReceived => _platform.onUrlReceived;
-
   /// If the app launch was triggered by an protocol, it will give the link url,
   /// otherwise it will give null.
   Future<String?> getInitialUrl() {

diff --git a/packages/protocol_handler/lib/src/protocol_registrar.dart b/packages/protocol_handler/lib/src/protocol_registrar.dart
diff --git a/packages/protocol_handler/lib/src/protocol_registrar_impl_android.dart b/packages/protocol_handler/lib/src/protocol_registrar_impl_android.dart
diff --git a/packages/protocol_handler/lib/src/protocol_registrar_impl_ios.dart b/packages/protocol_handler/lib/src/protocol_registrar_impl_ios.dart
diff --git a/packages/protocol_handler/lib/src/protocol_registrar_impl_macos.dart b/packages/protocol_handler/lib/src/protocol_registrar_impl_macos.dart
diff --git a/packages/protocol_handler/lib/src/protocol_registrar_impl_windows_noop.dart b/packages/protocol_handler/lib/src/protocol_registrar_impl_windows_noop.dart
diff --git a/packages/protocol_handler/pubspec.yaml b/packages/protocol_handler/pubspec.yaml
@@ -20,7 +20,7 @@ dependencies:
   protocol_handler_ios: ^0.2.0
   protocol_handler_macos: ^0.2.0
   protocol_handler_platform_interface: ^0.2.0
-  win32_registry: ^1.0.2
+  protocol_handler_windows: ^0.2.0
 
 dev_dependencies:
   dependency_validator: ^3.0.0
@@ -38,4 +38,4 @@ flutter:
       macos:
         default_package: protocol_handler_macos
       windows:
-        pluginClass: ProtocolHandlerPlugin
+        default_package: protocol_handler_windows
diff --git a/packages/protocol_handler/windows/CMakeLists.txt b/packages/protocol_handler/windows/CMakeLists.txt