Migrate to flutter 3.27.0

2025-09-27 04:57:23 +00:00 · 2024-12-14 17:08:55 +08:00
parent 86c6f13282
commit bd15053c2f
23 changed files with 284 additions and 175 deletions
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -49,6 +49,7 @@
        <meta-data
            android:name="flutterEmbedding"
            android:value="2" />
+        <meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false"/>
    </application>
    <!-- Required to query activities that can process text, see:
         https://developer.android.com/training/package-visibility?hl=en and
--- a/lib/components/illust_widget.dart
+++ b/lib/components/illust_widget.dart
@@ -83,7 +83,7 @@ class _IllustWidgetState extends State<IllustWidget> {
                            ? ColorScheme.of(context).primary
                            : ColorScheme.of(context)
                                .outlineVariant
-                                .withOpacity(0.64);
+                                .toOpacity(0.64);
                        var width = emphasis ? 1.6 : 1.0;
                        return Border.all(color: color, width: width);
                      }(),
@@ -120,7 +120,7 @@ class _IllustWidgetState extends State<IllustWidget> {
                      decoration: BoxDecoration(
                        color: FluentTheme.of(context)
                            .micaBackgroundColor
-                            .withOpacity(0.72),
+                            .toOpacity(0.72),
                        borderRadius: BorderRadius.circular(4),
                        border: Border.all(
                            color: ColorScheme.of(context).outlineVariant,
@@ -143,7 +143,7 @@ class _IllustWidgetState extends State<IllustWidget> {
                      decoration: BoxDecoration(
                        color: ColorScheme.of(context)
                            .errorContainer
-                            .withOpacity(0.8),
+                            .toOpacity(0.8),
                        borderRadius: BorderRadius.circular(4),
                        border: Border.all(
                            color: ColorScheme.of(context).outlineVariant,
@@ -166,7 +166,7 @@ class _IllustWidgetState extends State<IllustWidget> {
                      decoration: BoxDecoration(
                        color: ColorScheme.of(context)
                            .primaryContainer
-                            .withOpacity(0.8),
+                            .toOpacity(0.8),
                        borderRadius: BorderRadius.circular(4),
                        border: Border.all(
                            color: ColorScheme.of(context).outlineVariant,
@@ -387,7 +387,7 @@ class IllustHistoryWidget extends StatelessWidget {
                    decoration: BoxDecoration(
                      color: FluentTheme.of(context)
                          .micaBackgroundColor
-                          .withOpacity(0.72),
+                          .toOpacity(0.72),
                      borderRadius: BorderRadius.circular(4),
                      border: Border.all(
                          color: ColorScheme.of(context).outlineVariant,
@@ -410,7 +410,7 @@ class IllustHistoryWidget extends StatelessWidget {
                    decoration: BoxDecoration(
                      color: ColorScheme.of(context)
                          .errorContainer
-                          .withOpacity(0.8),
+                          .toOpacity(0.8),
                      borderRadius: BorderRadius.circular(4),
                      border: Border.all(
                          color: ColorScheme.of(context).outlineVariant,
@@ -433,7 +433,7 @@ class IllustHistoryWidget extends StatelessWidget {
                    decoration: BoxDecoration(
                      color: ColorScheme.of(context)
                          .primaryContainer
-                          .withOpacity(0.8),
+                          .toOpacity(0.8),
                      borderRadius: BorderRadius.circular(4),
                      border: Border.all(
                          color: ColorScheme.of(context).outlineVariant,
--- a/lib/components/loading.dart
+++ b/lib/components/loading.dart
@@ -132,8 +132,10 @@ abstract class MultiPageLoadingState<T extends StatefulWidget, S extends Object>
        if(message.length > 20) {
          message = "${message.substring(0, 20)}...";
        }
+        if (mounted) {
          context.showToast(message: message);
        }
+      }
    });
  }

--- a/lib/components/message.dart
+++ b/lib/components/message.dart
@@ -2,6 +2,7 @@ import 'dart:async';

 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:pixes/components/md.dart';
+import 'package:pixes/foundation/app.dart';

 void showToast(BuildContext context, {required String message, IconData? icon}) {
  var newEntry = OverlayEntry(
@@ -30,7 +31,7 @@ class ToastOverlay extends StatelessWidget {
      child: Align(
        alignment: Alignment.bottomCenter,
        child: PhysicalModel(
-          color: ColorScheme.of(context).surface.withOpacity(1),
+          color: ColorScheme.of(context).surface.toOpacity(1),
          borderRadius: BorderRadius.circular(4),
          elevation: 1,
          child: Container(
--- a/lib/components/page_route.dart
+++ b/lib/components/page_route.dart
@@ -330,7 +330,7 @@ class SideBarRoute<T> extends PopupRoute<T> {
              decoration: BoxDecoration(
                  color: FluentTheme.of(context)
                      .micaBackgroundColor
-                      .withOpacity(0.98),
+                      .toOpacity(0.98),
                  borderRadius: const BorderRadius.only(
                      topLeft: Radius.circular(4),
                      bottomLeft: Radius.circular(4))),
--- a/lib/components/segmented_button.dart
+++ b/lib/components/segmented_button.dart
@@ -40,7 +40,7 @@ class SegmentedButton<T> extends StatelessWidget {
        onPressed: () => onPressed(e.key),
        builder: (context, states) {
          var textColor = active ? null : ColorScheme.of(context).outline;
-          var backgroundColor = active ? null : ButtonState.resolveWith((states) {
+          var backgroundColor = active ? null : WidgetStateProperty.resolveWith((states) {
            return ButtonThemeData.buttonColor(context, states);
          }).resolve(states);

--- a/lib/foundation/log.dart
+++ b/lib/foundation/log.dart
@@ -32,11 +32,11 @@ class Log {
  static const String? logFile = null;

  static void printWarning(String text) {
-    print('\x1B[33m$text\x1B[0m');
+    debugPrint('\x1B[33m$text\x1B[0m');
  }

  static void printError(String text) {
-    print('\x1B[31m$text\x1B[0m');
+    debugPrint('\x1B[31m$text\x1B[0m');
  }

  static void addLog(LogLevel level, String title, String content) {
@@ -44,15 +44,13 @@ class Log {
      content = "${content.substring(0, maxLogLength)}...";
    }

-    if (kDebugMode) {
    switch (level) {
      case LogLevel.error:
        printError(content);
      case LogLevel.warning:
        printWarning(content);
      case LogLevel.info:
-          print(content);
-      }
+        debugPrint(content);
    }

    var newLog = LogItem(level, title, content);
--- a/lib/foundation/widget_utils.dart
+++ b/lib/foundation/widget_utils.dart
@@ -65,3 +65,9 @@ extension WidgetExtension on Widget{
    return SizedBox(height: height, child: this);
  }
 }
+
+extension ColorExt on Color {
+  Color toOpacity(double opacity){
+    return withValues(alpha: opacity);
+  }
+}
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -183,21 +183,28 @@ class MyApp extends StatelessWidget {
  }
 }

-/// from https://stackoverflow.com/a/60191441
+int _floatToInt8(double x) {
+  return (x * 255.0).round() & 0xff;
+}
+
 Color darken(Color c, [int percent = 10]) {
  assert(1 <= percent && percent <= 100);
  var f = 1 - percent / 100;
-  return Color.fromARGB(c.alpha, (c.red * f).round(), (c.green * f).round(),
-      (c.blue * f).round());
+  return Color.fromARGB(
+    _floatToInt8(c.a),
+    _floatToInt8(c.r * f),
+    _floatToInt8(c.g * f),
+    _floatToInt8(c.b * f),
+  );
 }

-/// from https://stackoverflow.com/a/60191441
 Color lighten(Color c, [int percent = 10]) {
  assert(1 <= percent && percent <= 100);
  var p = percent / 100;
  return Color.fromARGB(
-      c.alpha,
-      c.red + ((255 - c.red) * p).round(),
-      c.green + ((255 - c.green) * p).round(),
-      c.blue + ((255 - c.blue) * p).round());
+    _floatToInt8(c.a),
+    _floatToInt8(c.r + (1 - c.r) * p),
+    _floatToInt8(c.g + (1 - c.g) * p),
+    _floatToInt8(c.b + (1 - c.b) * p),
+  );
 }
--- a/lib/pages/comments_page.dart
+++ b/lib/pages/comments_page.dart
@@ -143,15 +143,15 @@ class _CommentsPageState extends MultiPageLoadingState<CommentsPage, Comment> {
    return Card(
      padding: EdgeInsets.zero,
      backgroundColor:
-          FluentTheme.of(context).micaBackgroundColor.withOpacity(0.96),
+          FluentTheme.of(context).micaBackgroundColor.toOpacity(0.96),
      child: SizedBox(
        height: 52,
        child: TextBox(
          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
          placeholder: "Comment".tl,
-          foregroundDecoration: BoxDecoration(
+          foregroundDecoration: WidgetStatePropertyAll(BoxDecoration(
            border: Border.all(color: Colors.transparent),
-          ),
+          )),
          onSubmitted: (s) {
            showToast(context, message: "Sending".tl);
            if (isCommenting) return;
@@ -161,10 +161,12 @@ class _CommentsPageState extends MultiPageLoadingState<CommentsPage, Comment> {
            if (widget.isNovel) {
              Network().commentNovel(widget.id, s).then((value) {
                if (value.error) {
+                  if (context.mounted) {
                    context.showToast(message: "Network Error");
                    setState(() {
                      isCommenting = false;
                    });
+                  }
                } else {
                  isCommenting = false;
                  nextUrl = null;
@@ -174,10 +176,12 @@ class _CommentsPageState extends MultiPageLoadingState<CommentsPage, Comment> {
            } else {
              Network().comment(widget.id, s).then((value) {
                if (value.error) {
+                  if(context.mounted) {
                    context.showToast(message: "Network Error");
                    setState(() {
                      isCommenting = false;
                    });
+                  }
                } else {
                  isCommenting = false;
                  nextUrl = null;
--- a/lib/pages/illust_page.dart
+++ b/lib/pages/illust_page.dart
@@ -620,7 +620,7 @@ class _BottomBarState extends State<_BottomBar> with TickerProviderStateMixin {
              borderRadius:
                  const BorderRadius.vertical(top: Radius.circular(8)),
              backgroundColor:
-                  FluentTheme.of(context).micaBackgroundColor.withOpacity(0.96),
+                  FluentTheme.of(context).micaBackgroundColor.toOpacity(0.96),
              padding: const EdgeInsets.symmetric(horizontal: 8),
              child: SizedBox(
                width: double.infinity,
@@ -1219,7 +1219,7 @@ class __BlockingPageState extends State<_BlockingPage> {
                margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
                borderColor: blockedTags.contains(index)
                    ? ColorScheme.of(context).outlineVariant
-                    : ColorScheme.of(context).outlineVariant.withOpacity(0.2),
+                    : ColorScheme.of(context).outlineVariant.toOpacity(0.2),
                padding: EdgeInsets.zero,
                child: ListTile(
                  title: Text(text),
--- a/lib/pages/image_page.dart
+++ b/lib/pages/image_page.dart
@@ -122,7 +122,7 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
                              await file.readAsBytes(),
                              quality: 100,
                              name: fileName);
-                          if (mounted) {
+                          if (context.mounted) {
                            showToast(context, message: "Saved".tl);
                          }
                        }
--- a/lib/pages/logs.dart
+++ b/lib/pages/logs.dart
@@ -34,7 +34,7 @@ class _LogsPageState extends State<LogsPage> {
                        children: [
                          Container(
                            decoration: BoxDecoration(
-                              color: ColorScheme.of(context).surfaceVariant,
+                              color: ColorScheme.of(context).surfaceContainerHighest,
                              borderRadius: const BorderRadius.all(Radius.circular(16)),
                            ),
                            child: Padding(
--- a/lib/pages/main_page.dart
+++ b/lib/pages/main_page.dart
@@ -129,7 +129,7 @@ class _MainPageState extends State<MainPage>
      );
    }
    return DefaultSelectionStyle.merge(
-      selectionColor: FluentTheme.of(context).selectionColor.withOpacity(0.4),
+      selectionColor: FluentTheme.of(context).selectionColor.toOpacity(0.4),
      child: NavigationView(
          appBar: buildAppBar(context, navigatorKey),
          pane: NavigationPane(
@@ -355,9 +355,7 @@ class _MainPageState extends State<MainPage>
  ValueListenable<bool> get canPopNotifier => popValue;

  @override
-  PopInvokedCallback? get onPopInvoked => onPop;
-
-  void onPop(bool value) {
+  void onPopInvokedWithResult(bool didPop, result) {
    if (App.rootNavigatorKey.currentState?.canPop() ?? false) {
      App.rootNavigatorKey.currentState?.pop();
    } else if (App.mainNavigatorKey?.currentState?.canPop() ?? false) {
@@ -366,6 +364,9 @@ class _MainPageState extends State<MainPage>
      SystemNavigator.pop();
    }
  }
+
+  @override
+  void onPopInvoked(bool didPop) { }
 }

 class _BackButton extends StatefulWidget {
@@ -416,7 +417,7 @@ class _BackButtonState extends State<_BackButton> {

    return NavigationPaneTheme(
      data: NavigationPaneTheme.of(context).merge(NavigationPaneThemeData(
-        unselectedIconColor: ButtonState.resolveWith((states) {
+        unselectedIconColor: WidgetStateProperty.resolveWith((states) {
          if (states.isDisabled) {
            return ButtonThemeData.buttonColor(context, states);
          }
@@ -669,16 +670,16 @@ class UserPane extends PaneItem {
              final tileColor = this.tileColor ??
                  theme.tileColor ??
                  kDefaultPaneItemColor(context, mode == PaneDisplayMode.top);
-              final newStates = states.toSet()..remove(ButtonStates.disabled);
+              final newStates = states.toSet()..remove(WidgetState.disabled);
              if (selected && selectedTileColor != null) {
                return selectedTileColor!.resolve(newStates);
              }
              return tileColor.resolve(
                selected
                    ? {
-                        states.isHovering
-                            ? ButtonStates.pressing
-                            : ButtonStates.hovering,
+                        states.isHovered
+                            ? WidgetState.pressed
+                            : WidgetState.hovered,
                      }
                    : newStates,
              );
--- a/lib/pages/novel_page.dart
+++ b/lib/pages/novel_page.dart
@@ -214,7 +214,7 @@ class _NovelPageState extends State<NovelPage> {
      constraints: const BoxConstraints(maxWidth: 560),
      child: Card(
        margin: const EdgeInsets.only(left: 2, right: 2, bottom: 12),
-        borderColor: ColorScheme.of(context).outlineVariant.withOpacity(0.52),
+        borderColor: ColorScheme.of(context).outlineVariant.toOpacity(0.52),
        child: GestureDetector(
          behavior: HitTestBehavior.opaque,
          onTap: () {
@@ -555,7 +555,7 @@ class _NovelSeriesWidgetState
          color: FluentTheme.of(context).cardColor,
          borderRadius: BorderRadius.circular(4),
          border: Border.all(
-            color: ColorScheme.of(context).outlineVariant.withOpacity(0.6),
+            color: ColorScheme.of(context).outlineVariant.toOpacity(0.6),
            width: 0.5,
          )),
      sliver: SliverMainAxisGroup(slivers: [
--- a/lib/pages/search_page.dart
+++ b/lib/pages/search_page.dart
@@ -105,12 +105,13 @@ class _SearchPageState extends State<SearchPage> {
                          '${searchTypes[searchType].tl} / ${"Open link".tl}',
                      onChanged: (s) => text = s,
                      onSubmitted: (s) => search(),
-                      foregroundDecoration: BoxDecoration(
+                      foregroundDecoration: WidgetStatePropertyAll(
+                          BoxDecoration(
                              border: Border.all(
                                  color: ColorScheme.of(context)
                                      .outlineVariant
-                                  .withOpacity(0.6)),
-                          borderRadius: BorderRadius.circular(4)),
+                                      .toOpacity(0.6)),
+                              borderRadius: BorderRadius.circular(4))),
                      suffix: MouseRegion(
                        cursor: SystemMouseCursors.click,
                        child: GestureDetector(
@@ -247,7 +248,7 @@ class _TrendingTagsViewState
                      decoration: BoxDecoration(
                          color: FluentTheme.of(context)
                              .micaBackgroundColor
-                              .withOpacity(0.84),
+                              .toOpacity(0.84),
                          borderRadius: BorderRadius.circular(4)),
                      child: Text(text)
                          .paddingHorizontal(4)
@@ -517,12 +518,16 @@ class _SearchResultPageState
                          placeholder: "Search artworks".tl,
                          onChanged: (s) => keyword = s,
                          onSubmitted: (s) => search(),
-                          foregroundDecoration: BoxDecoration(
+                          foregroundDecoration: WidgetStatePropertyAll(
+                            BoxDecoration(
                              border: Border.all(
                                color: ColorScheme.of(context)
                                    .outlineVariant
-                                      .withOpacity(0.6)),
-                              borderRadius: BorderRadius.circular(4)),
+                                    .toOpacity(0.6),
+                              ),
+                              borderRadius: BorderRadius.circular(4),
+                            ),
+                          ),
                          suffix: MouseRegion(
                            cursor: SystemMouseCursors.click,
                            child: GestureDetector(
@@ -709,12 +714,14 @@ class _SearchNovelResultPageState
                          placeholder: "Search artworks".tl,
                          onChanged: (s) => keyword = s,
                          onSubmitted: (s) => search(),
-                          foregroundDecoration: BoxDecoration(
+                          foregroundDecoration: WidgetStatePropertyAll(
+                            BoxDecoration(
                                border: Border.all(
                                    color: ColorScheme.of(context)
                                        .outlineVariant
-                                      .withOpacity(0.6)),
+                                        .toOpacity(0.6)),
                                borderRadius: BorderRadius.circular(4)),
+                          ),
                          suffix: MouseRegion(
                            cursor: SystemMouseCursors.click,
                            child: GestureDetector(
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -10,7 +10,7 @@
 #include <file_selector_linux/file_selector_plugin.h>
 #include <flutter_acrylic/flutter_acrylic_plugin.h>
 #include <gtk/gtk_plugin.h>
-#include <screen_retriever/screen_retriever_plugin.h>
+#include <screen_retriever_linux/screen_retriever_linux_plugin.h>
 #include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 #include <window_manager/window_manager_plugin.h>
@@ -28,9 +28,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
  g_autoptr(FlPluginRegistrar) gtk_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
  gtk_plugin_register_with_registrar(gtk_registrar);
-  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) screen_retriever_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
+  screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar);
  g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin");
  sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar);
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -7,7 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
  file_selector_linux
  flutter_acrylic
  gtk
-  screen_retriever
+  screen_retriever_linux
  sqlite3_flutter_libs
  url_launcher_linux
  window_manager
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -11,10 +11,11 @@ import dynamic_color
 import file_selector_macos
 import flutter_acrylic
 import path_provider_foundation
-import screen_retriever
+import screen_retriever_macos
 import share_plus
 import sqlite3_flutter_libs
 import url_launcher_macos
+import webview_flutter_wkwebview
 import window_manager

 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
@@ -24,9 +25,10 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
  FlutterAcrylicPlugin.register(with: registry.registrar(forPlugin: "FlutterAcrylicPlugin"))
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
-  ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
+  ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
  Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin"))
  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
+  FLTWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "FLTWebViewFlutterPlugin"))
  WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
 }
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,18 +5,42 @@ packages:
    dependency: "direct main"
    description:
      name: app_links
-      sha256: "1c2b9e9c56d80d17610bcbd111b37187875c5d0ded8654caa1bda14ea753d001"
+      sha256: "433df2e61b10519407475d7f69e470789d23d593f28224c38ba1068597be7950"
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.1"
+    version: "6.3.3"
+  app_links_linux:
+    dependency: transitive
+    description:
+      name: app_links_linux
+      sha256: f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
+  app_links_platform_interface:
+    dependency: transitive
+    description:
+      name: app_links_platform_interface
+      sha256: "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
+  app_links_web:
+    dependency: transitive
+    description:
+      name: app_links_web
+      sha256: af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
  archive:
    dependency: "direct main"
    description:
      name: archive
-      sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
+      sha256: "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8"
      url: "https://pub.dev"
    source: hosted
-    version: "3.5.1"
+    version: "4.0.1"
  async:
    dependency: transitive
    description:
@@ -53,50 +77,58 @@ packages:
    dependency: transitive
    description:
      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
      url: "https://pub.dev"
    source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
  cross_file:
    dependency: transitive
    description:
      name: cross_file
-      sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32"
+      sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.4+1"
+    version: "0.3.4+2"
  crypto:
    dependency: "direct main"
    description:
      name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
  device_info_plus:
    dependency: "direct main"
    description:
      name: device_info_plus
-      sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91
+      sha256: "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431"
      url: "https://pub.dev"
    source: hosted
-    version: "10.1.0"
+    version: "11.2.0"
  device_info_plus_platform_interface:
    dependency: transitive
    description:
      name: device_info_plus_platform_interface
-      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
+      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
      url: "https://pub.dev"
    source: hosted
-    version: "7.0.0"
+    version: "7.0.2"
  dio:
    dependency: "direct main"
    description:
      name: dio
-      sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5"
+      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
      url: "https://pub.dev"
    source: hosted
-    version: "5.4.3+1"
+    version: "5.7.0"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
  dynamic_color:
    dependency: "direct main"
    description:
@@ -181,10 +213,10 @@ packages:
    dependency: transitive
    description:
      name: file_selector_web
-      sha256: "619e431b224711a3869e30dbd7d516f5f5a4f04b265013a50912f39e1abc88c8"
+      sha256: c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.4+1"
+    version: "0.9.4+2"
  file_selector_windows:
    dependency: transitive
    description:
@@ -205,10 +237,10 @@ packages:
    dependency: "direct main"
    description:
      name: fluent_ui
-      sha256: a8c76cb501303d108cb9bd33e516da7cfd078031ff427d68eab6069bf4492a2c
+      sha256: "069dc196e093864ba7252a3ed5cc4e28039f04fc9cb687f35aeaa2e2b265dd7e"
      url: "https://pub.dev"
    source: hosted
-    version: "4.8.7"
+    version: "4.10.0"
  flutter:
    dependency: "direct main"
    description: flutter
@@ -226,10 +258,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_file_dialog
-      sha256: "5a1507833473b38839056d63c5125750a6d12e904f78131324fa4632504de513"
+      sha256: "9344b8f07be6a1b6f9854b723fb0cf84a8094ba94761af1d213589d3cb087488"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
  flutter_lints:
    dependency: "direct dev"
    description:
@@ -260,8 +292,8 @@ packages:
    dependency: "direct dev"
    description:
      path: "."
-      ref: HEAD
-      resolved-ref: b7378b7bda0b71cbc7d103f5afa24bce19be145c
+      ref: "15bfead"
+      resolved-ref: "15bfead0380fda79b0256b37c73b886b0882f1bf"
      url: "https://github.com/wgh136/flutter_to_arch"
    source: git
    version: "1.0.0"
@@ -282,10 +314,10 @@ packages:
    dependency: transitive
    description:
      name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
  http_parser:
    dependency: transitive
    description:
@@ -319,22 +351,30 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.4"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.9.0"
  leak_tracker:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.4"
+    version: "10.0.7"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.3"
+    version: "3.0.8"
  leak_tracker_testing:
    dependency: transitive
    description:
@@ -363,10 +403,10 @@ packages:
    dependency: transitive
    description:
      name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
      url: "https://pub.dev"
    source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
  math_expressions:
    dependency: transitive
    description:
@@ -379,10 +419,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
      url: "https://pub.dev"
    source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
  mime:
    dependency: transitive
    description:
@@ -403,18 +443,18 @@ packages:
    dependency: "direct main"
    description:
      name: path_provider
-      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.5"
  path_provider_android:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.4"
+    version: "2.2.15"
  path_provider_foundation:
    dependency: transitive
    description:
@@ -472,6 +512,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.8"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.1"
  recase:
    dependency: transitive
    description:
@@ -484,10 +532,42 @@ packages:
    dependency: transitive
    description:
      name: screen_retriever
-      sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90"
+      sha256: "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.9"
+    version: "0.2.0"
+  screen_retriever_linux:
+    dependency: transitive
+    description:
+      name: screen_retriever_linux
+      sha256: f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  screen_retriever_macos:
+    dependency: transitive
+    description:
+      name: screen_retriever_macos
+      sha256: "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  screen_retriever_platform_interface:
+    dependency: transitive
+    description:
+      name: screen_retriever_platform_interface
+      sha256: ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  screen_retriever_windows:
+    dependency: transitive
+    description:
+      name: screen_retriever_windows
+      sha256: "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
  scroll_pos:
    dependency: transitive
    description:
@@ -500,23 +580,23 @@ packages:
    dependency: "direct main"
    description:
      name: share_plus
-      sha256: ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544
+      sha256: "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400"
      url: "https://pub.dev"
    source: hosted
-    version: "9.0.0"
+    version: "10.1.3"
  share_plus_platform_interface:
    dependency: transitive
    description:
      name: share_plus_platform_interface
-      sha256: "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4"
+      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0"
+    version: "5.0.2"
  sky_engine:
    dependency: transitive
    description: flutter
    source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
  source_span:
    dependency: transitive
    description:
@@ -537,10 +617,10 @@ packages:
    dependency: "direct main"
    description:
      name: sqlite3
-      sha256: b384f598b813b347c5a7e5ffad82cbaff1bec3d1561af267041e66f6f0899295
+      sha256: cb7f4e9dc1b52b1fa350f7b3d41c662e75fc3d399555fa4e5efcf267e9a4fbb5
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.3"
+    version: "2.5.0"
  sqlite3_flutter_libs:
    dependency: "direct main"
    description:
@@ -553,10 +633,10 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
  stream_channel:
    dependency: transitive
    description:
@@ -569,10 +649,10 @@ packages:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
  term_glyph:
    dependency: transitive
    description:
@@ -585,10 +665,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.0"
+    version: "0.7.3"
  typed_data:
    dependency: transitive
    description:
@@ -601,10 +681,10 @@ packages:
    dependency: "direct main"
    description:
      name: url_launcher
-      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
+      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
      url: "https://pub.dev"
    source: hosted
-    version: "6.2.6"
+    version: "6.3.1"
  url_launcher_android:
    dependency: transitive
    description:
@@ -649,18 +729,18 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_web
-      sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
+      sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.1"
+    version: "2.3.3"
  url_launcher_windows:
    dependency: transitive
    description:
      name: url_launcher_windows
-      sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
+      sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.1"
+    version: "3.1.3"
  uuid:
    dependency: transitive
    description:
@@ -681,34 +761,34 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
      url: "https://pub.dev"
    source: hosted
-    version: "14.2.1"
+    version: "14.3.0"
  web:
    dependency: transitive
    description:
      name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.1"
+    version: "1.1.0"
  webview_flutter:
    dependency: "direct main"
    description:
      name: webview_flutter
-      sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932"
+      sha256: "889a0a678e7c793c308c68739996227c9661590605e70b1f6cf6b9a6634f7aec"
      url: "https://pub.dev"
    source: hosted
-    version: "4.7.0"
+    version: "4.10.0"
  webview_flutter_android:
    dependency: transitive
    description:
      name: webview_flutter_android
-      sha256: dad3313c9ead95517bb1cae5e1c9d20ba83729d5a59e5e83c0a2d66203f27f91
+      sha256: "3d535126f7244871542b2f0b0fcf94629c9a14883250461f9abe1a6644c1c379"
      url: "https://pub.dev"
    source: hosted
-    version: "3.16.1"
+    version: "4.2.0"
  webview_flutter_platform_interface:
    dependency: transitive
    description:
@@ -721,18 +801,18 @@ packages:
    dependency: transitive
    description:
      name: webview_flutter_wkwebview
-      sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0"
+      sha256: b7e92f129482460951d96ef9a46b49db34bd2e1621685de26e9eaafd9674e7eb
      url: "https://pub.dev"
    source: hosted
-    version: "3.13.1"
+    version: "3.16.3"
  win32:
    dependency: transitive
    description:
      name: win32
-      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
+      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
      url: "https://pub.dev"
    source: hosted
-    version: "5.5.0"
+    version: "5.5.4"
  win32_registry:
    dependency: "direct main"
    description:
@@ -745,10 +825,10 @@ packages:
    dependency: "direct main"
    description:
      name: window_manager
-      sha256: b3c895bdf936c77b83c5254bec2e6b3f066710c1f89c38b20b8acc382b525494
+      sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.8"
+    version: "0.4.3"
  xdg_directories:
    dependency: transitive
    description:
@@ -766,5 +846,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=3.3.4 <4.0.0"
-  flutter: ">=3.22.3"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.27.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,7 +20,7 @@ version: 1.0.9+109

 environment:
  sdk: '>=3.3.4 <4.0.0'
-  flutter: 3.22.3
+  flutter: 3.27.0

 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -35,30 +35,30 @@ dependencies:

  # The following adds the Cupertino Icons font to your application.
  # Use with the CupertinoIcons class for iOS style icons.
-  window_manager: ^0.3.8
-  fluent_ui: ^4.8.7
+  window_manager: ^0.4.3
+  fluent_ui: ^4.10.0
  dynamic_color: ^1.7.0
-  dio: ^5.4.3
-  crypto:
+  dio: ^5.7.0
+  crypto: ^3.0.6
  intl:
-  path_provider:
-  url_launcher: ^6.1.8
-  app_links: ^6.0.1
-  win32_registry: ^1.1.3
+  path_provider: ^2.1.5
+  url_launcher: ^6.3.1
+  app_links: ^6.3.3
+  win32_registry: ^1.1.0
  flutter_staggered_grid_view: ^0.7.0
-  sqlite3: ^2.4.3
+  sqlite3: ^2.5.0
  sqlite3_flutter_libs: any
  photo_view:
    git:
      url: https://github.com/wgh136/photo_view
      ref: main
-  share_plus: ^9.0.0
+  share_plus: ^10.1.3
  file_selector: ^1.0.1
-  flutter_file_dialog: 3.0.1
-  archive: ^3.5.1
-  webview_flutter: ^4.7.0
+  flutter_file_dialog: ^3.0.2
+  archive: ^4.0.1
+  webview_flutter: ^4.10.0
  flutter_acrylic: 1.0.0+2
-  device_info_plus: ^10.1.0
+  device_info_plus: ^11.2.0
  image_gallery_saver:
    git:
      url: https://github.com/wgh136/image_gallery_saver
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -10,7 +10,7 @@
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <file_selector_windows/file_selector_windows.h>
 #include <flutter_acrylic/flutter_acrylic_plugin.h>
-#include <screen_retriever/screen_retriever_plugin.h>
+#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
@@ -25,8 +25,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
      registry->GetRegistrarForPlugin("FileSelectorWindows"));
  FlutterAcrylicPluginRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("FlutterAcrylicPlugin"));
-  ScreenRetrieverPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
+  ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
  SharePlusWindowsPluginCApiRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
  Sqlite3FlutterLibsPluginRegisterWithRegistrar(
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -7,7 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
  dynamic_color
  file_selector_windows
  flutter_acrylic
-  screen_retriever
+  screen_retriever_windows
  share_plus
  sqlite3_flutter_libs
  url_launcher_windows