From 2995d24840ee63ef04fbc227cd62dd72cbef2399 Mon Sep 17 00:00:00 2001
From: wanghongenpin <wanghongenpin@gmail.com>
Date: Sat, 19 Apr 2025 13:21:34 +0800
Subject: [PATCH] flutter-3.19.6

---
 lib/ui/app_update/app_update_repository.dart  | 2 +-
 lib/ui/app_update/new_version_dialog.dart     | 2 +-
 lib/ui/component/app_dialog.dart              | 2 +-
 lib/ui/component/toolbox/qr_code_page.dart    | 4 ++--
 macos/Flutter/GeneratedPluginRegistrant.swift | 2 --
 pubspec.yaml                                  | 4 ++--
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/ui/app_update/app_update_repository.dart b/lib/ui/app_update/app_update_repository.dart
index 138c19a..6617443 100644
--- a/lib/ui/app_update/app_update_repository.dart
+++ b/lib/ui/app_update/app_update_repository.dart
@@ -29,7 +29,7 @@ class AppUpdateRepository {
       var availableUpdates = compareVersions(AppConfiguration.version, lastVersion.version);
       if (availableUpdates) {
         if (canIgnore) {
-          var ignoreVersion = await SharedPreferencesAsync().getString(Constants.ignoreReleaseVersionKey);
+          var ignoreVersion = (await SharedPreferences.getInstance()).getString(Constants.ignoreReleaseVersionKey);
           if (ignoreVersion == lastVersion.version) {
             logger.d("ignored release [${lastVersion.version}]");
             return;
diff --git a/lib/ui/app_update/new_version_dialog.dart b/lib/ui/app_update/new_version_dialog.dart
index 157c0c2..e0048b2 100644
--- a/lib/ui/app_update/new_version_dialog.dart
+++ b/lib/ui/app_update/new_version_dialog.dart
@@ -72,7 +72,7 @@ class NewVersionDialog extends StatelessWidget {
         if (canIgnore)
           TextButton(
             onPressed: () async {
-              SharedPreferencesAsync().setString(Constants.ignoreReleaseVersionKey, newVersion.version);
+              (await SharedPreferences.getInstance()).setString(Constants.ignoreReleaseVersionKey, newVersion.version);
               logger.i("ignored release [${newVersion.version}]");
               if (context.mounted) Navigator.pop(context);
             },
diff --git a/lib/ui/component/app_dialog.dart b/lib/ui/component/app_dialog.dart
index 02c8aee..b4340e1 100644
--- a/lib/ui/component/app_dialog.dart
+++ b/lib/ui/component/app_dialog.dart
@@ -118,7 +118,7 @@ class CustomToast extends StatelessWidget {
       showProgressBar: false,
       dragToClose: true,
       closeOnClick: true,
-      closeButton: ToastCloseButton(showType: CloseButtonShowType.onHover),
+      closeButtonShowType: CloseButtonShowType.onHover,
     );
   }
 }
diff --git a/lib/ui/component/toolbox/qr_code_page.dart b/lib/ui/component/toolbox/qr_code_page.dart
index 2418f44..9ee2d13 100644
--- a/lib/ui/component/toolbox/qr_code_page.dart
+++ b/lib/ui/component/toolbox/qr_code_page.dart
@@ -24,7 +24,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:flutter_qr_reader_plus/flutter_qr_reader.dart';
+import 'package:flutter_qr_reader/flutter_qr_reader.dart';
 import 'package:flutter_toastr/flutter_toastr.dart';
 import 'package:image_pickers/image_pickers.dart';
 import 'package:proxypin/ui/component/app_dialog.dart';
@@ -153,7 +153,7 @@ class _QrDecodeState extends State<_QrDecode> with AutomaticKeepAliveClientMixin
                 String? path = await selectImage();
                 if (path == null) return;
                 var result = await FlutterQrReader.imgScan(path);
-                if (result == null) {
+                if (result.isEmpty) {
                   if (context.mounted) FlutterToastr.show(localizations.decodeFail, context, duration: 2);
                   return;
                 }
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 69d2aa9..1808fce 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -7,7 +7,6 @@ import Foundation
 
 import desktop_multi_window
 import device_info_plus
-import file_picker
 import flutter_desktop_context_menu
 import flutter_js
 import path_provider_foundation
@@ -21,7 +20,6 @@ import window_manager
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FlutterMultiWindowPlugin.register(with: registry.registrar(forPlugin: "FlutterMultiWindowPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
-  FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FlutterDesktopContextMenuPlugin.register(with: registry.registrar(forPlugin: "FlutterDesktopContextMenuPlugin"))
   FlutterJsPlugin.register(with: registry.registrar(forPlugin: "FlutterJsPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
diff --git a/pubspec.yaml b/pubspec.yaml
index 82dc356..06979a3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -37,9 +37,9 @@ dependencies:
   flutter_desktop_context_menu: ^0.2.0
   device_info_plus: ^10.1.2
   shared_preferences: ^2.2.3
-  image_pickers: ^2.0.5+2
+  image_pickers: 2.0.5+2
   url_launcher: ^6.3.1
-  toastification: ^3.0.2
+  toastification: ^2.3.0
 
   qr_flutter: ^4.1.0
   flutter_qr_reader: ^1.0.5