diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index dcdacb220..73bd89f0a 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v2 - uses: subosito/flutter-action@main with: - flutter-version: 3.0.4 + flutter-version: 3.3.9 cache: true - name: Install Dependencies run: | @@ -76,7 +76,7 @@ jobs: - uses: actions/checkout@v2 - uses: subosito/flutter-action@main with: - flutter-version: 3.0.4 + flutter-version: 3.3.9 cache: true - name: Build App run: | @@ -125,7 +125,7 @@ jobs: - uses: actions/checkout@v2 - uses: subosito/flutter-action@main with: - flutter-version: 3.0.4 + flutter-version: 3.3.9 cache: true - name: Build run: | @@ -250,7 +250,7 @@ jobs: - uses: actions/checkout@v2 - uses: subosito/flutter-action@main with: - flutter-version: 3.0.4 + flutter-version: 3.3.9 cache: true - name: Install dependencies run: | @@ -272,7 +272,7 @@ jobs: - uses: actions/checkout@v2 - uses: subosito/flutter-action@main with: - flutter-version: 3.0.4 + flutter-version: 3.3.9 cache: true - name: Generate coverage run: | diff --git a/.github/workflows/Pull Request Analyze.yml b/.github/workflows/Pull Request Analyze.yml index ab59a708a..86e0b619c 100644 --- a/.github/workflows/Pull Request Analyze.yml +++ b/.github/workflows/Pull Request Analyze.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v2 - uses: subosito/flutter-action@main with: - flutter-version: 3.0.4 + flutter-version: 3.3.9 cache: true - run: flutter pub get - name: Analyze code @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v2 - uses: subosito/flutter-action@main with: - flutter-version: 3.0.4 + flutter-version: 3.3.9 cache: true - name: Generate coverage run: | @@ -59,7 +59,7 @@ jobs: - uses: actions/checkout@v2 - uses: subosito/flutter-action@main with: - flutter-version: 3.0.4 + flutter-version: 3.3.9 cache: true - name: Install Dependencies if: ${{ runner.os == 'Linux' }} diff --git a/assets/lang/en_us.json b/assets/lang/en_us.json index 03e2414f3..724246772 100644 --- a/assets/lang/en_us.json +++ b/assets/lang/en_us.json @@ -407,10 +407,6 @@ "rpmlauncher.tips.1": "Press Escape key to return to the previous page", "rpmlauncher.tips.2": "RPMLauncher will automatically download dependent mods", "rpmlauncher.tips.3": "Did you find the rickroll easter eggs?", - "rpmlauncher.feedback.submit": "Submit", - "rpmlauncher.feedback.description": "Please describe your issue or suggestion", - "rpmlauncher.feedback.draw": "Draw", - "rpmlauncher.feedback.navigate": "Move Interface", "rpmlauncher.file.delete.error": "Failed to delete the file. It may be that a game or other program is accessing the file", "rpmlauncher.exit_confirm.title": "Do you really want to close the window?", "mods.filter.notfound": "The current filtering method cannot find any mods", diff --git a/lib/handler/window_handler.dart b/lib/handler/window_handler.dart index 0d809ff7a..3a258229b 100644 --- a/lib/handler/window_handler.dart +++ b/lib/handler/window_handler.dart @@ -174,6 +174,11 @@ class _SelfWindowController implements WindowController { await windowManager.show(); } + @override + Future resizable(bool resizable) async { + return resizable; + } + @override int get windowId => id; } diff --git a/lib/screen/home_page.dart b/lib/screen/home_page.dart index 5a348c7d8..db582794d 100644 --- a/lib/screen/home_page.dart +++ b/lib/screen/home_page.dart @@ -68,7 +68,7 @@ class _HomePageState extends State { child: Scaffold( appBar: AppBar( centerTitle: true, - leadingWidth: 300, + leadingWidth: 250, leading: RowScrollView( center: false, child: Row( @@ -105,11 +105,6 @@ class _HomePageState extends State { ); }, ), - IconButton( - icon: const Icon(Icons.bug_report), - onPressed: () => LauncherInfo.feedback(context), - tooltip: I18n.format('homepage.bug_report'), - ), IconButton( icon: const Icon(Icons.change_circle), tooltip: I18n.format('homepage.update'), diff --git a/lib/screen/loading_screen.dart b/lib/screen/loading_screen.dart index 8e31a8543..06eb50909 100644 --- a/lib/screen/loading_screen.dart +++ b/lib/screen/loading_screen.dart @@ -160,7 +160,7 @@ class _LoadingScreenState extends State { user: SentryUser( id: Config.getValue('ga_client_id'), username: userName, - extras: { + data: { 'userOrigin': LauncherInfo.userOrigin, 'githubSourceMap': githubSourceMap, 'config': Config.toMap() diff --git a/lib/screen/main_screen.dart b/lib/screen/main_screen.dart index d86de92a2..4996c833c 100644 --- a/lib/screen/main_screen.dart +++ b/lib/screen/main_screen.dart @@ -1,6 +1,5 @@ import 'dart:io'; -import 'package:feedback/feedback.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; @@ -14,7 +13,6 @@ import 'package:rpmlauncher/util/data.dart'; import 'package:rpmlauncher/route/GenerateRoute.dart'; import 'package:rpmlauncher/util/i18n.dart'; import 'package:rpmlauncher/util/launcher_info.dart'; -import 'package:rpmlauncher/util/RPMFeedbackLocalizations.dart'; import 'package:rpmlauncher/util/theme.dart'; import 'package:rpmlauncher/route/RPMNavigatorObserver.dart'; import 'package:rpmlauncher/util/updater.dart'; @@ -155,22 +153,8 @@ class _MainScreenState extends State { }; } - return BetterFeedback( - theme: FeedbackThemeData( - background: Colors.white10, - feedbackSheetColor: Colors.white12, - bottomSheetDescriptionStyle: const TextStyle( - fontFamily: 'font', - color: Colors.white, - ), - ), - localeOverride: WidgetsBinding.instance.window.locale, - localizationsDelegates: const [ - RPMFeedbackLocalizationsDelegate(), - ], - child: widget ?? - Scaffold(body: Center(child: Text(title, style: style))), - ); + return widget ?? + Scaffold(body: Center(child: Text(title, style: style))); }, onGenerateInitialRoutes: (String initialRouteName) { return [ diff --git a/lib/util/Intents.dart b/lib/util/Intents.dart index b8e6ec2dd..113ae301e 100644 --- a/lib/util/Intents.dart +++ b/lib/util/Intents.dart @@ -4,6 +4,4 @@ class EscIntent extends Intent {} class RestartIntent extends Intent {} -class FeedBackIntent extends Intent {} - class FullScreenIntent extends Intent {} diff --git a/lib/util/RPMFeedbackLocalizations.dart b/lib/util/RPMFeedbackLocalizations.dart deleted file mode 100644 index 86e215077..000000000 --- a/lib/util/RPMFeedbackLocalizations.dart +++ /dev/null @@ -1,44 +0,0 @@ -import 'package:feedback/feedback.dart'; -import 'package:flutter/material.dart'; -import 'package:rpmlauncher/util/i18n.dart'; - -class RPMFeedbackLocalizations extends FeedbackLocalizations { - const RPMFeedbackLocalizations(); - - @override - String get submitButtonText => I18n.format('rpmlauncher.feedback.submit'); - - @override - String get feedbackDescriptionText => - I18n.format('rpmlauncher.feedback.description'); - - @override - String get draw => I18n.format('rpmlauncher.feedback.draw'); - - @override - String get navigate => I18n.format('rpmlauncher.feedback.navigate'); -} - -class RPMFeedbackLocalizationsDelegate - extends LocalizationsDelegate { - const RPMFeedbackLocalizationsDelegate(); - - static const LocalizationsDelegate delegate = - RPMFeedbackLocalizationsDelegate(); - - @override - bool isSupported(Locale locale) { - return true; - } - - @override - Future load(Locale locale) async { - return const RPMFeedbackLocalizations(); - } - - @override - bool shouldReload(RPMFeedbackLocalizationsDelegate old) => false; - - @override - String toString() => 'DefaultFeedbackLocalizations.delegate(en_EN)'; -} diff --git a/lib/util/launcher_info.dart b/lib/util/launcher_info.dart index bb53ad3d5..2c2f87222 100644 --- a/lib/util/launcher_info.dart +++ b/lib/util/launcher_info.dart @@ -1,14 +1,11 @@ import 'dart:io'; -import 'package:feedback/feedback.dart'; import 'package:flutter/material.dart'; import 'package:path/path.dart'; import 'package:pub_semver/pub_semver.dart'; import 'package:rpmlauncher/util/config.dart'; import 'package:rpmlauncher/util/updater.dart'; import 'package:rpmlauncher/util/i18n.dart'; -import 'package:rpmtw_dart_common_library/rpmtw_dart_common_library.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; bool kTestMode = false; @@ -125,28 +122,4 @@ class LauncherInfo { static bool isDebugMode = false; static late DateTime startTime; - - static void feedback(BuildContext context) { - BetterFeedback.of(context).show((UserFeedback feedback) async { - String text = feedback.text; - if (text.isAllEmpty) { - return; - } - - // ignore: invalid_use_of_internal_member - final realHub = Sentry.currentHub; - - final id = await realHub.captureMessage(text, withScope: (scope) { - scope.addAttachment(SentryAttachment.fromUint8List( - feedback.screenshot, - 'screenshot.png', - contentType: 'image/png', - )); - }); - await realHub.captureUserFeedback(SentryUserFeedback( - eventId: id, - comments: '${feedback.text}\n${feedback.extra.toString()}', - )); - }); - } } diff --git a/lib/util/theme.dart b/lib/util/theme.dart index 2047df2e3..a0427b642 100644 --- a/lib/util/theme.dart +++ b/lib/util/theme.dart @@ -81,8 +81,8 @@ class ThemeUtility { ), elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( - primary: const Color.fromARGB(190, 86, 110, 244), - onPrimary: Colors.white)), + backgroundColor: const Color.fromARGB(190, 86, 110, 244), + foregroundColor: Colors.white)), useMaterial3: false), ThemeUtility.toInt(Themes.dark): ThemeData( brightness: Brightness.dark, @@ -101,8 +101,8 @@ class ThemeUtility { )), elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( - primary: const Color.fromARGB(190, 46, 160, 253), - onPrimary: Colors.white)), + backgroundColor: const Color.fromARGB(190, 46, 160, 253), + foregroundColor: Colors.white)), useMaterial3: true), }); } diff --git a/lib/util/util.dart b/lib/util/util.dart index e1dc8a06d..a06420b84 100644 --- a/lib/util/util.dart +++ b/lib/util/util.dart @@ -377,7 +377,7 @@ class Util { comparableVersion = Version.parse('$sourceVersion.0'); } } catch (e) { - String? _preVersion() { + String? preVersion() { int pos = sourceVersion.indexOf('-pre'); if (pos >= 0) return sourceVersion.substring(0, pos); @@ -392,7 +392,7 @@ class Util { return null; } - String? str = _preVersion(); + String? str = preVersion(); if (str != null) { try { return Version.parse(str); diff --git a/lib/view/Edit/mods_view.dart b/lib/view/Edit/mods_view.dart index be5558e41..3e92f48bc 100644 --- a/lib/view/Edit/mods_view.dart +++ b/lib/view/Edit/mods_view.dart @@ -123,7 +123,7 @@ class _ModsViewState extends State { logger.error(ErrorType.parseModInfo, "Mod Icon Parsing Error $err"); } - void _handle(Map map) { + void handle(Map map) { try { Map conflictsMap = map.cast(); conflictsMap.forEach((key, value) { @@ -136,10 +136,10 @@ class _ModsViewState extends State { } if (modInfoMap.containsKey("conflicts")) { - _handle(modInfoMap["conflicts"]); + handle(modInfoMap["conflicts"]); } if (modInfoMap.containsKey("breaks")) { - _handle(modInfoMap["breaks"]); + handle(modInfoMap["breaks"]); } return ModInfo( @@ -300,7 +300,7 @@ class _ModsViewState extends State { Widget build(BuildContext context) { final ReceivePort progressPort = ReceivePort(); - Future> _get() async { + Future> get() async { final ReceivePort hivePort = ReceivePort(); final List needPuts = []; @@ -329,7 +329,7 @@ class _ModsViewState extends State { } return FutureBuilder>( - future: _get(), + future: get(), builder: (context, snapshot) { if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) { diff --git a/lib/widget/launcher_shortcuts.dart b/lib/widget/launcher_shortcuts.dart index a19eab9a5..e38af98cc 100644 --- a/lib/widget/launcher_shortcuts.dart +++ b/lib/widget/launcher_shortcuts.dart @@ -4,7 +4,6 @@ import 'package:rpmlauncher/handler/window_handler.dart'; import 'package:rpmlauncher/screen/home_page.dart'; import 'package:rpmlauncher/util/i18n.dart'; import 'package:rpmlauncher/util/Intents.dart'; -import 'package:rpmlauncher/util/launcher_info.dart'; import 'package:rpmlauncher/util/data.dart'; import 'package:rpmlauncher/widget/rpmtw_design/OkClose.dart'; @@ -41,11 +40,6 @@ class LauncherShortcuts extends StatelessWidget { }); return; }), - FeedBackIntent: - CallbackAction(onInvoke: (FeedBackIntent intent) { - LauncherInfo.feedback(navigator.context); - return; - }), FullScreenIntent: CallbackAction( onInvoke: (FullScreenIntent intent) async { bool isFullScreen = await WindowHandler.isFullScreen(); @@ -57,8 +51,6 @@ class LauncherShortcuts extends StatelessWidget { LogicalKeySet(LogicalKeyboardKey.escape): EscIntent(), LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyR): RestartIntent(), - LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyF): - FeedBackIntent(), LogicalKeySet( LogicalKeyboardKey.f11, ): FullScreenIntent(), diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index ad69f06b8..4aefac852 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -24,6 +25,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) rpmlauncher_plugin_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "RpmlauncherPlugin"); rpmlauncher_plugin_register_with_registrar(rpmlauncher_plugin_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) sentry_flutter_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "SentryFlutterPlugin"); sentry_flutter_plugin_register_with_registrar(sentry_flutter_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 0a0891e5a..d611b994d 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_multi_window flutter_window_close rpmlauncher_plugin + screen_retriever sentry_flutter url_launcher_linux window_manager diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 2646249de..345c7adbe 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -10,6 +10,7 @@ import flutter_window_close import package_info_plus_macos import path_provider_macos import rpmlauncher_plugin +import screen_retriever import sentry_flutter import shared_preferences_macos import url_launcher_macos @@ -22,6 +23,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) RpmlauncherPlugin.register(with: registry.registrar(forPlugin: "RpmlauncherPlugin")) + ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin")) SentryFlutterPlugin.register(with: registry.registrar(forPlugin: "SentryFlutterPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) diff --git a/pubspec.lock b/pubspec.lock index e8201c788..fd2ba6b4d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,35 +7,35 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "38.0.0" + version: "50.0.0" after_layout: dependency: transitive description: name: after_layout url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "3.4.1" + version: "5.2.0" animations: dependency: transitive description: name: animations url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.7" archive: dependency: "direct main" description: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.3.1" + version: "3.3.5" args: dependency: "direct main" description: @@ -49,7 +49,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -63,14 +63,14 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.3.1" build_config: dependency: transitive description: name: build_config url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.1" build_daemon: dependency: transitive description: @@ -84,21 +84,21 @@ packages: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.0.10" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.1.10" + version: "2.3.2" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "7.2.3" + version: "7.2.7" built_collection: dependency: transitive description: @@ -112,21 +112,14 @@ packages: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.3.0" + version: "8.4.2" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" checked_yaml: dependency: transitive description: @@ -140,14 +133,14 @@ packages: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" code_builder: dependency: transitive description: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.3.0" collection: dependency: transitive description: @@ -168,7 +161,7 @@ packages: name: convert url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.1.1" crypto: dependency: "direct main" description: @@ -207,21 +200,21 @@ packages: name: dart_minecraft url: "https://pub.dartlang.org" source: hosted - version: "0.5.1" + version: "0.5.2" dart_style: dependency: transitive description: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.2.3" + version: "2.2.4" desktop_multi_window: dependency: "direct main" description: name: desktop_multi_window url: "https://pub.dartlang.org" source: hosted - version: "0.0.2" + version: "0.2.0" dio: dependency: "direct main" description: @@ -249,14 +242,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" - feedback: - dependency: "direct main" - description: - name: feedback - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.1" + version: "1.3.1" ffi: dependency: transitive description: @@ -270,14 +256,14 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.4" file_picker: dependency: "direct main" description: name: file_picker url: "https://pub.dartlang.org" source: hosted - version: "4.5.1" + version: "4.6.1" fixnum: dependency: transitive description: @@ -315,21 +301,21 @@ packages: name: flutter_markdown url: "https://pub.dartlang.org" source: hosted - version: "0.6.10" + version: "0.6.13" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.0.7" flutter_svg: dependency: transitive description: name: flutter_svg url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.1.6" flutter_test: dependency: "direct dev" description: flutter @@ -353,35 +339,35 @@ packages: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "3.2.0" glob: dependency: transitive description: name: glob url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.1.1" graphs: dependency: transitive description: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" hive: dependency: "direct main" description: name: hive url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.3" hive_generator: dependency: "direct dev" description: name: hive_generator url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "2.0.0" http: dependency: "direct main" description: @@ -395,14 +381,14 @@ packages: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "3.2.1" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.2" intl: dependency: "direct main" description: @@ -430,7 +416,14 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.5.0" + version: "4.7.0" + jwt_decoder: + dependency: transitive + description: + name: jwt_decoder + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" line_icons: dependency: "direct main" description: @@ -444,7 +437,7 @@ packages: name: lints url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.1" logger: dependency: transitive description: @@ -458,35 +451,35 @@ packages: name: logging url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.1.0" markdown: dependency: transitive description: name: markdown url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "6.0.1" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" mime: dependency: transitive description: @@ -514,14 +507,14 @@ packages: name: oauth2 url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.1" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.1.0" package_info_plus: dependency: transitive description: @@ -556,7 +549,7 @@ packages: name: package_info_plus_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.0.6" package_info_plus_windows: dependency: transitive description: @@ -570,49 +563,49 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" path_drawing: dependency: transitive description: name: path_drawing url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" path_parsing: dependency: transitive description: name: path_parsing url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" path_provider: dependency: "direct main" description: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.10" + version: "2.0.11" path_provider_android: dependency: transitive description: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.14" + version: "2.0.22" path_provider_ios: dependency: transitive description: name: path_provider_ios url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.11" path_provider_linux: dependency: transitive description: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.6" + version: "2.1.7" path_provider_macos: dependency: transitive description: @@ -626,21 +619,21 @@ packages: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.0.7" petitparser: dependency: transitive description: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "4.4.0" + version: "5.1.0" platform: dependency: transitive description: @@ -654,14 +647,21 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" + pointycastle: + dependency: transitive + description: + name: pointycastle + url: "https://pub.dartlang.org" + source: hosted + version: "3.6.2" pool: dependency: transitive description: name: pool url: "https://pub.dartlang.org" source: hosted - version: "1.5.0" + version: "1.5.1" process: dependency: transitive description: @@ -675,21 +675,21 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "6.0.2" + version: "6.0.4" pub_semver: dependency: "direct main" description: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.3" pubspec_parse: dependency: transitive description: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" quiver: dependency: "direct main" description: @@ -710,7 +710,7 @@ packages: name: rpmtw_api_client url: "https://pub.dartlang.org" source: hosted - version: "1.0.8-rc.9" + version: "1.0.9+3" rpmtw_dart_common_library: dependency: "direct main" description: @@ -718,20 +718,27 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.0.4" + screen_retriever: + dependency: transitive + description: + name: screen_retriever + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.4" sentry: dependency: transitive description: name: sentry url: "https://pub.dartlang.org" source: hosted - version: "6.5.1" + version: "6.17.0" sentry_flutter: dependency: "direct main" description: name: sentry_flutter url: "https://pub.dartlang.org" source: hosted - version: "6.5.1" + version: "6.17.0" shared_preferences: dependency: transitive description: @@ -745,7 +752,7 @@ packages: name: shared_preferences_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.12" + version: "2.0.14" shared_preferences_ios: dependency: transitive description: @@ -773,7 +780,7 @@ packages: name: shared_preferences_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" shared_preferences_web: dependency: transitive description: @@ -794,14 +801,14 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.4.0" shelf_web_socket: dependency: transitive description: name: shelf_web_socket url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.3" sky_engine: dependency: transitive description: flutter @@ -834,28 +841,28 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.2.2" + version: "1.2.6" source_helper: dependency: transitive description: name: source_helper url: "https://pub.dartlang.org" source: hosted - version: "1.3.2" + version: "1.3.3" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" split_view: dependency: "direct main" description: name: split_view url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.2.1" stack_trace: dependency: transitive description: @@ -876,28 +883,28 @@ packages: name: stream_transform url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" timing: dependency: transitive description: @@ -911,7 +918,7 @@ packages: name: toml url: "https://pub.dartlang.org" source: hosted - version: "0.12.0" + version: "0.13.1" typed_data: dependency: transitive description: @@ -932,21 +939,21 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.7" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.17" + version: "6.0.22" url_launcher_ios: dependency: transitive description: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.16" + version: "6.0.17" url_launcher_linux: dependency: transitive description: @@ -967,14 +974,14 @@ packages: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.1.1" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.11" + version: "2.0.13" url_launcher_windows: dependency: transitive description: @@ -988,7 +995,7 @@ packages: name: uuid url: "https://pub.dartlang.org" source: hosted - version: "3.0.6" + version: "3.0.7" vector_math: dependency: transitive description: @@ -1002,7 +1009,7 @@ packages: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" web_socket_channel: dependency: transitive description: @@ -1016,14 +1023,14 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.5.2" + version: "2.6.1" window_manager: dependency: "direct main" description: name: window_manager url: "https://pub.dartlang.org" source: hosted - version: "0.2.3" + version: "0.2.7" window_size: dependency: "direct main" description: @@ -1039,14 +1046,14 @@ packages: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.2.0+1" + version: "0.2.0+2" xml: dependency: "direct main" description: name: xml url: "https://pub.dartlang.org" source: hosted - version: "5.3.1" + version: "6.1.0" yaml: dependency: transitive description: @@ -1055,5 +1062,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.17.0 <3.0.0" - flutter: ">=3.0.4" + dart: ">=2.18.0 <3.0.0" + flutter: ">=3.3.9" diff --git a/pubspec.yaml b/pubspec.yaml index f256c2e10..a5dd11c99 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ version: 1.0.7 environment: sdk: ">=2.17.0 <3.0.0" - flutter: ">=3.0.4 <4.0.0" + flutter: ">=3.3.9 <4.0.0" dependencies: flutter: @@ -25,7 +25,7 @@ dependencies: dart_minecraft: ^0.5.1 dynamic_themes: ^1.1.0 intl: ^0.17.0 - toml: ^0.12.0 + toml: ^0.13.1 line_icons: ^2.0.1 flutter_markdown: ^0.6.10 dio: ^4.0.6 @@ -45,15 +45,14 @@ dependencies: path: plugin io: ^1.0.3 watcher: ^1.0.1 - xml: ^5.3.1 + xml: ^6.1.0 smooth_page_indicator: ^1.0.0+2 quiver: ^3.0.1 dart_discord_rpc: git: https://github.com/RPMTW/dart_discord_rpc.git uuid: ^3.0.6 sentry_flutter: ^6.5.1 - feedback: 2.2.1 - desktop_multi_window: ^0.0.2 + desktop_multi_window: ^0.2.0 window_manager: ^0.2.3 file_picker: ^4.5.1 rpmtw_dart_common_library: ^0.0.4 @@ -66,7 +65,7 @@ dev_dependencies: flutter_lints: ^2.0.0 flutter_test: sdk: flutter - hive_generator: ^1.1.2 + hive_generator: ^2.0.0 # msix: 2.3.0 flutter: diff --git a/test/script/test_helper.dart b/test/script/test_helper.dart index 4754cec93..f22b2abc8 100644 --- a/test/script/test_helper.dart +++ b/test/script/test_helper.dart @@ -1,5 +1,4 @@ import 'dart:io'; -import 'dart:typed_data'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/test/util/window_handler_test.dart b/test/util/window_handler_test.dart index 10c176b43..3b1d4cff9 100644 --- a/test/util/window_handler_test.dart +++ b/test/util/window_handler_test.dart @@ -10,7 +10,7 @@ void main() { setUpAll(() => TestHelper.init()); test("Create new window", () async { - miltiWindowChannel.setMockMethodCallHandler((call) async { + multiWindowChannel.setMockMethodCallHandler((call) async { switch (call.method) { case "createWindow": return 1; @@ -23,7 +23,7 @@ void main() { }); test("Set full screen", () async { - miltiWindowChannel.setMockMethodCallHandler((call) async { + multiWindowChannel.setMockMethodCallHandler((call) async { switch (call.method) { case 'createWindow': return 1; diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index d3fc5dbe8..4463189e6 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -21,6 +22,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("FlutterWindowClosePlugin")); RpmlauncherPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("RpmlauncherPlugin")); + ScreenRetrieverPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("ScreenRetrieverPlugin")); SentryFlutterPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("SentryFlutterPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 4a591b2f5..ed985dafe 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_multi_window flutter_window_close rpmlauncher_plugin + screen_retriever sentry_flutter url_launcher_windows window_manager