fix

2023-11-17 16:51:57 +01:00 · 2023-11-17 16:51:57 +01:00 · 0024980e47
commit 0024980e47
parent 7ae0a82241
20 changed files with 195 additions and 203 deletions
--- a/lib/eval/bridge/m_provider.dart
+++ b/lib/eval/bridge/m_provider.dart
@ -695,6 +695,11 @@ class $MProvider extends MProvider with $Bridge<MProvider> {
                    BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.string),
                        nullable: true),
                    false),
+                BridgeParameter(
+                    'suffix',
+                    BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.string),
+                        nullable: true),
+                    false),
              ]),
        ),
        'getHtmlViaWebview': BridgeMethodDef(
@ -722,18 +727,6 @@ class $MProvider extends MProvider with $Bridge<MProvider> {
                    false),
              ]),
        ),
-        'base64': BridgeMethodDef(
-          BridgeFunctionDef(
-              returns: BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.string)),
-              params: [
-                BridgeParameter(
-                    'string',
-                    BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.string)),
-                    false),
-                BridgeParameter('type',
-                    BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.int)), false),
-              ]),
-        ),
        'regExp': BridgeMethodDef(
          BridgeFunctionDef(
              returns: BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.string)),
@ -787,12 +780,6 @@ class $MProvider extends MProvider with $Bridge<MProvider> {
          return $Future.wrap(MBridge.http(args[0]!.$reified, args[1]!.$reified)
              .then((value) => $String(value)));
        }),
-      'base64' => $Function((_, __, List<$Value?> args) {
-          final result = args[1]!.$reified == 0
-              ? utf8.decode(base64Url.decode(args[0]!.$reified))
-              : base64Url.encode(utf8.encode(args[0]!.$reified));
-          return $String(result);
-        }),
      "cryptoHandler" => $Function((_, __, List<$Value?> args) {
          return $String(MBridge.cryptoHandler(args[0]!.$value, args[1]!.$value,
              args[2]!.$value, args[3]!.$value));
@ -876,15 +863,16 @@ class $MProvider extends MProvider with $Bridge<MProvider> {
                  $List.wrap(value.map((e) => _toMVideo(e)).toList())))),
      "mp4UploadExtractor" => $Function((_, __, List<$Value?> args) =>
          $Future.wrap(MBridge.mp4UploadExtractor(args[0]!.$value,
-                  args[1]!.$value, args[2]!.$value, args[3]!.$value)
+                  args[1]!.$value, args[2]?.$value, args[3]!.$value)
              .then((value) =>
                  $List.wrap(value.map((e) => _toMVideo(e)).toList())))),
      "streamWishExtractor" => $Function((_, __, List<$Value?> args) => $Future
          .wrap(MBridge.streamWishExtractor(args[0]!.$value, args[1]!.$value)
              .then((value) =>
                  $List.wrap(value.map((e) => _toMVideo(e)).toList())))),
