From 5b3a8a2c3d19e01e65caa726e931b33ad7d88242 Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Thu, 11 May 2023 14:26:59 +0800
Subject: [PATCH] feat: upgrade flutter pubs

---
 flutter/lib/mobile/pages/scan_page.dart      |  4 ++--
 flutter/lib/models/model.dart                | 11 ++++++-----
 flutter/macos/Runner/MainFlutterWindow.swift |  2 +-
 flutter/pubspec.yaml                         | 18 ++++++++++--------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/flutter/lib/mobile/pages/scan_page.dart b/flutter/lib/mobile/pages/scan_page.dart
index 8778d78f7..32ac3ed09 100644
--- a/flutter/lib/mobile/pages/scan_page.dart
+++ b/flutter/lib/mobile/pages/scan_page.dart
@@ -46,13 +46,13 @@ class _ScanPageState extends State<ScanPage> {
                       await picker.pickImage(source: ImageSource.gallery);
                   if (file != null) {
                     var image = img.decodeNamedImage(
-                        File(file.path).readAsBytesSync(), file.path)!;
+                        file.path, File(file.path).readAsBytesSync())!;
 
                     LuminanceSource source = RGBLuminanceSource(
                         image.width,
                         image.height,
                         image
-                            .getBytes(format: img.Format.abgr)
+                            .getBytes(order: img.ChannelOrder.abgr)
                             .buffer
                             .asInt32List());
                     var bitmap = BinaryBitmap(HybridBinarizer(source));
diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index a99b0ddd7..17863e53f 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
+import 'dart:typed_data';
 import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
@@ -1067,7 +1068,7 @@ class CursorData {
               height: (height * scale).toInt(),
               interpolation: img2.Interpolation.average,
             )
-            .getBytes(format: img2.Format.bgra);
+            .getBytes(order: img2.ChannelOrder.bgra);
       } else {
         data = Uint8List.fromList(
           img2.encodePng(
@@ -1133,13 +1134,13 @@ class PredefinedCursor {
       () async {
         final defaultImg = _image2!;
         // This function is called only one time, no need to care about the performance.
-        Uint8List data = defaultImg.getBytes(format: img2.Format.rgba);
+        Uint8List data = defaultImg.getBytes(order: img2.ChannelOrder.rgba);
         _image = await img.decodeImageFromPixels(
             data, defaultImg.width, defaultImg.height, ui.PixelFormat.rgba8888);
 
         double scale = 1.0;
         if (Platform.isWindows) {
-          data = _image2!.getBytes(format: img2.Format.bgra);
+          data = _image2!.getBytes(order: img2.ChannelOrder.bgra);
         } else {
           data = Uint8List.fromList(img2.encodePng(_image2!));
         }
@@ -1358,9 +1359,9 @@ class CursorModel with ChangeNotifier {
       Uint8List rgba, ui.Image image, int id, int w, int h) async {
     Uint8List? data;
     img2.Image imgOrigin =
-        img2.Image.fromBytes(w, h, rgba, format: img2.Format.rgba);
+        img2.Image.fromBytes(width: w, height:h, bytes: rgba.buffer, order: img2.ChannelOrder.rgba);
     if (Platform.isWindows) {
-      data = imgOrigin.getBytes(format: img2.Format.bgra);
+      data = imgOrigin.getBytes(order: img2.ChannelOrder.bgra);
     } else {
       ByteData? imgBytes =
           await image.toByteData(format: ui.ImageByteFormat.png);
diff --git a/flutter/macos/Runner/MainFlutterWindow.swift b/flutter/macos/Runner/MainFlutterWindow.swift
index 06d69c8d8..9daaeee21 100644
--- a/flutter/macos/Runner/MainFlutterWindow.swift
+++ b/flutter/macos/Runner/MainFlutterWindow.swift
@@ -7,7 +7,7 @@ import desktop_multi_window
 import desktop_drop
 import device_info_plus_macos
 import flutter_custom_cursor
-import package_info_plus_macos
+import package_info_plus
 import path_provider_foundation
 import screen_retriever
 import sqflite
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index 296aa0a89..4ac0107a8 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -36,9 +36,10 @@ dependencies:
   provider: ^6.0.3
   tuple: ^2.0.0
   wakelock: ^0.6.2
+  # Keep this version for the compatibility of some old systems like win7.
   device_info_plus: ^4.1.2
   #firebase_analytics: ^9.1.5
-  package_info_plus: ^1.4.2
+  package_info_plus: ^3.1.2
   url_launcher: ^6.0.9
   toggle_switch: ^1.4.0
   dash_chat_2: ^0.0.15
@@ -47,9 +48,9 @@ dependencies:
   flutter_breadcrumb: ^1.0.1
   http: ^0.13.4
   qr_code_scanner: ^1.0.0
-  zxing2: ^0.1.0
+  zxing2: ^0.2.0
   image_picker: ^0.8.5
-  image: ^3.1.3
+  image: ^4.0.17
   back_button_interceptor: ^6.0.1
   flutter_rust_bridge: ^1.61.1
   window_manager:
@@ -68,13 +69,14 @@ dependencies:
       path: plugins/window_size
       ref: a738913c8ce2c9f47515382d40827e794a334274
   get: ^4.6.5
-  visibility_detector: ^0.3.3
+  visibility_detector: ^0.4.0+2
   contextmenu: ^3.0.0
-  desktop_drop: ^0.3.3
-  scroll_pos: ^0.3.0
+  # Disable desktop_drop for now, because it may cause crash on Win11 when destructing.
+  # desktop_drop: ^0.4.1
+  scroll_pos: ^0.4.0
   debounce_throttle: ^2.0.0
   file_picker: ^5.1.0
-  flutter_svg: ^1.1.5
+  flutter_svg: ^2.0.5
   flutter_improved_scrolling:
     # currently, we use flutter 3.7.0+.
     #
@@ -94,7 +96,7 @@ dependencies:
   bot_toast: ^4.0.3
   win32: any
   password_strength: ^0.2.0
-  flutter_launcher_icons: ^0.11.0
+  flutter_launcher_icons: ^0.13.1
   flutter_keyboard_visibility: ^5.4.0
   texture_rgba_renderer: ^0.0.16
   percent_indicator: ^4.2.2