Merge pull request 'Flutter3, local_desktop_notifications on linux again' (#484) from flutter3_notify into trunk

Reviewed-on: #484 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
2022-06-21 21:08:47 +00:00 · 2022-06-21 21:08:47 +00:00 · c01860f1de
parent a83b357f0f c7e6cfcbc1
commit c01860f1de
17 changed files with 412 additions and 162 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -8,7 +8,7 @@ clone:

 steps:
  - name: clone
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:3.0.1
    environment:
      buildbot_key_b64:
        from_secret: buildbot_key_b64
@ -24,7 +24,7 @@ steps:
      - git checkout $DRONE_COMMIT

  - name: fetch
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:3.0.1
    volumes:
      - name: deps
        path: /root/.pub-cache
@ -47,7 +47,7 @@ steps:
  #    #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting

  - name: build-linux
-    image: openpriv/flutter-desktop:linux-fstable-2.8.0
+    image: openpriv/flutter-desktop:linux-fstable-3.0.1
    volumes:
      - name: deps
        path: /root/.pub-cache
@ -61,7 +61,7 @@ steps:
      - rm -r cwtch

  - name: test-build-android
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:3.0.1
    when:
      event: pull_request
    volumes:
@ -71,7 +71,7 @@ steps:
      - flutter build apk --debug

  - name: build-android
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:3.0.1
    when:
      event: push
    environment:
@ -95,7 +95,7 @@ steps:
      #- cp build/app/outputs/flutter-apk/app-debug.apk deploy/android

  - name: widget-tests
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:3.0.1
    volumes:
      - name: deps
        path: /root/.pub-cache
@ -177,7 +177,7 @@ clone:

 steps:
  - name: clone
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.0.1
    environment:
      buildbot_key_b64:
        from_secret: buildbot_key_b64
@ -195,7 +195,7 @@ steps:
      - git checkout $Env:DRONE_COMMIT

  - name: fetch
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.0.1
    commands:
      - git describe --tags --abbrev=1 > VERSION
      - powershell -command "Get-Date -Format 'yyyy-MM-dd-HH-mm'" > BUILDDATE
@ -203,7 +203,7 @@ steps:
      - .\fetch-libcwtch-go.ps1

  - name: build-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.0.1
    commands:
      - flutter pub get
      - $Env:version += type .\VERSION
@ -260,7 +260,7 @@ steps:
      - move *.sha512 deploy\$Env:builddir

  - name: deploy-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.0.1
    when:
      event: push
      status: [ success ]
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
 }

 android {
-    compileSdkVersion 30
+    compileSdkVersion 31

    sourceSets {
        main.java.srcDirs += 'src/main/kotlin'
@ -48,7 +48,7 @@ android {
        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
        applicationId "im.cwtch.flwtch"
        minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
    }
--- a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
+++ b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
@ -1,16 +1,21 @@
 // Generated file.
+//
 // If you wish to remove Flutter's multidex support, delete this entire file.
+//
+// Modifications to this file should be done in a copy under a different name
+// as this file may be regenerated.

 package io.flutter.app;

+import android.app.Application;
 import android.content.Context;
 import androidx.annotation.CallSuper;
 import androidx.multidex.MultiDex;

 /**
- * Extension of {@link io.flutter.app.FlutterApplication}, adding multidex support.
+ * Extension of {@link android.app.Application}, adding multidex support.
 */
-public class FlutterMultiDexApplication extends FlutterApplication {
+public class FlutterMultiDexApplication extends Application {
  @Override
  @CallSuper
  protected void attachBaseContext(Context base) {
--- a/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt
+++ b/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt
@ -536,10 +536,15 @@ class MainActivity: FlutterActivity() {
        Log.i("MainActivity.kt", "onResume")
        if (myReceiver == null) {
            Log.i("MainActivity.kt", "onResume registering local broadcast receiver / event bus forwarder")
-            val mc = MethodChannel(flutterEngine?.dartExecutor?.binaryMessenger, CWTCH_EVENTBUS)
-            val filter = IntentFilter("im.cwtch.flwtch.broadcast.SERVICE_EVENT_BUS")
-            myReceiver = MyBroadcastReceiver(mc)
-            LocalBroadcastManager.getInstance(applicationContext).registerReceiver(myReceiver!!, filter)
+            val bm = flutterEngine?.dartExecutor?.binaryMessenger;
+            if (bm != null) {
+                val mc = MethodChannel(bm, CWTCH_EVENTBUS)
+
+                val filter = IntentFilter("im.cwtch.flwtch.broadcast.SERVICE_EVENT_BUS")
+                myReceiver = MyBroadcastReceiver(mc)
+                LocalBroadcastManager.getInstance(applicationContext)
+                    .registerReceiver(myReceiver!!, filter)
+            }
        }

        // ReconnectCwtchForeground which will resync counters and settings...
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.31'
    repositories {
        google()
        // jCenter() no longer exists... https://blog.gradle.org/jcenter-shutdown
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Mon Jun 20 10:33:21 PDT 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+zipStoreBase=GRADLE_USER_HOME
--- a/lib/l10n/custom_material_delegate.dart
+++ b/lib/l10n/custom_material_delegate.dart
@ -312,6 +312,182 @@ class MaterialLocalizationLu extends MaterialLocalizations {
  @override
  String get viewLicensesButtonLabel => 'LIZENZEN ANZEIGEN';

+  // ***** NEW *****
+
+  @override
+  String get keyboardKeyAlt => 'Alt';
+
+  @override
+  String get keyboardKeyAltGraph => 'AltGr';
+
+  @override
+  String get keyboardKeyBackspace => 'Backspace';
+
+  @override
+  String get keyboardKeyCapsLock => 'Caps Lock';
+
+  @override
+  String get keyboardKeyChannelDown => 'Kanal Erof';
+
+  @override
+  String get keyboardKeyChannelUp => 'Kanal Up';
+
+  @override
+  String get keyboardKeyControl => 'Ctrl';
+
+  @override
+  String get keyboardKeyDelete => 'Del';
+
+  @override
+  String get keyboardKeyEisu => 'Eisū';
+
+  @override
+  String get keyboardKeyEject => 'Eject';
+
+  @override
+  String get keyboardKeyEnd => 'End';
+
+  @override
+  String get keyboardKeyEscape => 'Esc';
+
+  @override
+  String get keyboardKeyFn => 'Fn';
+
+  @override
+  String get keyboardKeyHangulMode => 'Hangul Mode';
+
+  @override
+  String get keyboardKeyHanjaMode => 'Hanja Mode';
+
+  @override
+  String get keyboardKeyHankaku => 'Hankaku';
+
+  @override
+  String get keyboardKeyHiragana => 'Hiragana';
+
+  @override
+  String get keyboardKeyHiraganaKatakana => 'Hiragana Katakana';
+
+  @override
+  String get keyboardKeyHome => 'Home';
+
+  @override
+  String get keyboardKeyInsert => 'Insert';
+
+  @override
+  String get keyboardKeyKanaMode => 'Kana Mode';
+
+  @override
+  String get keyboardKeyKanjiMode => 'Kanji Mode';
+
+  @override
+  String get keyboardKeyKatakana => 'Katakana';
+
+  @override
+  String get keyboardKeyMeta => 'Meta';
+
+  @override
+  String get keyboardKeyMetaMacOs => 'Command';
+
+  @override
+  String get keyboardKeyMetaWindows => 'Win';
+
+  @override
+  String get keyboardKeyNumLock => 'Num Lock';
+
+  @override
+  String get keyboardKeyNumpad0 => 'Num 0';
+
+  @override
+  String get keyboardKeyNumpad1 => 'Num 1';
+
+  @override
+  String get keyboardKeyNumpad2 => 'Num 2';
+
+  @override
+  String get keyboardKeyNumpad3 => 'Num 3';
+
+  @override
+  String get keyboardKeyNumpad4 => 'Num 4';
+
+  @override
+  String get keyboardKeyNumpad5 => 'Num 5';
+
+  @override
+  String get keyboardKeyNumpad6 => 'Num 6';
+
+  @override
+  String get keyboardKeyNumpad7 => 'Num 7';
+
+  @override
+  String get keyboardKeyNumpad8 => 'Num 8';
+
+  @override
+  String get keyboardKeyNumpad9 => 'Num 9';
+
+  @override
+  String get keyboardKeyNumpadAdd => 'Num +';
+
+  @override
+  String get keyboardKeyNumpadComma => 'Num ,';
+
+  @override
+  String get keyboardKeyNumpadDecimal => 'Num .';
+
+  @override
+  String get keyboardKeyNumpadDivide => 'Num /';
+
+  @override
+  String get keyboardKeyNumpadEnter => 'Num Enter';
+
+  @override
+  String get keyboardKeyNumpadEqual => 'Num =';
+
+  @override
+  String get keyboardKeyNumpadMultiply => 'Num *';
+
+  @override
+  String get keyboardKeyNumpadParenLeft => 'Num (';
+
+  @override
+  String get keyboardKeyNumpadParenRight => 'Num )';
+
+  @override
+  String get keyboardKeyNumpadSubtract => 'Num -';
+
+  @override
+  String get keyboardKeyPageDown => 'PgDown';
+
+  @override
+  String get keyboardKeyPageUp => 'PgUp';
+
+  @override
+  String get keyboardKeyPower => 'Power';
+
+  @override
+  String get keyboardKeyPowerOff => 'Power Off';
+
+  @override
+  String get keyboardKeyPrintScreen => 'Print Screen';
+
+  @override
+  String get keyboardKeyRomaji => 'Romaji';
+
+  @override
+  String get keyboardKeyScrollLock => 'Scroll Lock';
+
+  @override
+  String get keyboardKeySelect => 'Select';
+
+  @override
+  String get keyboardKeySpace => 'Spasie';
+
+  @override
+  String get keyboardKeyZenkaku => 'Zenkaku';
+
+  @override
+  String get keyboardKeyZenkakuHankaku => 'Zenkaku Hankaku';
+
  @override
  String aboutListTileTitle(String applicationName) {
    return aboutListTileTitleRaw.replaceFirst("$applicationName", applicationName);
--- a/lib/notification_manager.dart
+++ b/lib/notification_manager.dart
@ -10,6 +10,8 @@ import 'package:desktop_notifications/desktop_notifications.dart' as linux_notif
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:flutter_local_notifications_linux/flutter_local_notifications_linux.dart';
 import 'package:flutter_local_notifications_linux/src/model/hint.dart';
+import 'package:flutter_local_notifications_linux/src/model/icon.dart';
+

 import 'package:path/path.dart' as path;

@ -55,22 +57,33 @@ class WindowsNotificationManager implements NotificationsManager {
  }
 }

-// LinuxNotificationsManager uses the desktop_notifications package to implement
-// the standard dbus-powered linux desktop notifications.
-class LinuxNotificationsManager implements NotificationsManager {
-  int previous_id = 0;
-  late linux_notifications.NotificationsClient client;
-  late Future<void> Function(String, int) notificationSelectConvo;
-  late String assetsPath;
+class NotificationPayload {
+  late String profileOnion;
+  late int convoId;

-  LinuxNotificationsManager(Future<void> Function(String, int) notificationSelectConvo) {
-    this.client = linux_notifications.NotificationsClient();
-    this.notificationSelectConvo = notificationSelectConvo;
-    scheduleMicrotask(() async {
-      assetsPath = await detectLinuxAssetsPath();
-    });
+  NotificationPayload(String po, int cid) {
+    profileOnion = po;
+    convoId = cid;
  }

+  NotificationPayload.fromJson(Map<String, dynamic> json)
+      : profileOnion = json['profileOnion'],
+        convoId = json['convoId'];
+
+  Map<String, dynamic> toJson() => {
+        'profileOnion': profileOnion,
+        'convoId': convoId,
+      };
+}
+
+// FlutterLocalNotificationsPlugin based NotificationManager that handles MacOS and Linux
+// TODO: Windows support is being worked on, check back and migrate to that too when it lands
+class NixNotificationManager implements NotificationsManager {
+  late FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin;
+  late Future<void> Function(String, int) notificationSelectConvo;
+  late String linuxAssetsPath;
+
+
  // Cwtch can install in non flutter supported ways on linux, this code detects where the assets are on Linux
  Future<String> detectLinuxAssetsPath() async {
    var devStat = FileStat.stat("assets");
@ -90,53 +103,26 @@ class LinuxNotificationsManager implements NotificationsManager {
    return "";
  }

-  Future<void> notify(String message, String profile, int conversationId) async {
-    var iconPath = Uri.file(path.join(assetsPath, "assets/knott.png"));
-    client.notify(message, appName: "cwtch", appIcon: iconPath.toString(), replacesId: this.previous_id).then((linux_notifications.Notification value) async {
-      previous_id = value.id;
-      if ((await value.closeReason) == linux_notifications.NotificationClosedReason.dismissed) {
-        this.notificationSelectConvo(profile, conversationId);
-      }
-    });
-  }
-}
-
-class NotificationPayload {
-  late String profileOnion;
-  late int convoId;
-
-  NotificationPayload(String po, int cid) {
-    profileOnion = po;
-    convoId = cid;
-  }
-
-  NotificationPayload.fromJson(Map<String, dynamic> json)
-      : profileOnion = json['profileOnion'],
-        convoId = json['convoId'];
-
-  Map<String, dynamic> toJson() => {
-        'profileOnion': profileOnion,
-        'convoId': convoId,
-      };
-}
-
-// FlutterLocalNotificationsPlugin based NotificationManager that handles MacOS
-// Todo: work with author to allow settings of asset_path so we can use this for Linux and deprecate the LinuxNotificationManager
-// Todo: it can also handle Android, do we want to migrate away from our manual solution?
-class NixNotificationManager implements NotificationsManager {
-  late FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin;
-  late Future<void> Function(String, int) notificationSelectConvo;
-
  NixNotificationManager(Future<void> Function(String, int) notificationSelectConvo) {
    this.notificationSelectConvo = notificationSelectConvo;
    flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();

-    final MacOSInitializationSettings initializationSettingsMacOS = MacOSInitializationSettings(defaultPresentSound: false);
-    final LinuxInitializationSettings initializationSettingsLinux =
-        LinuxInitializationSettings(defaultActionName: 'Open notification', defaultIcon: AssetsLinuxIcon('assets/knott.png'), defaultSuppressSound: true);
-
-    final InitializationSettings initializationSettings = InitializationSettings(android: null, iOS: null, macOS: initializationSettingsMacOS, linux: initializationSettingsLinux);
    scheduleMicrotask(() async {
+
+      if (Platform.isLinux) {
+        linuxAssetsPath = await detectLinuxAssetsPath();
+      } else {
+        linuxAssetsPath = "";
+      }
+
+      final MacOSInitializationSettings initializationSettingsMacOS = MacOSInitializationSettings(defaultPresentSound: false);
+      var linuxIcon = FilePathLinuxIcon( path.join(linuxAssetsPath, 'assets/knott.png'));
+
+      final LinuxInitializationSettings initializationSettingsLinux =
+      LinuxInitializationSettings(defaultActionName: 'Open notification', defaultIcon: linuxIcon, defaultSuppressSound: true);
+
+      final InitializationSettings initializationSettings = InitializationSettings(android: null, iOS: null, macOS: initializationSettingsMacOS, linux: initializationSettingsLinux);
+
      flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<MacOSFlutterLocalNotificationsPlugin>()?.requestPermissions(
            alert: true,
            badge: false,
@ -150,7 +136,8 @@ class NixNotificationManager implements NotificationsManager {
  Future<void> notify(String message, String profile, int conversationId) async {
    if (!globalAppState.focus) {
      // Warning: Only use title field on Linux, body field will render links as clickable
-      await flutterLocalNotificationsPlugin.show(0, message, '', NotificationDetails(linux: LinuxNotificationDetails(suppressSound: true, category: LinuxNotificationCategory.imReceived())),
+      await flutterLocalNotificationsPlugin.show(0, message, '',
+          NotificationDetails(linux: LinuxNotificationDetails(suppressSound: true, category: LinuxNotificationCategory.imReceived(), icon: FilePathLinuxIcon(path.join(linuxAssetsPath, 'assets/knott.png')))),
          payload: jsonEncode(NotificationPayload(profile, conversationId)));
    }
  }
@ -168,7 +155,7 @@ class NixNotificationManager implements NotificationsManager {
 NotificationsManager newDesktopNotificationsManager(Future<void> Function(String profileOnion, int convoId) notificationSelectConvo) {
  if (Platform.isLinux && !Platform.isAndroid) {
    try {
-      return LinuxNotificationsManager(notificationSelectConvo);
+      return NixNotificationManager(notificationSelectConvo);
    } catch (e) {
      EnvironmentConfig.debugLog("Failed to create LinuxNotificationManager. Switching off notifications.");
    }
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@ -6,10 +6,14 @@

 #include "generated_plugin_registrant.h"

+#include <screen_retriever/screen_retriever_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 #include <window_manager/window_manager_plugin.h>

 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
+  screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);
  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@ -3,10 +3,14 @@
 #

 list(APPEND FLUTTER_PLUGIN_LIST
+  screen_retriever
  url_launcher_linux
  window_manager
 )

+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)

 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@ -15,3 +19,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@ -5,12 +5,18 @@
 import FlutterMacOS
 import Foundation

+import flutter_local_notifications
 import package_info_plus_macos
 import path_provider_macos
+import screen_retriever
 import url_launcher_macos
+import window_manager

 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
+  WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
 }
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@ -1,33 +1,51 @@
 PODS:
+  - flutter_local_notifications (0.0.1):
+    - FlutterMacOS
  - FlutterMacOS (1.0.0)
  - package_info_plus_macos (0.0.1):
    - FlutterMacOS
  - path_provider_macos (0.0.1):
    - FlutterMacOS
+  - screen_retriever (0.0.1):
+    - FlutterMacOS
  - url_launcher_macos (0.0.1):
    - FlutterMacOS
+  - window_manager (0.2.0):
+    - FlutterMacOS

 DEPENDENCIES:
+  - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
  - FlutterMacOS (from `Flutter/ephemeral`)
  - package_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos`)
  - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`)
+  - screen_retriever (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos`)
  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
+  - window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`)

 EXTERNAL SOURCES:
+  flutter_local_notifications:
+    :path: Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos
  FlutterMacOS:
    :path: Flutter/ephemeral
  package_info_plus_macos:
    :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos
  path_provider_macos:
    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
+  screen_retriever:
+    :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos
  url_launcher_macos:
    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
+  window_manager:
+    :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos

 SPEC CHECKSUMS:
+  flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
  FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
  package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c
-  path_provider_macos: a0a3fd666cb7cd0448e936fb4abad4052961002b
-  url_launcher_macos: 45af3d61de06997666568a7149c1be98b41c95d4
+  path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
+  screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
+  url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
+  window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8

 PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c

--- a/pubspec.lock
+++ b/pubspec.lock
@ -15,27 +15,20 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.8.0"
-  ansicolor:
-    dependency: transitive
-    description:
-      name: ansicolor
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.1"
  archive:
    dependency: transitive
    description:
      name: archive
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.1.6"
+    version: "3.1.11"
  args:
    dependency: transitive
    description:
      name: args
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
  async:
    dependency: transitive
    description:
@ -56,7 +49,7 @@ packages:
      name: build
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
  build_config:
    dependency: transitive
    description:
@ -70,7 +63,7 @@ packages:
      name: build_daemon
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
  build_resolvers:
    dependency: transitive
    description:
@ -84,7 +77,7 @@ packages:
      name: build_runner
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.7"
+    version: "2.1.11"
  build_runner_core:
    dependency: transitive
    description:
@ -105,7 +98,7 @@ packages:
      name: built_value
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "8.1.4"
+    version: "8.3.3"
  characters:
    dependency: transitive
    description:
@ -127,6 +120,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.1"
+  cli_dialog:
+    dependency: transitive
+    description:
+      name: cli_dialog
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.0"
  cli_util:
    dependency: transitive
    description:
@ -154,14 +154,14 @@ packages:
      name: collection
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
  convert:
    dependency: transitive
    description:
      name: convert
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
  crypto:
    dependency: "direct main"
    description:
@ -175,7 +175,14 @@ packages:
      name: cupertino_icons
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
+  dart_console:
+    dependency: transitive
+    description:
+      name: dart_console
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
  dart_style:
    dependency: transitive
    description:
@ -189,7 +196,7 @@ packages:
      name: dbus
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.7.1"
+    version: "0.7.4"
  desktop_notifications:
    dependency: "direct main"
    description:
@ -203,14 +210,14 @@ packages:
      name: fake_async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
  ffi:
    dependency: "direct main"
    description:
      name: ffi
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.2"
+    version: "1.2.1"
  file:
    dependency: transitive
    description:
@ -224,7 +231,7 @@ packages:
      name: file_picker
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.3.3"
+    version: "4.6.1"
  file_picker_desktop:
    dependency: "direct main"
    description:
@ -238,7 +245,7 @@ packages:
      name: fixnum
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
  flutter:
    dependency: "direct main"
    description: flutter
@ -262,14 +269,14 @@ packages:
      name: flutter_local_notifications
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "9.3.2"
+    version: "9.6.1"
  flutter_local_notifications_linux:
    dependency: transitive
    description:
      name: flutter_local_notifications_linux
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.4.2"
+    version: "0.5.0+1"
  flutter_local_notifications_platform_interface:
    dependency: transitive
    description:
@ -288,7 +295,7 @@ packages:
      name: flutter_plugin_android_lifecycle
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
  flutter_test:
    dependency: transitive
    description: flutter
@ -305,12 +312,19 @@ packages:
      name: frontend_server_client
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
  fuchsia_remote_debug_protocol:
    dependency: transitive
    description: flutter
    source: sdk
    version: "0.0.0"
+  get_it:
+    dependency: transitive
+    description:
+      name: get_it
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "7.2.0"
  gherkin:
    dependency: transitive
    description:
@ -324,7 +338,7 @@ packages:
      name: glob
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
  graphs:
    dependency: transitive
    description:
@ -345,21 +359,21 @@ packages:
      name: http_multi_server
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.1"
+    version: "3.2.1"
  http_parser:
    dependency: transitive
    description:
      name: http_parser
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.0.0"
+    version: "4.0.1"
  image:
    dependency: transitive
    description:
      name: image
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.1.1"
+    version: "3.2.0"
  integration_test:
    dependency: transitive
    description: flutter
@ -385,14 +399,14 @@ packages:
      name: js
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
  json_annotation:
    dependency: transitive
    description:
      name: json_annotation
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.4.0"
+    version: "4.5.0"
  logging:
    dependency: transitive
    description:
@ -407,6 +421,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
  meta:
    dependency: transitive
    description:
@ -420,14 +441,14 @@ packages:
      name: mime
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
  msix:
    dependency: "direct dev"
    description:
      name: msix
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.8.3"
+    version: "3.6.2"
  nested:
    dependency: transitive
    description:
@ -441,21 +462,21 @@ packages:
      name: package_config
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
  package_info_plus:
    dependency: "direct main"
    description:
      name: package_info_plus
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.3.0"
+    version: "1.4.2"
  package_info_plus_linux:
    dependency: transitive
    description:
      name: package_info_plus_linux
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.3"
+    version: "1.0.5"
  package_info_plus_macos:
    dependency: transitive
    description:
@ -476,84 +497,84 @@ packages:
      name: package_info_plus_web
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
  package_info_plus_windows:
    dependency: transitive
    description:
      name: package_info_plus_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
  path:
    dependency: transitive
    description:
      name: path
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
  path_provider:
    dependency: "direct main"
    description:
      name: path_provider
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.8"
+    version: "2.0.11"
  path_provider_android:
    dependency: transitive
    description:
      name: path_provider_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.11"
+    version: "2.0.15"
  path_provider_ios:
    dependency: transitive
    description:
      name: path_provider_ios
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.7"
+    version: "2.0.10"
  path_provider_linux:
    dependency: transitive
    description:
      name: path_provider_linux
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.5"
+    version: "2.1.7"
  path_provider_macos:
    dependency: transitive
    description:
      name: path_provider_macos
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
  path_provider_platform_interface:
    dependency: transitive
    description:
      name: path_provider_platform_interface
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
  path_provider_windows:
    dependency: transitive
    description:
      name: path_provider_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
  petitparser:
    dependency: transitive
    description:
      name: petitparser
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.4.0"
+    version: "5.0.0"
  platform:
    dependency: transitive
    description:
      name: platform
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.2"
+    version: "3.1.0"
  plugin_platform_interface:
    dependency: transitive
    description:
@ -567,7 +588,7 @@ packages:
      name: pool
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.5.0"
+    version: "1.5.1"
  process:
    dependency: transitive
    description:
@ -581,14 +602,14 @@ packages:
      name: provider
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "5.0.0"
+    version: "6.0.3"
  pub_semver:
    dependency: transitive
    description:
      name: pub_semver
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
  pubspec_parse:
    dependency: transitive
    description:
@ -596,27 +617,34 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.2.0"
+  screen_retriever:
+    dependency: transitive
+    description:
+      name: screen_retriever
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.2"
  scrollable_positioned_list:
    dependency: "direct main"
    description:
      name: scrollable_positioned_list
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.3"
+    version: "0.3.2"
  shelf:
    dependency: transitive
    description:
      name: shelf
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
  shelf_web_socket:
    dependency: transitive
    description:
      name: shelf_web_socket
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
  sky_engine:
    dependency: transitive
    description: flutter
@ -628,14 +656,14 @@ packages:
      name: source_gen
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
  source_span:
    dependency: transitive
    description:
      name: source_span
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
  stack_trace:
    dependency: transitive
    description:
@ -684,7 +712,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.4.3"
+    version: "0.4.9"
  timezone:
    dependency: transitive
    description:
@ -712,70 +740,70 @@ packages:
      name: url_launcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "6.0.18"
+    version: "6.1.3"
  url_launcher_android:
    dependency: transitive
    description:
      name: url_launcher_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "6.0.14"
+    version: "6.0.17"
  url_launcher_ios:
    dependency: transitive
    description:
      name: url_launcher_ios
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "6.0.14"
+    version: "6.0.17"
  url_launcher_linux:
    dependency: transitive
    description:
      name: url_launcher_linux
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.3"
+    version: "3.0.1"
  url_launcher_macos:
    dependency: transitive
    description:
      name: url_launcher_macos
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.3"
+    version: "3.0.1"
  url_launcher_platform_interface:
    dependency: transitive
    description:
      name: url_launcher_platform_interface
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.5"
+    version: "2.1.0"
  url_launcher_web:
    dependency: transitive
    description:
      name: url_launcher_web
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.6"
+    version: "2.0.12"
  url_launcher_windows:
    dependency: transitive
    description:
      name: url_launcher_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.2"
+    version: "3.0.1"
  vector_math:
    dependency: transitive
    description:
      name: vector_math
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
  vm_service:
    dependency: transitive
    description:
      name: vm_service
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "7.3.0"
+    version: "8.2.2"
  watcher:
    dependency: transitive
    description:
@ -789,7 +817,7 @@ packages:
      name: web_socket_channel
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
  webdriver:
    dependency: transitive
    description:
@ -803,7 +831,7 @@ packages:
      name: win32
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.8"
+    version: "2.6.1"
  win_toast:
    dependency: "direct main"
    description:
@ -817,7 +845,7 @@ packages:
      name: window_manager
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.1.4"
+    version: "0.2.5"
  xdg_directories:
    dependency: transitive
    description:
@ -831,14 +859,14 @@ packages:
      name: xml
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "5.3.1"
+    version: "6.1.0"
  yaml:
    dependency: transitive
    description:
      name: yaml
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
 sdks:
-  dart: ">=2.15.0 <3.0.0"
-  flutter: ">=2.5.0"
+  dart: ">=2.17.0 <3.0.0"
+  flutter: ">=3.0.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -23,7 +23,7 @@ environment:
 dependencies:
  flutter:
    sdk: flutter
-  provider: 5.0.0
+  provider: ^6.0.3
  package_info_plus: ^1.0.0
  #intl_translation: any
  flutter_localizations:
@ -32,23 +32,23 @@ dependencies:
  # The following adds the Cupertino Icons font to your application.
  # Use with the CupertinoIcons class for iOS style icons.
  cupertino_icons: ^1.0.0
-  ffi: ^1.0.0
+  ffi: ^1.2.1
  path_provider: ^2.0.0
  crypto: 3.0.1

  glob: any
-  scrollable_positioned_list: ^0.2.0-nullsafety.0
+  scrollable_positioned_list: ^0.3.2
  file_picker: ^4.3.2
-  file_picker_desktop: ^1.1.0
+  file_picker_desktop: ^1.1.1
  url_launcher: ^6.0.18
-  window_manager: ^0.1.4
+  window_manager: ^0.2.5
  # notification plugins
  win_toast: ^0.0.2
-  flutter_local_notifications: 9.3.2
+  flutter_local_notifications: ^9.6.1
  desktop_notifications: ^0.6.3

 dev_dependencies:
-  msix: ^2.1.3
+  msix: ^3.6.2
  flutter_gherkin: ^3.0.0-rc.9
  build_runner: any
 #  integration_test: any
--- a/test/cwtchlabel01.png
+++ b/test/cwtchlabel01.png
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@ -6,11 +6,14 @@

 #include "generated_plugin_registrant.h"

+#include <screen_retriever/screen_retriever_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 #include <win_toast/win_toast_plugin.h>
 #include <window_manager/window_manager_plugin.h>

 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  ScreenRetrieverPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
  UrlLauncherWindowsRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
  WinToastPluginRegisterWithRegistrar(
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@ -3,11 +3,15 @@
 #

 list(APPEND FLUTTER_PLUGIN_LIST
+  screen_retriever
  url_launcher_windows
  win_toast
  window_manager
 )

+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)

 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@ -16,3 +20,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)