-      "filemoonExtractor" => $Function((_, __, List<$Value?> args) => $Future
-          .wrap(MBridge.filemoonExtractor(args[0]!.$value, args[1]?.$value)
+      "filemoonExtractor" => $Function((_, __, List<$Value?> args) =>
+          $Future.wrap(MBridge.filemoonExtractor(
+                  args[0]!.$value, args[1]?.$value ?? "", args[2]?.$value ?? "")
              .then((value) =>
                  $List.wrap(value.map((e) => _toMVideo(e)).toList())))),
      "toVideo" => $Function((_, __, List<$Value?> args) {
--- a/lib/eval/model/m_bridge.dart
+++ b/lib/eval/model/m_bridge.dart
@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:developer';
 import 'dart:io';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:dart_eval/dart_eval_bridge.dart';
@ -541,7 +542,7 @@ class MBridge {

        res = await request.send();
      }
-
+      log(res.statusCode.toString());
      if (res.statusCode == 403 && (source?.hasCloudflare ?? false)) {
        return await cloudflareBypass(
            url: url, sourceId: source!.id.toString(), method: 0);
@ -570,8 +571,8 @@ class MBridge {
  }

  static Future<List<Video>> filemoonExtractor(
-      String url, String prefix) async {
-    return await FilemoonExtractor().videosFromUrl(url, prefix);
+      String url, String prefix, String suffix) async {
+    return await FilemoonExtractor().videosFromUrl(url, prefix, suffix);
  }

  static Future<List<Video>> mp4UploadExtractor(
--- a/lib/eval/runtime/runtime.dart
+++ b/lib/eval/runtime/runtime.dart
@ -6,6 +6,5 @@ Runtime runtimeEval(Uint8List bytecode) {
  final runtime = Runtime(bytecode.buffer.asByteData());
  final plugin = MEvalPlugin();
  runtime.addPlugin(plugin);
-  runtime.setup();
  return runtime;
 }
--- a/lib/modules/anime/anime_player_view.dart
+++ b/lib/modules/anime/anime_player_view.dart
@ -21,10 +21,7 @@ import 'package:media_kit_video/media_kit_video_controls/src/controls/methods/vi

 class AnimePlayerView extends riv.ConsumerStatefulWidget {
  final Chapter episode;
-  const AnimePlayerView({
-    super.key,
-    required this.episode,
-  });
+  const AnimePlayerView({super.key, required this.episode});

  @override
  riv.ConsumerState<AnimePlayerView> createState() => _AnimePlayerViewState();
@ -67,12 +64,11 @@ class _AnimePlayerViewState extends riv.ConsumerState<AnimePlayerView> {
                },
              ),
            ),
-            body: WillPopScope(
-              onWillPop: () async {
+            body: PopScope(
+              onPopInvoked: (_) {
                SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
                    overlays: SystemUiOverlay.values);
                Navigator.pop(context);
-                return false;
              },
              child: const Center(
                child: Text("Error"),
@ -101,13 +97,12 @@ class _AnimePlayerViewState extends riv.ConsumerState<AnimePlayerView> {
            },
          ),
        ),
-        body: WillPopScope(
-          onWillPop: () async {
+        body: PopScope(
+          onPopInvoked: (_) {
            SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
                overlays: SystemUiOverlay.values);

            Navigator.pop(context);
-            return false;
          },
          child: Center(
            child: Text(error.toString()),
@ -129,13 +124,12 @@ class _AnimePlayerViewState extends riv.ConsumerState<AnimePlayerView> {
              },
            ),
          ),
-          body: WillPopScope(
-            onWillPop: () async {
+          body: PopScope(
+            onPopInvoked: (_) {
              SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
                  overlays: SystemUiOverlay.values);

              Navigator.pop(context);
-              return false;
            },
            child: const ProgressCenter(),
          ),
@ -150,11 +144,10 @@ class AnimeStreamPage extends riv.ConsumerStatefulWidget {
  final Chapter episode;
  final bool isLocal;
  const AnimeStreamPage(
-      {Key? key,
+      {super.key,
      required this.isLocal,
      required this.videos,
-      required this.episode})
-      : super(key: key);
+      required this.episode});

  @override
  riv.ConsumerState<AnimeStreamPage> createState() => _AnimeStreamPageState();
@ -939,12 +932,11 @@ class _AnimeStreamPageState extends riv.ConsumerState<AnimeStreamPage> {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
-      body: WillPopScope(
-        onWillPop: () async {
+      body: PopScope(
+        onPopInvoked: (_) {
          SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
              overlays: SystemUiOverlay.values);
          Navigator.pop(context);
-          return false;
        },
        child: _isDesktop ? _desktopPlayer() : _mobilePlayer(),
      ),
--- a/lib/modules/manga/detail/manga_detail_main.dart
+++ b/lib/modules/manga/detail/manga_detail_main.dart
@ -67,10 +67,9 @@ class _MangaReaderDetailState extends ConsumerState<MangaReaderDetail> {
                        .future);
                  }
                },
-                child: WillPopScope(
-                  onWillPop: () async {
+                child: PopScope(
+                  onPopInvoked: (_) {
                    Navigator.pop(context);
-                    return false;
                  },
                  child: Stack(
                    children: [
--- a/lib/modules/manga/detail/providers/update_manga_detail_providers.dart
+++ b/lib/modules/manga/detail/providers/update_manga_detail_providers.dart
@ -1,3 +1,4 @@
+import 'package:mangayomi/eval/model/m_bridge.dart';
 import 'package:mangayomi/eval/model/m_manga.dart';
 import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/chapter.dart';
@ -19,7 +20,8 @@ Future<dynamic> updateMangaDetail(UpdateMangaDetailRef ref,
  try {
    getManga = await ref
        .watch(getDetailProvider(url: manga.link!, source: source!).future);
-  } catch (_) {
+  } catch (e) {
+    botToast(e.toString());
    return;
  }
  manga
--- a/lib/modules/manga/detail/widgets/readmore.dart
+++ b/lib/modules/manga/detail/widgets/readmore.dart
@ -4,8 +4,7 @@ import 'package:mangayomi/providers/l10n_providers.dart';
 import 'package:mangayomi/utils/media_query.dart';

 class ReadMoreWidget extends StatefulWidget {
-  const ReadMoreWidget({Key? key, required this.text, required this.onChanged})
-      : super(key: key);
+  const ReadMoreWidget({super.key, required this.text, required this.onChanged});
  final Function(bool) onChanged;
  final String text;

--- a/lib/modules/manga/home/manga_home_screen.dart
+++ b/lib/modules/manga/home/manga_home_screen.dart
@ -97,11 +97,11 @@ class _MangaHomeScreenState extends ConsumerState<MangaHomeScreen> {
  @override
  Widget build(BuildContext context) {
    if (_selectedIndex == 2 && _isSearch && _query.isNotEmpty) {
-      _getManga = ref.watch(
-          searchProvider(source: widget.source, query: _query, page: 1));
-    } else if (_selectedIndex == 1 && !_isSearch && _query.isEmpty) {
      _getManga = ref
-          .watch(getLatestUpdatesProvider(source: widget.source, page: 1));
+          .watch(searchProvider(source: widget.source, query: _query, page: 1));
+    } else if (_selectedIndex == 1 && !_isSearch && _query.isEmpty) {
+      _getManga =
+          ref.watch(getLatestUpdatesProvider(source: widget.source, page: 1));
    } else if (_selectedIndex == 0 && !_isSearch && _query.isEmpty) {
      _getManga = ref.watch(getPopularProvider(
        source: widget.source,
@ -208,10 +208,9 @@ class _MangaHomeScreenState extends ConsumerState<MangaHomeScreen> {
            ),
          ),
        ),
-        body: WillPopScope(
-          onWillPop: () async {
+        body: PopScope(
+          onPopInvoked: (_) {
            Navigator.pop(context);
-            return false;
          },
          child: _getManga!.when(
            data: (data) {
--- a/lib/modules/manga/reader/reader_view.dart
+++ b/lib/modules/manga/reader/reader_view.dart
@ -68,12 +68,11 @@ class MangaReaderView extends ConsumerWidget {
                },
              ),
            ),
-            body: WillPopScope(
-              onWillPop: () async {
+            body: PopScope(
+              onPopInvoked: (_) {
                SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
                    overlays: SystemUiOverlay.values);
                Navigator.pop(context);
-                return false;
              },
              child: const Center(
                child: Text("Error"),
@ -98,12 +97,11 @@ class MangaReaderView extends ConsumerWidget {
            },
          ),
        ),
-        body: WillPopScope(
-          onWillPop: () async {
+        body: PopScope(
+          onPopInvoked: (_) {
            SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
                overlays: SystemUiOverlay.values);
            Navigator.pop(context);
-            return false;
          },
          child: Center(
            child: Text(error.toString()),
@ -123,12 +121,11 @@ class MangaReaderView extends ConsumerWidget {
              },
            ),
          ),
-          body: WillPopScope(
-            onWillPop: () async {
+          body: PopScope(
+            onPopInvoked: (_) {
              SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
                  overlays: SystemUiOverlay.values);
              Navigator.pop(context);
-              return false;
            },
            child: const ProgressCenter(),
          ),
@ -260,10 +257,9 @@ class _MangaChapterPageGalleryState
    final backgroundColor = ref.watch(backgroundColorStateProvider);
    final cropBorders = ref.watch(cropBordersStateProvider);
    final l10n = l10nLocalizations(context)!;
-    return WillPopScope(
-      onWillPop: () async {
+    return PopScope(
+      onPopInvoked: (_) {
        _goBack(context);
-        return false;
      },
      child: KeyboardListener(
        autofocus: true,
--- a/lib/modules/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart
+++ b/lib/modules/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart
@ -4,8 +4,7 @@ import 'package:flutter/material.dart';
 class CircularProgressIndicatorAnimateRotate extends StatefulWidget {
  final double progress;
  const CircularProgressIndicatorAnimateRotate(
-      {Key? key, required this.progress})
-      : super(key: key);
+      {super.key, required this.progress});

  @override
  State<CircularProgressIndicatorAnimateRotate> createState() =>
--- a/lib/modules/more/more_screen.dart
+++ b/lib/modules/more/more_screen.dart
@ -31,7 +31,7 @@ class MoreScreen extends StatelessWidget {
            const Divider(),
            // ListTile(
            //   onTap: () {},
-            //   leading:
+            //   leading: 
            //       const SizedBox(height: 40, child: Icon(Icons.cloud_off)),
            //   subtitle: const Text('Filter all entries in your library'),
            //   title: const Text('Donloaded only'),
--- a/lib/modules/webview/webview.dart
+++ b/lib/modules/webview/webview.dart
@ -92,10 +92,9 @@ class _MangaWebViewState extends ConsumerState<MangaWebView> {
            ),
          )
        : SafeArea(
-            child: WillPopScope(
-              onWillPop: () async {
+            child: PopScope(
+              onPopInvoked: (_) {
                _webViewController?.goBack();
-                return false;
              },
              child: Column(
                children: [
--- a/lib/router/router.dart
+++ b/lib/router/router.dart
@ -443,13 +443,11 @@ class RouterNotifier extends ChangeNotifier {
 }

 class CustomTransition extends CustomTransitionPage {
-  CustomTransition({required LocalKey key, required Widget child})
+  CustomTransition({required LocalKey super.key, required super.child})
      : super(
-          key: key,
          transitionsBuilder: (context, animation, secondaryAnimation, child) {
            return FadeTransition(opacity: animation, child: child);
          },
-          child: child,
        );
 }

@ -461,3 +459,11 @@ Route createRoute({required Widget page}) {
    },
  );
 }
+// I/vrf     ( 6408): 4<EFBFBD>~
+// I/URL_SAFE( 6408): NJV-
+// I/DEFAULT ( 6408): TkpWLQ==
+// I/shift   ( 6408): QnlYJVAB
+// I/shift_default( 6408): UW5sWUpWQUI=
+// I/rot13   ( 6408): HJ5fJHcJDHV=
+// I/vrfEncrypt( 6408): HJ5fJHcJDHV=
+// I/flutter ( 6408): vrf=HJ5fJHcJDHV%3D%0A
--- a/lib/services/anime_extractors/filemoon.dart
+++ b/lib/services/anime_extractors/filemoon.dart
@ -7,8 +7,9 @@ import 'package:mangayomi/utils/xpath_selector.dart';
 class FilemoonExtractor {
  final http.Client client = http.Client();

-  Future<List<Video>> videosFromUrl(String url, String prefix) async {
-    prefix = prefix.isEmpty ? "Filemoon - " : prefix;
+  Future<List<Video>> videosFromUrl(
+      String url, String prefix, String suffix) async {
+    prefix = prefix.isEmpty ? "Filemoon " : prefix;
    try {
      final response = await client.get(Uri.parse(url));

@ -44,7 +45,7 @@ class FilemoonExtractor {

        return Video(
          videoUrl,
-          "$prefix - $resolution",
+          "$prefix - $resolution $suffix",
          videoUrl,
          headers: videoHeaders,
        );
--- a/lib/services/anime_extractors/mp4upload_extractor.dart
+++ b/lib/services/anime_extractors/mp4upload_extractor.dart
@ -42,7 +42,7 @@ class Mp4uploadExtractor {
          .substringBefore('"');
      final resolutionMatch = qualityRegex.firstMatch(script);
      final resolution = resolutionMatch?.group(1) ?? 'Unknown resolution';
-      final quality = '$prefix Mp4Upload - $resolution $suffix';
+      final quality = '$prefix Mp4Upload - ${resolution}p $suffix';

      return [
        Video(videoUrl, quality, videoUrl, headers: newHeaders),
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@ -25,7 +25,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  IsarFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "IsarFlutterLibsPlugin"))
  MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin"))
  MediaKitVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitVideoPlugin"))
-  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
  ScreenBrightnessMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenBrightnessMacosPlugin"))
  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
--- a/native/hub/src/imagecrop.rs
+++ b/native/hub/src/imagecrop.rs
@ -17,7 +17,7 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.*/ 
+SOFTWARE.*/

 use crate::bridge::{RustOperation, RustRequest, RustResponse};
 use image::{DynamicImage, GenericImageView, ImageOutputFormat, ImageResult, Rgba};
@ -124,8 +124,7 @@ impl ImageCrop {
 }

 fn crop_image(image: Vec<u8>) -> DynamicImage {
-    let mut image =
-        ImageCrop::open(image).expect(&format!("Failed to load image"));
+    let mut image = ImageCrop::open(image).expect(&format!("Failed to load image"));

    let (top_left_corner, bottom_right_corner) = image.calculate_corners();

--- a/pubspec.lock
+++ b/pubspec.lock
@ -29,10 +29,10 @@ packages:
    dependency: "direct main"
    description:
      name: archive
-      sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03"
+      sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b"
      url: "https://pub.dev"
    source: hosted
-    version: "3.4.6"
+    version: "3.4.9"
  args:
    dependency: transitive
    description:
@ -100,10 +100,10 @@ packages:
    dependency: transitive
    description:
      name: build_daemon
-      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
+      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0"
+    version: "4.0.1"
  build_resolvers:
    dependency: transitive
    description:
@ -140,10 +140,10 @@ packages:
    dependency: transitive
    description:
      name: built_value
-      sha256: a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74
+      sha256: "723b4021e903217dfc445ec4cf5b42e27975aece1fc4ebbc1ca6329c2d9fb54e"
      url: "https://pub.dev"
    source: hosted
-    version: "8.6.3"
+    version: "8.7.0"
  cached_network_image:
    dependency: "direct main"
    description:
@ -220,10 +220,10 @@ packages:
    dependency: transitive
    description:
      name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
  convert:
    dependency: transitive
    description:
@ -236,10 +236,10 @@ packages:
    dependency: transitive
    description:
      name: cross_file
-      sha256: fd832b5384d0d6da4f6df60b854d33accaaeb63aa9e10e736a87381f08dee2cb
+      sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.3+5"
+    version: "0.3.3+6"
  crypto:
    dependency: "direct main"
    description:
@ -268,35 +268,35 @@ packages:
    dependency: transitive
    description:
      name: custom_lint
-      sha256: "837821e4619c167fd5a547b03bb2fc6be7e65b800ec75528848429705c31ceba"
+      sha256: f9a828b696930cf8307f9a3617b2b65c9b370e484dc845d69100cadb77506778
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.3"
+    version: "0.5.6"
  custom_lint_core:
    dependency: transitive
    description:
      name: custom_lint_core
-      sha256: "3bdebdd52a42b4d6e5be9cd833ad1ecfbbc23e1020ca537060e54085497aea9c"
+      sha256: e20a67737adcf0cf2465e734dd624af535add11f9edd1f2d444909b5b0749650
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.3"
+    version: "0.5.6"
  dart_eval:
    dependency: "direct main"
    description:
      path: "."
-      ref: f40fb94
-      resolved-ref: f40fb942f9a3a9d5fd6ca8393e753ed820f5bfed
-      url: "https://github.com/ethanblake4/dart_eval.git"
+      ref: d9091db
+      resolved-ref: d9091db309b7d5727792a702e916310e69865cb2
+      url: "https://github.com/kodjodevf/dart_eval.git"
    source: git
-    version: "0.6.5"
+    version: "0.7.1"
  dart_style:
    dependency: transitive
    description:
      name: dart_style
-      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
+      sha256: abd7625e16f51f554ea244d090292945ec4d4be7bfbaf2ec8cccea568919d334
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.3.3"
  dartx:
    dependency: transitive
    description:
@ -325,10 +325,10 @@ packages:
    dependency: transitive
    description:
      name: directed_graph
-      sha256: "82061c9ce3ac74d9c4c173fb03daac515d503a0f9f77c0010a872f8c344a4f03"
+      sha256: cd9b6711bfa4265dae864ef87c68809cc2da5fb4260911caa975c9f33026dc2b
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.9"
+    version: "0.4.0"
  draggable_menu:
    dependency: "direct main"
    description:
@ -357,10 +357,10 @@ packages:
    dependency: transitive
    description:
      name: exception_templates
-      sha256: e9303fd16ecdb845a14b397cb93476f807dd2b4706f5ee44f708dbc95c256c33
+      sha256: "378fa67f37cb1567162cbfd242fafb711e123d8c7127726a67aa5758dc2a8675"
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.4"
+    version: "0.3.0"
  expandable_text:
    dependency: "direct main"
    description:
@ -373,26 +373,26 @@ packages:
    dependency: transitive
    description:
      name: expressions
-      sha256: "75ca4343f9f8a38087bea130cf51395d737d87c6947cc19cbb8fb2732cae1a27"
+      sha256: "0a3a207dc4697bbb0e17c731c7f10f2df6f88d9dbb99ac83c4168a10b57e7a20"
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.5+1"
  extended_image:
    dependency: "direct main"
    description:
      name: extended_image
-      sha256: b4d72a27851751cfadaf048936d42939db7cd66c08fdcfe651eeaa1179714ee6
+      sha256: d7f091d068fcac7246c4b22a84b8dac59a62e04d29a5c172710c696e67a22f94
      url: "https://pub.dev"
    source: hosted
-    version: "8.1.1"
+    version: "8.2.0"
  extended_image_library:
    dependency: transitive
    description:
      name: extended_image_library
-      sha256: "8bf87c0b14dcb59200c923a9a3952304e4732a0901e40811428834ef39018ee1"
+      sha256: "9b55fc5ebc65fad984de66b8f177a1bef2a84d79203c9c213f75ff83c2c29edd"
      url: "https://pub.dev"
    source: hosted
-    version: "3.6.0"
+    version: "4.0.1"
  fake_async:
    dependency: transitive
    description:
@ -466,10 +466,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_inappwebview
-      sha256: f73505c792cf083d5566e1a94002311be497d984b5607f25be36d685cf6361cf
+      sha256: d198297060d116b94048301ee6749cd2e7d03c1f2689783f52d210a6b7aba350
      url: "https://pub.dev"
    source: hosted
-    version: "5.7.2+3"
+    version: "5.8.0"
  flutter_launcher_icons:
    dependency: "direct dev"
    description:
@ -482,10 +482,10 @@ packages:
    dependency: "direct dev"
    description:
      name: flutter_lints
-      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
+      sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.3"
+    version: "3.0.1"
  flutter_localizations:
    dependency: "direct main"
    description: flutter
@ -495,18 +495,18 @@ packages:
    dependency: transitive
    description:
      name: flutter_plugin_android_lifecycle
-      sha256: f185ac890306b5779ecbd611f52502d8d4d63d27703ef73161ca0407e815f02c
+      sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.16"
+    version: "2.0.17"
  flutter_riverpod:
    dependency: "direct main"
    description:
      name: flutter_riverpod
-      sha256: bdba94be666ecb1beeb0f5a748d96cdd6a37215f27e6b48c7673b95cecb800c8
+      sha256: "49b55e8a467229eedb801bd0864baa7f891c39cc00f790189ba8479e9ad0fa06"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.4"
+    version: "2.4.6"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@ -516,10 +516,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_web_auth_2
-      sha256: "8a255c782b7a15fcf35e423babb04ebad2840b30eddced4e51c65e3fe8e26d96"
+      sha256: "75613aa4d8e43df3de0fc3d93df36ae5b4ba2e94070384c5a9baeda99f5a235f"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
  flutter_web_auth_2_platform_interface:
    dependency: transitive
    description:
@ -537,10 +537,10 @@ packages:
    dependency: "direct main"
    description:
      name: font_awesome_flutter
-      sha256: "5fb789145cae1f4c3245c58b3f8fb287d055c26323879eab57a7bf0cfd1e45f3"
+      sha256: "52671aea66da73b58d42ec6d0912b727a42248dd9a7c76d6c20f275783c48c08"
      url: "https://pub.dev"
    source: hosted
-    version: "10.5.0"
+    version: "10.6.0"
  freezed_annotation:
    dependency: transitive
    description:
@ -569,10 +569,10 @@ packages:
    dependency: "direct main"
    description:
      name: go_router
-      sha256: a206cc4621a644531a2e05e7774616ab4d9d85eab1f3b0e255f3102937fccab1
+      sha256: c247a4f76071c3b97bb5ae8912968870d5565644801c5e09f3bc961b4d874895
      url: "https://pub.dev"
    source: hosted
-    version: "12.0.0"
+    version: "12.1.1"
  google_fonts:
    dependency: "direct main"
    description:
@ -673,10 +673,10 @@ packages:
    dependency: transitive
    description:
      name: iregexp
-      sha256: "0bab197b31adad22c32eef580cda11338dad24ee0e46187d994baef9acee7564"
+      sha256: "143859dcaeecf6f683102786762d70a47ef8441a0d2287a158172d32d38799cf"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.1"
+    version: "0.1.2"
  isar:
    dependency: "direct main"
    description:
@ -729,26 +729,26 @@ packages:
    dependency: "direct main"
    description:
      name: json_path
-      sha256: c3c4b5c2b5c61f1f8b4c35d8d5062c2e4c2aeaf2b57d621757060c938bc47d9a
+      sha256: "93f2cb012eb37112e62d3b5e5eb535431beb4c2566a9c1987b079b13b308763b"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.3"
+    version: "0.6.6"
  lazy_memo:
    dependency: transitive
    description:
      name: lazy_memo
-      sha256: ca4be412d65726f79a30ba6e40b7056f1dbefbb35ec42913365b3f3e86d49279
+      sha256: "3c58757c2bac430caa0467a4a86f8c69f24b17a4a6144f044b51024f5a915379"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.9"
+    version: "0.2.2"
  lints:
    dependency: transitive
    description:
      name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "3.0.0"
  logging:
    dependency: transitive
    description:
@ -858,10 +858,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
      url: "https://pub.dev"
    source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
  mime:
    dependency: transitive
    description:
@ -898,10 +898,10 @@ packages:
    dependency: "direct main"
    description:
      name: package_info_plus
-      sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a"
+      sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
      url: "https://pub.dev"
    source: hosted
-    version: "4.1.0"
+    version: "4.2.0"
  package_info_plus_platform_interface:
    dependency: transitive
    description:
@ -930,10 +930,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1"
+      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
  path_provider_foundation:
    dependency: transitive
    description:
@ -978,10 +978,10 @@ packages:
    dependency: transitive
    description:
      name: permission_handler_android
-      sha256: ace7d15a3d1a4a0b91c041d01e5405df221edb9de9116525efc773c74e6fc790
+      sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e
      url: "https://pub.dev"
    source: hosted
-    version: "11.0.5"
+    version: "11.1.0"
  permission_handler_apple:
    dependency: transitive
    description:
@ -994,10 +994,10 @@ packages:
    dependency: transitive
    description:
      name: permission_handler_platform_interface
-      sha256: f2343e9fa9c22ae4fd92d4732755bfe452214e7189afcc097380950cf567b4b2
+      sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4"
      url: "https://pub.dev"
    source: hosted
-    version: "3.11.5"
+    version: "3.12.0"
  permission_handler_windows:
    dependency: transitive
    description:
@ -1010,10 +1010,10 @@ packages:
    dependency: transitive
    description:
      name: petitparser
-      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+      sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6
      url: "https://pub.dev"
    source: hosted
-    version: "5.4.0"
+    version: "6.0.1"
  photo_view:
    dependency: "direct main"
    description:
@ -1026,10 +1026,10 @@ packages:
    dependency: transitive
    description:
      name: platform
-      sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
+      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
  plugin_platform_interface:
    dependency: transitive
    description:
@ -1098,10 +1098,10 @@ packages:
    dependency: transitive
    description:
      name: rfc_6901
-      sha256: "8d97680dada633146cf75ab9382f2ce2b7e4bd63ceecd867416cf43b5832b988"
+      sha256: df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.1"
+    version: "0.2.0"
  rinf:
    dependency: "direct main"
    description:
@ -1114,34 +1114,34 @@ packages:
    dependency: transitive
    description:
      name: riverpod
-      sha256: "2af3d127a6e4e34b89b8f1f018086f5ded04b8e538174f0510bba3e4c0d878b1"
+      sha256: "01fa385aa5d6db42fd602d8c400c28ae1c83d1fd6fbae1cbf0f4c78bac58d4b2"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.4"
+    version: "2.4.6"
  riverpod_analyzer_utils:
    dependency: transitive
    description:
      name: riverpod_analyzer_utils
-      sha256: d72d7096964baf288b55619fe48100001fc4564ab7923ed0a7f5c7650e03c0d6
+      sha256: "22a089135785f27e601075023f93c6622c43ef28c3ba1bef303cfbc314028e64"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.4"
+    version: "0.4.3"
  riverpod_annotation:
    dependency: "direct main"
    description:
      name: riverpod_annotation
-      sha256: "388b03ed91b8f5126318fa43221fe078ebc20c81523dec9fcb5237cb5431d4dd"
+      sha256: "670dc172c835a1638fe942552449f99adb40ea3faa2d4988081db3c2bd1a4891"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.1"
+    version: "2.3.1"
  riverpod_generator:
    dependency: "direct dev"
    description:
      name: riverpod_generator
-      sha256: "5b36ad2f2b562cffb37212e8d59390b25499bf045b732276e30a207b16a25f61"
+      sha256: f7c897ffac15f8b845b99ef88a1c8923df74ac8a2a96cd53eb9ecd5459baac27
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.3"
+    version: "2.3.6"
  rxdart:
    dependency: transitive
    description:
@ -1267,6 +1267,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.10.0"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
  sqflite:
    dependency: transitive
    description:
@ -1279,18 +1287,18 @@ packages:
    dependency: transitive
    description:
      name: sqflite_common
-      sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a"
+      sha256: "8ed044102f3135add97be8653662052838859f5400075ef227f8ad72ae320803"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.0"
+    version: "2.5.0+1"
  stack_trace:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
  state_notifier:
    dependency: transitive
    description:
@ -1303,10 +1311,10 @@ packages:
    dependency: transitive
    description:
      name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
  stream_transform:
    dependency: transitive
    description:
@ -1343,10 +1351,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
  time:
    dependency: transitive
    description:
@ -1391,74 +1399,74 @@ packages:
    dependency: "direct main"
    description:
      name: url_launcher
-      sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27"
+      sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.14"
+    version: "6.2.1"
  url_launcher_android:
    dependency: transitive
    description:
      name: url_launcher_android
-      sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330
+      sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def"
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.0"
+    version: "6.2.0"
  url_launcher_ios:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f"
+      sha256: "4ac97281cf60e2e8c5cc703b2b28528f9b50c8f7cebc71df6bdf0845f647268a"
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.5"
+    version: "6.2.0"
  url_launcher_linux:
    dependency: transitive
    description:
      name: url_launcher_linux
-      sha256: b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e
+      sha256: "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.6"
+    version: "3.1.0"
  url_launcher_macos:
    dependency: transitive
    description:
      name: url_launcher_macos
-      sha256: b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88
+      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.7"
+    version: "3.1.0"
  url_launcher_platform_interface:
    dependency: transitive
    description:
      name: url_launcher_platform_interface
-      sha256: "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618"
+      sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
  url_launcher_web:
    dependency: transitive
    description:
      name: url_launcher_web
-      sha256: "2942294a500b4fa0b918685aff406773ba0a4cd34b7f42198742a94083020ce5"
+      sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.20"
+    version: "2.2.0"
  url_launcher_windows:
    dependency: transitive
    description:
      name: url_launcher_windows
-      sha256: "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069"
+      sha256: "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.8"
+    version: "3.1.0"
  uuid:
    dependency: transitive
    description:
      name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      sha256: df5a4d8f22ee4ccd77f8839ac7cb274ebc11ef9adcce8b92be14b797fe889921
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.7"
+    version: "4.2.1"
  vector_math:
    dependency: transitive
    description:
@ -1479,10 +1487,10 @@ packages:
    dependency: transitive
    description:
      name: wakelock_plus
-      sha256: aac3f3258f01781ec9212df94eecef1eb9ba9350e106728def405baa096ba413
+      sha256: f45a6c03aa3f8322e0a9d7f4a0482721c8789cb41d555407367650b8f9c26018
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.1"
+    version: "1.1.3"
  wakelock_plus_platform_interface:
    dependency: transitive
    description:
@ -1503,10 +1511,10 @@ packages:
    dependency: transitive
    description:
      name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
  web_socket_channel:
    dependency: transitive
    description:
@ -1519,10 +1527,10 @@ packages:
    dependency: transitive
    description:
      name: win32
-      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
+      sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f"
      url: "https://pub.dev"
    source: hosted
-    version: "5.0.9"
+    version: "5.1.0"
  window_to_front:
    dependency: transitive
    description:
@ -1543,10 +1551,10 @@ packages:
    dependency: transitive
    description:
      name: xml
-      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
+      sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.0"
+    version: "6.4.2"
  xpath_selector:
    dependency: transitive
    description:
@ -1580,5 +1588,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=3.1.3 <4.0.0"
-  flutter: ">=3.13.0"
+  dart: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.0.7+28

 environment:
-  sdk: '>=3.1.3 <4.0.0'
+  sdk: '>=3.2.0 <4.0.0'


 dependencies:
@ -45,8 +45,8 @@ dependencies:
  scrollable_positioned_list: ^0.3.5
  dart_eval:
    git:
-      url: https://github.com/ethanblake4/dart_eval.git
-      ref: f40fb94
+      url: https://github.com/kodjodevf/dart_eval.git
+      ref: d9091db
  json_path: ^0.6.2
  bot_toast: ^4.1.3
  flutter_web_auth_2: ^3.0.2
@ -76,7 +76,7 @@ dev_dependencies:
  riverpod_generator: ^2.3.2
  flutter_launcher_icons: ^0.13.1
  isar_generator: ^3.1.0+1
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1

 flutter:
  uses-material-design: true
--- a/windows/flutter/CMakeLists.txt
+++ b/windows/flutter/CMakeLists.txt
@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
 # https://github.com/flutter/flutter/issues/57146.
 set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")

+# Set fallback configurations for older versions of the flutter tool.
+if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
+  set(FLUTTER_TARGET_PLATFORM "windows-x64")
+endif()
+
 # === Flutter Library ===
 set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")

@ -92,7 +97,7 @@ add_custom_command(
  COMMAND ${CMAKE_COMMAND} -E env
    ${FLUTTER_TOOL_ENVIRONMENT}
    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
-      windows-x64 $<CONFIG>
+      ${FLUTTER_TARGET_PLATFORM} $<CONFIG>
  VERBATIM
 )
 add_custom_target(flutter_assemble DEPENDS