From 53300dafef06f1b9294ab7784da0587fca9837c1 Mon Sep 17 00:00:00 2001 From: kodjomoustapha <107993382+kodjodevf@users.noreply.github.com> Date: Fri, 13 Dec 2024 18:21:49 +0100 Subject: [PATCH] Upgrade gradle config, Upgrade packages & some fix --- analysis_options.yaml | 3 + android/app/src/main/AndroidManifest.xml | 3 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 2 +- lib/main.dart | 7 + lib/modules/anime/widgets/mobile.dart | 9 +- lib/modules/anime/widgets/subtitle_view.dart | 35 ++-- .../providers/archive_reader_providers.dart | 17 +- .../backup_and_restore/providers/restore.dart | 2 +- .../src/localstore/localstore.dart | 2 +- lib/services/http/rhttp/rhttp.dart | 2 +- linux/flutter/generated_plugin_registrant.cc | 8 +- linux/flutter/generated_plugins.cmake | 2 +- macos/Flutter/GeneratedPluginRegistrant.swift | 4 +- pubspec.lock | 156 +++++++++++------- pubspec.yaml | 55 +++--- .../flutter/generated_plugin_registrant.cc | 6 +- windows/flutter/generated_plugins.cmake | 2 +- 18 files changed, 190 insertions(+), 127 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 61b6c4de..1b0cfa87 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -7,6 +7,9 @@ # The following line activates a set of recommended lints for Flutter apps, # packages, and plugins designed to encourage good coding practices. +analyzer: + errors: + unintended_html_in_doc_comment: ignore include: package:flutter_lints/flutter.yaml linter: diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 00d2e18f..8be03dcb 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -45,5 +45,8 @@ + diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e1ca574e..7bb2df6b 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 3434cf57..4fb62069 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false id "org.jetbrains.kotlin.android" version "1.9.0" apply false } diff --git a/lib/main.dart b/lib/main.dart index dcb5051f..37894df2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -40,6 +40,13 @@ void main(List args) async { await RustLib.init(); if (!(Platform.isAndroid || Platform.isIOS)) { await windowManager.ensureInitialized(); + WindowOptions windowOptions = WindowOptions( + center: true, + ); + windowManager.waitUntilReadyToShow(windowOptions, () async { + await windowManager.show(); + await windowManager.focus(); + }); } if (!kIsWeb && defaultTargetPlatform == TargetPlatform.windows) { final availableVersion = await WebViewEnvironment.getAvailableVersion(); diff --git a/lib/modules/anime/widgets/mobile.dart b/lib/modules/anime/widgets/mobile.dart index 1960e455..99ddbab3 100644 --- a/lib/modules/anime/widgets/mobile.dart +++ b/lib/modules/anime/widgets/mobile.dart @@ -131,7 +131,7 @@ class _MobileControllerWidgetState // package:screen_brightness Future.microtask(() async { try { - await ScreenBrightness().resetScreenBrightness(); + await ScreenBrightness.instance.resetApplicationScreenBrightness(); } catch (_) {} }); // -------------------------------------------------- @@ -238,8 +238,9 @@ class _MobileControllerWidgetState // package:screen_brightness Future.microtask(() async { try { - _brightnessValue.value = await ScreenBrightness().current; - ScreenBrightness().onCurrentBrightnessChanged.listen((value) { + _brightnessValue.value = await ScreenBrightness.instance.application; + ScreenBrightness.instance.onApplicationScreenBrightnessChanged + .listen((value) { if (mounted) { _brightnessValue.value = value; } @@ -272,7 +273,7 @@ class _MobileControllerWidgetState // -------------------------------------------------- // package:screen_brightness try { - await ScreenBrightness().setScreenBrightness(value); + await ScreenBrightness.instance.setApplicationScreenBrightness(value); } catch (_) {} _brightnessIndicator.value = true; _brightnessTimer?.cancel(); diff --git a/lib/modules/anime/widgets/subtitle_view.dart b/lib/modules/anime/widgets/subtitle_view.dart index 2c93df1b..02fd1265 100644 --- a/lib/modules/anime/widgets/subtitle_view.dart +++ b/lib/modules/anime/widgets/subtitle_view.dart @@ -76,14 +76,13 @@ class _CustomSubtitleViewState extends ConsumerState { padding = widget.configuration.padding; return LayoutBuilder( builder: (context, constraints) { - final textScaleFactor = widget.configuration.textScaleFactor ?? - MediaQuery.of(context).textScaleFactor * - sqrt( - ((constraints.maxWidth * constraints.maxHeight) / - (kTextScaleFactorReferenceWidth * - kTextScaleFactorReferenceHeight)) - .clamp(0.0, 1.0), - ); + final nr = (constraints.maxWidth * constraints.maxHeight); + const dr = + kTextScaleFactorReferenceWidth * kTextScaleFactorReferenceHeight; + final textScaleFactor = sqrt((nr / dr).clamp(0.0, 1.0)); + + final textScaler = widget.configuration.textScaler ?? + TextScaler.linear(textScaleFactor); return Material( color: Colors.transparent, child: AnimatedContainer( @@ -97,7 +96,7 @@ class _CustomSubtitleViewState extends ConsumerState { ].join('\n'), style: subtileTextStyle(ref), textAlign: textAlign, - textScaleFactor: textScaleFactor, + textScaler: textScaler, ), ), ); @@ -118,11 +117,21 @@ TextStyle subtileTextStyle(WidgetRef ref) { subSets.textColorG!, subSets.textColorB!), shadows: [ Shadow( - offset: const Offset(-1.5, -1.5), color: borderColor, blurRadius: 1.4), + offset: const Offset(-1.5, -1.5), + color: borderColor, + blurRadius: 1.4), Shadow( - offset: const Offset(1.5, -1.5), color: borderColor, blurRadius: 1.4), - Shadow(offset: const Offset(1.5, 1.5), color: borderColor, blurRadius: 1.4), - Shadow(offset: const Offset(-1.5, 1.5), color: borderColor, blurRadius: 1.4) + offset: const Offset(1.5, -1.5), + color: borderColor, + blurRadius: 1.4), + Shadow( + offset: const Offset(1.5, 1.5), + color: borderColor, + blurRadius: 1.4), + Shadow( + offset: const Offset(-1.5, 1.5), + color: borderColor, + blurRadius: 1.4) ], backgroundColor: Color.fromARGB( subSets.backgroundColorA!, diff --git a/lib/modules/manga/archive_reader/providers/archive_reader_providers.dart b/lib/modules/manga/archive_reader/providers/archive_reader_providers.dart index 9ac646d1..81def862 100644 --- a/lib/modules/manga/archive_reader/providers/archive_reader_providers.dart +++ b/lib/modules/manga/archive_reader/providers/archive_reader_providers.dart @@ -99,24 +99,23 @@ bool _isArchiveFile(String path) { LocalArchive _extractArchive(String path) { final localArchive = LocalArchive() ..path = path - ..extensionType = - setTypeExtension(p.extension(path).replaceFirst(".", "")) + ..extensionType = setTypeExtension(p.extension(path).replaceFirst(".", "")) ..name = p.basenameWithoutExtension(path); Archive? archive; final inputStream = InputFileStream(path); final extensionType = localArchive.extensionType; if (extensionType == LocalExtensionType.cbt || extensionType == LocalExtensionType.tar) { - archive = TarDecoder().decodeBuffer(inputStream); + archive = TarDecoder().decodeStream(inputStream); } else { - archive = ZipDecoder().decodeBuffer(inputStream); + archive = ZipDecoder().decodeStream(inputStream); } for (final file in archive.files) { final filename = file.name; if (file.isFile) { if (_isImageFile(filename) && !filename.startsWith('.')) { - final data = file.content as Uint8List; + final data = file.content; if (filename.contains("cover")) { localArchive.coverImage = data; } else { @@ -144,16 +143,16 @@ LocalArchive _extractArchive(String path) { if (extensionType == LocalExtensionType.cbt || extensionType == LocalExtensionType.tar) { - archive = TarDecoder().decodeBuffer(inputStream); + archive = TarDecoder().decodeStream(inputStream); } else { - archive = ZipDecoder().decodeBuffer(inputStream); + archive = ZipDecoder().decodeStream(inputStream); } final cover = archive.files.where((file) => file.isFile && _isImageFile(file.name) && file.name.contains("cover")); if (cover.isNotEmpty) { - coverImage = cover.first.content as Uint8List; + coverImage = cover.first.content; } else { List lArchive = archive.files .where((file) => @@ -164,7 +163,7 @@ LocalArchive _extractArchive(String path) { lArchive.sort( (a, b) => a.name.compareTo(b.name), ); - coverImage = lArchive.first.content as Uint8List; + coverImage = lArchive.first.content; } return (name, extensionType, coverImage, path); diff --git a/lib/modules/more/backup_and_restore/providers/restore.dart b/lib/modules/more/backup_and_restore/providers/restore.dart index 74d97d33..e9f0da00 100644 --- a/lib/modules/more/backup_and_restore/providers/restore.dart +++ b/lib/modules/more/backup_and_restore/providers/restore.dart @@ -28,7 +28,7 @@ part 'restore.g.dart'; @riverpod void doRestore(Ref ref, {required String path, required BuildContext context}) { final inputStream = InputFileStream(path); - final archive = ZipDecoder().decodeBuffer(inputStream); + final archive = ZipDecoder().decodeStream(inputStream); final backup = jsonDecode(utf8.decode(archive.files.first.content)) as Map; if (backup['version'] == "1") { diff --git a/lib/services/background_downloader/src/localstore/localstore.dart b/lib/services/background_downloader/src/localstore/localstore.dart index ad0a4478..e1649026 100644 --- a/lib/services/background_downloader/src/localstore/localstore.dart +++ b/lib/services/background_downloader/src/localstore/localstore.dart @@ -1,6 +1,6 @@ // ignore_for_file: depend_on_referenced_packages -library localstore; +library; import 'dart:async'; import 'dart:io'; diff --git a/lib/services/http/rhttp/rhttp.dart b/lib/services/http/rhttp/rhttp.dart index 8a95efee..f08094a7 100644 --- a/lib/services/http/rhttp/rhttp.dart +++ b/lib/services/http/rhttp/rhttp.dart @@ -1,4 +1,4 @@ -library rhttp; +library; export 'src/client/compatible_client.dart' show RhttpCompatibleClient, RhttpWrappedClientException; diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 60476fb0..67266b0e 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -32,9 +32,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) media_kit_video_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitVideoPlugin"); media_kit_video_plugin_register_with_registrar(media_kit_video_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) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index a6727cd9..b3ff0c98 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -8,7 +8,7 @@ list(APPEND FLUTTER_PLUGIN_LIST isar_flutter_libs media_kit_libs_linux media_kit_video - screen_retriever + screen_retriever_linux url_launcher_linux window_manager window_to_front diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 76fa67fc..0ffae2aa 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -14,7 +14,7 @@ import media_kit_video import package_info_plus import path_provider_foundation import screen_brightness_macos -import screen_retriever +import screen_retriever_macos import share_plus import url_launcher_macos import wakelock_plus @@ -31,7 +31,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) ScreenBrightnessMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenBrightnessMacosPlugin")) - ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin")) + ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin")) diff --git a/pubspec.lock b/pubspec.lock index b0c43959..0e28a842 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,10 +42,10 @@ packages: dependency: "direct main" description: name: archive - sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + sha256: "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8" url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "4.0.1" args: dependency: transitive description: @@ -419,10 +419,10 @@ packages: dependency: "direct main" description: name: ffigen - sha256: "3e12e80ccb6539bb3917217bb6f32709220efb737de0d0fa8736da0b7cb507da" + sha256: e0bdaa4ff30106aab68e7fa19311df4ced2035dc07be30f2e112855e8dcd3259 url: "https://pub.dev" source: hosted - version: "12.0.0" + version: "16.0.0" file: dependency: transitive description: @@ -435,10 +435,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "89500471922dd3a89ab0d6e13ab4a2268c25474bff4ca7c628f55c76e0ced1de" + sha256: "16dc141db5a2ccc6520ebb6a2eb5945b1b09e95085c021d9f914f8ded7f1465c" url: "https://pub.dev" source: hosted - version: "8.1.5" + version: "8.1.4" fixnum: dependency: transitive description: @@ -560,10 +560,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" flutter_localizations: dependency: "direct main" description: flutter @@ -768,10 +768,10 @@ packages: dependency: transitive description: name: image - sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + sha256: "599d08e369969bdf83138f5b4e0a7e823d3f992f23b8a64dd626877c37013533" url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.4.0" infinite_listview: dependency: transitive description: @@ -829,13 +829,13 @@ packages: source: hosted version: "3.1.0+1" js: - dependency: transitive + dependency: "direct overridden" description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.7.1" js_packer: dependency: "direct main" description: @@ -912,10 +912,10 @@ packages: dependency: transitive description: name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + sha256: "4a16b3f03741e1252fda5de3ce712666d010ba2122f8e912c94f9f7b90e1a4c3" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.1.0" logging: dependency: transitive description: @@ -959,10 +959,11 @@ packages: media_kit: dependency: "direct main" description: - name: media_kit - sha256: "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62" - url: "https://pub.dev" - source: hosted + path: media_kit + ref: "652c49e02701bb6bb80953a6fdf650a5c8f002f9" + resolved-ref: "652c49e02701bb6bb80953a6fdf650a5c8f002f9" + url: "https://github.com/media-kit/media-kit.git" + source: git version: "1.1.11" media_kit_libs_android_video: dependency: transitive @@ -1008,26 +1009,25 @@ packages: dependency: "direct overridden" description: path: "libs/windows/media_kit_libs_windows_video" - ref: "73c14623332003ce47f49b91528c73843e8ddcd2" - resolved-ref: "73c14623332003ce47f49b91528c73843e8ddcd2" + ref: "652c49e02701bb6bb80953a6fdf650a5c8f002f9" + resolved-ref: "652c49e02701bb6bb80953a6fdf650a5c8f002f9" url: "https://github.com/media-kit/media-kit.git" source: git version: "1.0.10" media_kit_native_event_loop: - dependency: "direct overridden" + dependency: transitive description: - path: media_kit_native_event_loop - ref: "73c14623332003ce47f49b91528c73843e8ddcd2" - resolved-ref: "73c14623332003ce47f49b91528c73843e8ddcd2" - url: "https://github.com/media-kit/media-kit.git" - source: git + name: media_kit_native_event_loop + sha256: "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40" + url: "https://pub.dev" + source: hosted version: "1.0.9" media_kit_video: dependency: "direct main" description: path: media_kit_video - ref: "73c14623332003ce47f49b91528c73843e8ddcd2" - resolved-ref: "73c14623332003ce47f49b91528c73843e8ddcd2" + ref: "652c49e02701bb6bb80953a6fdf650a5c8f002f9" + resolved-ref: "652c49e02701bb6bb80953a6fdf650a5c8f002f9" url: "https://github.com/media-kit/media-kit.git" source: git version: "1.2.5" @@ -1075,18 +1075,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce + sha256: "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d" url: "https://pub.dev" source: hosted - version: "8.1.1" + version: "8.1.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 + sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" path: dependency: "direct main" description: @@ -1239,6 +1239,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + posix: + dependency: transitive + description: + name: posix + sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a + url: "https://pub.dev" + source: hosted + version: "6.0.1" pseudom: dependency: "direct main" description: @@ -1338,66 +1346,98 @@ packages: dependency: transitive description: name: safe_local_storage - sha256: ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440 + sha256: e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236 url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "2.0.1" screen_brightness: - dependency: transitive + dependency: "direct main" description: name: screen_brightness - sha256: ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd + sha256: a9a98666045ad4ea0d82bca09fe5f007b8440e315075dc948c1507a9b72ee41f url: "https://pub.dev" source: hosted - version: "0.2.2+1" + version: "2.0.1" screen_brightness_android: dependency: transitive description: name: screen_brightness_android - sha256: "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf" + sha256: "74455f9901ab8a1a45c9097b83855dbbb7498110cc2bc249cb5a86570dd1cf7c" url: "https://pub.dev" source: hosted - version: "0.1.0+2" + version: "2.0.0" screen_brightness_ios: dependency: transitive description: name: screen_brightness_ios - sha256: "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2" + sha256: caee02b34e0089b138a7aee35c461bd2d7c78446dd417f07613def192598ca08 url: "https://pub.dev" source: hosted - version: "0.1.0" + version: "2.0.0" screen_brightness_macos: dependency: transitive description: name: screen_brightness_macos - sha256: "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd" + sha256: "84fc8ffcbcf19c03d76b7673b0f2c2a2663c09aa2bc37c76ea83ab049294a97a" url: "https://pub.dev" source: hosted - version: "0.1.0+1" + version: "2.0.0" screen_brightness_platform_interface: dependency: transitive description: name: screen_brightness_platform_interface - sha256: b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171 + sha256: "321e9455b0057e3647fd37700931e063739d94a8aa1b094f98133c01cb56c27b" url: "https://pub.dev" source: hosted - version: "0.1.0" + version: "2.0.0" screen_brightness_windows: dependency: transitive description: name: screen_brightness_windows - sha256: "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86" + sha256: "5edbfb1dcaedf960f6858efac8ca45d6c18faae17df86e2c03137d3a563ea155" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "2.0.1" screen_retriever: 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" scrollable_positioned_list: dependency: "direct main" description: @@ -1410,18 +1450,18 @@ packages: dependency: "direct main" description: name: share_plus - sha256: "9c9bafd4060728d7cdb2464c341743adbd79d327cb067ec7afb64583540b47c8" + sha256: "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400" url: "https://pub.dev" source: hosted - version: "10.1.2" + version: "10.1.3" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - sha256: c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48 + sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "5.0.2" shelf: dependency: transitive description: @@ -1583,10 +1623,10 @@ packages: dependency: transitive description: name: uri_parser - sha256: "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835" + sha256: ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270 url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "3.0.0" url_launcher: dependency: "direct main" description: @@ -1743,10 +1783,10 @@ packages: dependency: "direct main" description: name: window_manager - sha256: "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf" + sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059" url: "https://pub.dev" source: hosted - version: "0.3.9" + version: "0.4.3" window_to_front: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d1117124..5443217e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,16 +14,16 @@ dependencies: go_router: ^14.2.0 flutter_riverpod: ^2.6.1 riverpod_annotation: ^2.6.1 - html: ^0.15.4 - font_awesome_flutter: ^10.7.0 + html: ^0.15.5 + font_awesome_flutter: ^10.8.0 expandable_text: ^2.3.0 flex_color_scheme: ^7.3.1 - extended_image: ^9.0.4 + extended_image: ^9.0.7 photo_view: ^0.15.0 grouped_list: ^6.0.0 intl: ^0.19.0 google_fonts: ^6.2.1 - url_launcher: ^6.3.0 + url_launcher: ^6.3.1 package_info_plus: ^8.0.0 permission_handler: ^11.3.1 flutter_inappwebview: ^6.2.0-beta.2 @@ -32,31 +32,35 @@ dependencies: isar_flutter_libs: 3.1.0+1 share_plus: ^10.0.2 xpath_selector_html_parser: ^3.0.1 - archive: ^3.6.1 - file_picker: ^8.0.5 - path_provider: ^2.1.3 + archive: ^4.0.1 + file_picker: 8.1.4 + path_provider: ^2.1.5 scrollable_positioned_list: ^0.3.8 dart_eval: ^0.7.10 - json_path: ^0.7.2 + json_path: ^0.7.4 bot_toast: ^4.1.3 flutter_web_auth_2: ^3.1.2 numberpicker: ^2.1.2 encrypt: ^5.0.3 media_kit: ^1.1.10+1 - media_kit_video: ^1.2.4 + media_kit_video: + git: + url: https://github.com/media-kit/media-kit.git + path: media_kit_video + ref: 652c49e02701bb6bb80953a6fdf650a5c8f002f9 media_kit_libs_video: ^1.0.4 - crypto: ^3.0.3 - cupertino_icons: ^1.0.6 - window_manager: ^0.3.9 - ffi: ^2.1.2 - ffigen: ^12.0.0 + crypto: ^3.0.6 + cupertino_icons: ^1.0.8 + window_manager: ^0.4.3 + ffi: ^2.1.3 + ffigen: ^16.0.0 http_interceptor: ^2.0.0 js_packer: ^0.0.5 flutter_qjs: git: url: https://github.com/kodjodevf/flutter_qjs.git ref: main - http: ^1.2.1 + http: ^1.2.2 flutter_code_editor: ^0.3.1 flutter_highlight: ^0.7.0 highlight: ^0.7.0 @@ -73,30 +77,27 @@ dependencies: url: https://github.com/kodjodevf/desktop_webview_window.git path: packages/desktop_webview_window ref: main + screen_brightness: ^2.0.1 dependency_overrides: - http: ^1.2.1 - ffi: ^2.1.2 + http: ^1.2.2 + ffi: ^2.1.3 flex_seed_scheme: ^2.0.0 analyzer: ">=5.2.0 <7.0.0" html: ^0.15.4 - media_kit_native_event_loop: - git: - url: https://github.com/media-kit/media-kit.git - path: media_kit_native_event_loop - ref: 73c14623332003ce47f49b91528c73843e8ddcd2 media_kit_libs_windows_video: git: url: https://github.com/media-kit/media-kit.git path: libs/windows/media_kit_libs_windows_video - ref: 73c14623332003ce47f49b91528c73843e8ddcd2 - media_kit_video: + ref: 652c49e02701bb6bb80953a6fdf650a5c8f002f9 + media_kit: git: url: https://github.com/media-kit/media-kit.git - path: media_kit_video - ref: 73c14623332003ce47f49b91528c73843e8ddcd2 + path: media_kit + ref: 652c49e02701bb6bb80953a6fdf650a5c8f002f9 meta: ^1.15.0 collection: ^1.19.0 + js: ^0.7.1 dev_dependencies: @@ -106,7 +107,7 @@ dev_dependencies: riverpod_generator: ^2.6.3 flutter_launcher_icons: ^0.13.1 isar_generator: ^3.1.0+1 - flutter_lints: ^4.0.0 + flutter_lints: ^5.0.0 freezed: ^2.0.0 flutter: diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 59330a91..109f20f0 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -34,8 +34,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); ScreenBrightnessWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("ScreenBrightnessWindowsPlugin")); - ScreenRetrieverPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("ScreenRetrieverPlugin")); + ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); SharePlusWindowsPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 88481ead..f0b53845 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -10,7 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST media_kit_video permission_handler_windows screen_brightness_windows - screen_retriever + screen_retriever_windows share_plus url_launcher_windows window_manager