From 159ad69afbbbee9986da69f451aab8161705664a Mon Sep 17 00:00:00 2001 From: Feichtmeier Date: Mon, 28 Oct 2024 19:36:54 +0100 Subject: [PATCH] chore: update sdk version, yaru and add CI and release workflows --- .github/workflows/ci.yaml | 54 +++ .github/workflows/release.yaml | 19 + clipboard_viewer/analysis_options.yaml | 2 - clipboard_viewer/lib/main.dart | 4 + clipboard_viewer/pubspec.lock | 76 +++- lib/backend/entity_info.dart | 2 +- lib/backend/folder_provider.dart | 2 +- lib/backend/utils.dart | 2 +- lib/main.dart | 5 +- lib/widgets/breadcrumbs_bar.dart | 6 +- lib/widgets/context_menu.dart | 10 +- lib/widgets/double_scrollbars.dart | 2 - lib/widgets/drive_list.dart | 3 +- lib/widgets/entity_context_menu.dart | 4 +- lib/widgets/grid.dart | 6 +- lib/widgets/side_pane.dart | 2 +- lib/widgets/tab_strip.dart | 5 +- lib/widgets/table.dart | 17 +- lib/widgets/workspace.dart | 13 +- linux/flutter/generated_plugin_registrant.cc | 8 +- linux/flutter/generated_plugins.cmake | 2 +- pubspec.lock | 422 +++++++++++------- pubspec.yaml | 19 +- .../flutter/generated_plugin_registrant.cc | 6 +- windows/flutter/generated_plugins.cmake | 2 +- 25 files changed, 453 insertions(+), 240 deletions(-) create mode 100644 .github/workflows/ci.yaml create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000..ce8cb0e --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,54 @@ +name: CI + +on: + pull_request: + branches: [master] + +env: + FLUTTER_VERSION: '3.24.3' + +jobs: + analyze: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 + with: + channel: 'stable' + flutter-version: ${{env.FLUTTER_VERSION}} + - run: flutter pub get + - run: flutter analyze --fatal-infos + + format: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 + with: + channel: 'stable' + flutter-version: ${{env.FLUTTER_VERSION}} + - run: flutter pub get + - run: dart format --set-exit-if-changed . + + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 + with: + channel: 'stable' + flutter-version: ${{env.FLUTTER_VERSION}} + - run: flutter test + + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 + with: + channel: 'stable' + flutter-version: ${{env.FLUTTER_VERSION}} + - run: sudo apt update + - run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip libunwind-dev libmpv-dev + - run: flutter pub get + - run: flutter build linux -v \ No newline at end of file diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..a16c2f0 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,19 @@ +name: Release + +on: + push: + branches: + - master + workflow_dispatch: + +permissions: + contents: write + pull-requests: write + +jobs: + release: + runs-on: ubuntu-latest + steps: + - uses: googleapis/release-please-action@v4 + with: + release-type: dart diff --git a/clipboard_viewer/analysis_options.yaml b/clipboard_viewer/analysis_options.yaml index a93d96a..1b98075 100755 --- a/clipboard_viewer/analysis_options.yaml +++ b/clipboard_viewer/analysis_options.yaml @@ -1,8 +1,6 @@ include: package:flutter_lints/flutter.yaml analyzer: - enable-experiment: - - records linter: rules: diff --git a/clipboard_viewer/lib/main.dart b/clipboard_viewer/lib/main.dart index 333238f..44a2fc0 100755 --- a/clipboard_viewer/lib/main.dart +++ b/clipboard_viewer/lib/main.dart @@ -47,6 +47,8 @@ class _MyHomePageState extends State { itemCount: items.length, itemBuilder: (context, index) { final item = items[index]; + // TODO(@HrX03) is this needed? + // ignore: unused_local_variable final rawReader = item.$1.rawReader; return ListTile( @@ -60,6 +62,8 @@ class _MyHomePageState extends State { onPressed: () async { await Pasteboard.writeFiles(["/home/davide"]); return; + // TODO(@HrX03) is this needed? + // ignore: unused_local_variable, dead_code final data = await ClipboardReader.readClipboard(); final value = await data.readValue(linuxFileUri); diff --git a/clipboard_viewer/pubspec.lock b/clipboard_viewer/pubspec.lock index 3ff2564..7fe37cd 100755 --- a/clipboard_viewer/pubspec.lock +++ b/clipboard_viewer/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" crypto: dependency: transitive description: @@ -120,6 +120,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.7" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + url: "https://pub.dev" + source: hosted + version: "10.0.5" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -132,26 +156,26 @@ packages: dependency: transitive description: name: matcher - sha256: c94db23593b89766cda57aab9ac311e3616cf87c6fa4e9749df032f66f30dcb8 + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.14" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "12307e7f0605ce3da64cf0db90e5fcab0869f3ca03f76be6bb2991ce0a55e82b" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.15.0" pasteboard: dependency: "direct main" description: @@ -164,10 +188,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" plugin_platform_interface: dependency: transitive description: @@ -185,26 +209,26 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" 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" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -241,10 +265,10 @@ packages: dependency: transitive description: name: test_api - sha256: "6182294da5abf431177fccc1ee02401f6df30f766bc6130a0852c6b6d7ee6b2d" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.4.18" + version: "0.7.2" typed_data: dependency: transitive description: @@ -269,6 +293,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + url: "https://pub.dev" + source: hosted + version: "14.2.5" sdks: - dart: ">=3.0.0-313.0.dev <4.0.0" - flutter: ">=3.0.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/lib/backend/entity_info.dart b/lib/backend/entity_info.dart index 3af3129..c0d9419 100755 --- a/lib/backend/entity_info.dart +++ b/lib/backend/entity_info.dart @@ -41,7 +41,7 @@ class EntityInfo { } @override - bool operator ==(Object? other) { + bool operator ==(Object other) { if (other is EntityInfo) { return _equals(other); } diff --git a/lib/backend/folder_provider.dart b/lib/backend/folder_provider.dart index 9bc22ce..b42292f 100755 --- a/lib/backend/folder_provider.dart +++ b/lib/backend/folder_provider.dart @@ -21,7 +21,7 @@ import 'package:files/backend/utils.dart'; import 'package:flutter/material.dart'; import 'package:windows_path_provider/windows_path_provider.dart'; import 'package:xdg_directories/xdg_directories.dart'; -import 'package:yaru_icons/yaru_icons.dart'; +import 'package:yaru/yaru.dart'; class FolderProvider { final List _folders; diff --git a/lib/backend/utils.dart b/lib/backend/utils.dart index f9258ef..e3a86c0 100755 --- a/lib/backend/utils.dart +++ b/lib/backend/utils.dart @@ -6,7 +6,7 @@ import 'package:files/backend/providers.dart'; import 'package:flutter/material.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:mime/mime.dart'; -import 'package:yaru_icons/yaru_icons.dart'; +import 'package:yaru/yaru.dart'; class Utils { Utils._(); diff --git a/lib/main.dart b/lib/main.dart index 168949e..cb4d7ad 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -21,7 +21,6 @@ import 'package:files/widgets/tab_strip.dart'; import 'package:files/widgets/workspace.dart'; import 'package:flutter/material.dart'; import 'package:yaru/yaru.dart'; -import 'package:yaru_widgets/yaru_widgets.dart'; Future main(List args) async { WidgetsFlutterBinding.ensureInitialized(); @@ -40,7 +39,7 @@ ThemeData? _applyThemeValues(ThemeData? theme) { outlinedButtonTheme: OutlinedButtonThemeData( style: theme.outlinedButtonTheme.style?.merge( OutlinedButton.styleFrom( - backgroundColor: theme.colorScheme.surfaceVariant, + backgroundColor: theme.colorScheme.surfaceContainerHighest, ), ), ), @@ -93,7 +92,7 @@ class _FilesHomeState extends State { @override Widget build(BuildContext context) { return Material( - color: Theme.of(context).colorScheme.background, + color: Theme.of(context).colorScheme.surface, child: Column( children: [ GestureDetector( diff --git a/lib/widgets/breadcrumbs_bar.dart b/lib/widgets/breadcrumbs_bar.dart index ceb901a..05d17f7 100755 --- a/lib/widgets/breadcrumbs_bar.dart +++ b/lib/widgets/breadcrumbs_bar.dart @@ -75,7 +75,8 @@ class _BreadcrumbsBarState extends State { child: Padding( padding: const EdgeInsets.all(8.0), child: Material( - color: Theme.of(context).colorScheme.surfaceVariant, + color: + Theme.of(context).colorScheme.surfaceContainerHighest, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(6), side: !focusNode.hasFocus @@ -200,7 +201,8 @@ class _BreadcrumbChip extends StatelessWidget { return SizedBox( height: double.infinity, child: DragTarget( - onAccept: (data) => Utils.moveFileToDest(data, path.toPath()), + onAcceptWithDetails: (details) => + Utils.moveFileToDest(details.data, path.toPath()), builder: (context, candidateData, rejectedData) { return InkWell( child: Row( diff --git a/lib/widgets/context_menu.dart b/lib/widgets/context_menu.dart index 90486b2..c8c9921 100755 --- a/lib/widgets/context_menu.dart +++ b/lib/widgets/context_menu.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:yaru_icons/yaru_icons.dart'; -import 'package:yaru_widgets/yaru_widgets.dart'; +import 'package:yaru/yaru.dart'; class ContextMenu extends StatefulWidget { final List entries; @@ -105,7 +104,7 @@ class SubmenuMenuItem extends BaseContextMenuItem { leadingIcon: buildLeading(context), trailingIcon: buildTrailing(context), style: const ButtonStyle( - padding: MaterialStatePropertyAll( + padding: WidgetStatePropertyAll( EdgeInsets.symmetric(horizontal: 16), ), ), @@ -142,7 +141,7 @@ class ContextMenuItem extends BaseContextMenuItem { onPressed: onTap, shortcut: shortcut, style: const ButtonStyle( - padding: MaterialStatePropertyAll( + padding: WidgetStatePropertyAll( EdgeInsets.symmetric(horizontal: 16), ), ), @@ -216,13 +215,10 @@ class CheckboxMenuItem extends ContextMenuItem { switch (value) { case false: onChanged!.call(true); - break; case true: onChanged!.call(tristate ? null : false); - break; case null: onChanged!.call(false); - break; } }; diff --git a/lib/widgets/double_scrollbars.dart b/lib/widgets/double_scrollbars.dart index d1989bd..464daa9 100755 --- a/lib/widgets/double_scrollbars.dart +++ b/lib/widgets/double_scrollbars.dart @@ -136,10 +136,8 @@ class ScrollProxy extends StatelessWidget { switch (direction) { case Axis.vertical: provider = VerticalScrollReceiver.of(context); - break; case Axis.horizontal: provider = HorizontalScrollReceiver.of(context); - break; } provider.notify(notification); diff --git a/lib/widgets/drive_list.dart b/lib/widgets/drive_list.dart index 90b7b27..3233371 100755 --- a/lib/widgets/drive_list.dart +++ b/lib/widgets/drive_list.dart @@ -6,8 +6,7 @@ import 'package:files/widgets/separated_flex.dart'; import 'package:filesize/filesize.dart'; import 'package:flutter/material.dart'; import 'package:udisks/udisks.dart'; -import 'package:yaru_icons/yaru_icons.dart'; -import 'package:yaru_widgets/yaru_widgets.dart'; +import 'package:yaru/yaru.dart'; class DriveList extends StatelessWidget { final ValueChanged? onDriveTap; diff --git a/lib/widgets/entity_context_menu.dart b/lib/widgets/entity_context_menu.dart index be689ba..e030c70 100755 --- a/lib/widgets/entity_context_menu.dart +++ b/lib/widgets/entity_context_menu.dart @@ -1,7 +1,7 @@ import 'package:files/widgets/context_menu.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:yaru_icons/yaru_icons.dart'; +import 'package:yaru/yaru.dart'; class EntityContextMenu extends StatelessWidget { final Widget child; @@ -62,7 +62,7 @@ class EntityContextMenu extends StatelessWidget { onTap: onPaste, shortcut: const SingleActivator(LogicalKeyboardKey.keyV, control: true), - ) + ), ], child: child, ), diff --git a/lib/widgets/grid.dart b/lib/widgets/grid.dart index 0aa3b45..da1968d 100755 --- a/lib/widgets/grid.dart +++ b/lib/widgets/grid.dart @@ -122,14 +122,14 @@ class FileCell extends StatelessWidget { @override Widget build(BuildContext context) { return DragTarget( - onWillAccept: (data) { + onWillAcceptWithDetails: (details) { if (!entity.isDirectory) return false; - if (data!.path == entity.path) return false; + if (details.data.path == entity.path) return false; return true; }, - onAccept: (_) => onDropAccept?.call(entity.path), + onAcceptWithDetails: (_) => onDropAccept?.call(entity.path), builder: (context, _, __) => Material( clipBehavior: Clip.antiAlias, shape: RoundedRectangleBorder( diff --git a/lib/widgets/side_pane.dart b/lib/widgets/side_pane.dart index 6bea9ca..1ca9f82 100755 --- a/lib/widgets/side_pane.dart +++ b/lib/widgets/side_pane.dart @@ -5,7 +5,7 @@ import 'package:files/backend/workspace.dart'; import 'package:files/widgets/context_menu.dart'; import 'package:files/widgets/drive_list.dart'; import 'package:flutter/material.dart'; -import 'package:yaru_widgets/yaru_widgets.dart'; +import 'package:yaru/yaru.dart'; typedef NewTabCallback = void Function(String); diff --git a/lib/widgets/tab_strip.dart b/lib/widgets/tab_strip.dart index 10584cb..81967e7 100755 --- a/lib/widgets/tab_strip.dart +++ b/lib/widgets/tab_strip.dart @@ -2,8 +2,7 @@ import 'package:files/backend/utils.dart'; import 'package:files/backend/workspace.dart'; import 'package:files/widgets/context_menu.dart'; import 'package:flutter/material.dart'; -import 'package:yaru_icons/yaru_icons.dart'; -import 'package:yaru_widgets/yaru_widgets.dart'; +import 'package:yaru/yaru.dart'; class TabStrip extends StatelessWidget { final List tabs; @@ -122,7 +121,7 @@ class _TabState extends State<_Tab> { height: double.infinity, child: Material( color: widget.selected - ? Theme.of(context).colorScheme.surfaceVariant + ? Theme.of(context).colorScheme.surfaceContainerHighest : Theme.of(context).colorScheme.surface, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(6), diff --git a/lib/widgets/table.dart b/lib/widgets/table.dart index e4fd855..558d3ec 100755 --- a/lib/widgets/table.dart +++ b/lib/widgets/table.dart @@ -16,7 +16,7 @@ import 'package:recase/recase.dart'; // ignore: implementation_imports import 'package:super_clipboard/src/format_conversions.dart'; import 'package:super_clipboard/super_clipboard.dart'; -import 'package:yaru_icons/yaru_icons.dart'; +import 'package:yaru/yaru.dart'; typedef HeaderTapCallback = void Function( bool newAscending, @@ -104,7 +104,7 @@ class FilesTable extends StatelessWidget { return SizedBox( height: 32, child: Material( - color: Theme.of(context).colorScheme.background, + color: Theme.of(context).colorScheme.surface, child: Row( mainAxisSize: MainAxisSize.min, children: [ @@ -116,7 +116,7 @@ class FilesTable extends StatelessWidget { ), Container( width: rowHorizontalPadding, - color: Theme.of(context).colorScheme.background, + color: Theme.of(context).colorScheme.surface, ), ], ), @@ -311,14 +311,15 @@ class _FilesRowState extends State<_FilesRow> { @override Widget build(BuildContext context) { return DragTarget( - onWillAccept: (data) { + onWillAcceptWithDetails: (details) { if (!widget.row.entity.isDirectory) return false; - if (data!.path == widget.row.entity.path) return false; + if (details.data.path == widget.row.entity.path) return false; return true; }, - onAccept: (data) => Utils.moveFileToDest(data, widget.row.entity.path), + onAcceptWithDetails: (details) => + Utils.moveFileToDest(details.data, widget.row.entity.path), builder: (context, candidateData, rejectedData) { return LayoutBuilder( builder: (context, constraints) { @@ -403,13 +404,11 @@ class _FilesRowState extends State<_FilesRow> { ), ], ); - break; case FilesColumnType.date: child = Text( DateFormat("HH:mm - d MMM yyyy").format(entity.stat.modified), overflow: TextOverflow.ellipsis, ); - break; case FilesColumnType.type: final String fileExtension = p.extension(entity.path).replaceAll(".", "").toUpperCase(); @@ -419,13 +418,11 @@ class _FilesRowState extends State<_FilesRow> { entity.isDirectory ? "Directory" : fileLabel, overflow: TextOverflow.ellipsis, ); - break; case FilesColumnType.size: child = Text( entity.isDirectory ? "" : filesize(entity.stat.size), overflow: TextOverflow.ellipsis, ); - break; } return Container( diff --git a/lib/widgets/workspace.dart b/lib/widgets/workspace.dart index 9d3636c..9f51c44 100755 --- a/lib/widgets/workspace.dart +++ b/lib/widgets/workspace.dart @@ -17,8 +17,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher_string.dart'; -import 'package:yaru_icons/yaru_icons.dart'; -import 'package:yaru_widgets/yaru_widgets.dart'; +import 'package:yaru/yaru.dart'; class FilesWorkspace extends StatefulWidget { final WorkspaceController controller; @@ -139,6 +138,8 @@ class _FilesWorkspaceState extends State { void _onEntityTap(EntityInfo entity) { final bool selected = controller.selectedItems.contains(entity); final Set keysPressed = + // TODO: remove ignore + // ignore: deprecated_member_use RawKeyboard.instance.keysPressed; final bool multiSelect = keysPressed.contains( LogicalKeyboardKey.controlLeft, @@ -265,7 +266,7 @@ class _FilesWorkspaceState extends State { SizedBox( height: 32, child: Material( - color: Theme.of(context).colorScheme.background, + color: Theme.of(context).colorScheme.surface, child: Padding( padding: const EdgeInsets.symmetric(horizontal: 8), child: Row( @@ -301,7 +302,7 @@ class _FilesWorkspaceState extends State { Text( "This Folder is Empty", style: TextStyle(fontSize: 17), - ) + ), ], ), ); @@ -437,10 +438,8 @@ class _WorkspaceTopbar extends StatelessWidget { switch (controller.view) { case WorkspaceView.table: onWorkspaceViewChanged?.call(WorkspaceView.grid); - break; case WorkspaceView.grid: onWorkspaceViewChanged?.call(WorkspaceView.table); - break; } }, child: Icon(viewIcon), @@ -531,7 +530,7 @@ class _HistoryModifierIconButton extends StatelessWidget { ), ), backgroundColor: enabled - ? Theme.of(context).colorScheme.surfaceVariant + ? Theme.of(context).colorScheme.surfaceContainerHighest : Theme.of(context).colorScheme.surface, ), child: Icon(icon, size: 20), diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 315fffa..f2bed3a 100755 --- 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 @@ -33,9 +33,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) pasteboard_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin"); pasteboard_plugin_register_with_registrar(pasteboard_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) super_native_extensions_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "SuperNativeExtensionsPlugin"); super_native_extensions_plugin_register_with_registrar(super_native_extensions_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index bb879e6..920502b 100755 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -8,7 +8,7 @@ list(APPEND FLUTTER_PLUGIN_LIST irondash_engine_context isar_flutter_libs pasteboard - screen_retriever + screen_retriever_linux super_native_extensions url_launcher_linux window_manager diff --git a/pubspec.lock b/pubspec.lock index efbf214..152e0e8 100755 --- a/pubspec.lock +++ b/pubspec.lock @@ -17,30 +17,62 @@ packages: url: "https://pub.dev" source: hosted version: "5.13.0" + animated_vector: + dependency: transitive + description: + name: animated_vector + sha256: f1beb10e6fcfd8bd15abb788e20345def786d1c7391d7c1426bb2a1f2adf2132 + url: "https://pub.dev" + source: hosted + version: "0.2.2" + animated_vector_annotations: + dependency: transitive + description: + name: animated_vector_annotations + sha256: "07c1ea603a2096f7eb6f1c2b8f16c3c330c680843ea78b7782a3217c3c53f979" + url: "https://pub.dev" + source: hosted + version: "0.2.2" + archive: + dependency: transitive + description: + name: archive + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" + source: hosted + version: "3.6.1" args: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" + assorted_layout_widgets: + dependency: transitive + description: + name: assorted_layout_widgets + sha256: "5b7f7c76a1a4c7cf95edfb854c3ed09ce9cb7f25a372f2d9a8d4c1569d42ecfb" + url: "https://pub.dev" + source: hosted + version: "9.0.2" async: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" build: dependency: transitive description: @@ -61,10 +93,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.2" build_resolvers: dependency: transitive description: @@ -77,18 +109,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" url: "https://pub.dev" source: hosted - version: "2.4.9" + version: "2.4.13" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "7.3.2" built_collection: dependency: transitive description: @@ -125,10 +157,10 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" code_builder: dependency: transitive description: @@ -149,18 +181,18 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.6" dart_style: dependency: transitive description: @@ -185,22 +217,38 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.10" + device_info_plus: + dependency: transitive + description: + name: device_info_plus + sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 + url: "https://pub.dev" + source: hosted + version: "10.1.2" + device_info_plus_platform_interface: + dependency: transitive + description: + name: device_info_plus_platform_interface + sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + url: "https://pub.dev" + source: hosted + version: "7.0.1" ffi: dependency: "direct main" description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" file: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" filesize: dependency: "direct main" description: @@ -213,10 +261,10 @@ packages: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -255,10 +303,18 @@ packages: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" + gsettings: + dependency: transitive + description: + name: gsettings + sha256: "1b0ce661f5436d2db1e51f3c4295a49849f03d304003a7ba177d01e3a858249c" + url: "https://pub.dev" + source: hosted + version: "0.2.8" gtk: dependency: transitive description: @@ -271,10 +327,10 @@ packages: dependency: "direct main" description: name: handy_window - sha256: "458a9f7d4ae23816e8f33c76596f943a04e7eff13d864e0867f3b40f1647d63d" + sha256: "56b813e58a68b0ee2ab22051400b8b1f1b5cfe88b8cd32288623defb3926245a" url: "https://pub.dev" source: hosted - version: "0.3.1" + version: "0.4.0" http_multi_server: dependency: transitive description: @@ -291,6 +347,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + url: "https://pub.dev" + source: hosted + version: "4.3.0" intl: dependency: "direct main" description: @@ -311,18 +375,18 @@ packages: dependency: transitive description: name: irondash_engine_context - sha256: "086fbbcaef07b821b304b0371e472c687715f326219b69b18dc5c962dab09b55" + sha256: cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10 url: "https://pub.dev" source: hosted - version: "0.1.1" + version: "0.5.4" irondash_message_channel: dependency: transitive description: name: irondash_message_channel - sha256: "081ff9631a2c6782a47ef4fdf9c97206053af1bb174e2a25851692b04f3bc126" + sha256: b4101669776509c76133b8917ab8cfc704d3ad92a8c450b92934dd8884a2f060 url: "https://pub.dev" source: hosted - version: "0.1.1" + version: "0.7.0" isar: dependency: "direct main" description: @@ -375,50 +439,58 @@ packages: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" matcher: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" material_design_icons_flutter: dependency: "direct main" description: name: material_design_icons_flutter - sha256: "4c81ebf55b9661d1eb94652884a7b098af63153ea75b9070caedaddfae308e02" + sha256: "6f986b7a51f3ad4c00e33c5c84e8de1bdd140489bbcdc8b66fc1283dad4dea5a" + url: "https://pub.dev" + source: hosted + version: "7.0.7296" + matrix4_transform: + dependency: transitive + description: + name: matrix4_transform + sha256: "42c42610deecc382be2653f4a21358537401bd5b027c168a174c7c6a64959908" url: "https://pub.dev" source: hosted - version: "6.0.7296" + version: "3.0.1" meta: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.15.0" mime: dependency: "direct main" description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "2.0.0" nested: dependency: transitive description: @@ -439,34 +511,42 @@ packages: dependency: "direct main" description: name: pasteboard - sha256: "1c8b6a8b3f1d12e55d4e9404433cda1b4abe66db6b17bc2d2fb5965772c04674" + sha256: "7bf733f3a00c7188ec1f2c6f0612854248b302cf91ef3611a2b7bb141c0f9d55" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.3.0" path: dependency: "direct main" description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: "45f7d6bba1128761de5540f39d5ca000ea8a1f22f06b76b61094a60a2997bd0e" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.0.2" path_provider: dependency: "direct main" description: name: path_provider - sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d + sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.2.12" path_provider_foundation: dependency: transitive description: @@ -495,10 +575,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" petitparser: dependency: transitive description: @@ -507,14 +587,30 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.2" + pixel_snap: + dependency: transitive + description: + name: pixel_snap + sha256: "677410ea37b07cd37ecb6d5e6c0d8d7615a7cf3bd92ba406fd1ac57e937d1fb0" + url: "https://pub.dev" + source: hosted + version: "0.1.5" platform: dependency: transitive description: name: platform - sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + platform_linux: + dependency: transitive + description: + name: platform_linux + sha256: "856cfc9871e3ff3df6926991729d24bba9b70d0229ae377fa08b562344baaaa8" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "0.1.2" plugin_platform_interface: dependency: transitive description: @@ -551,10 +647,10 @@ packages: dependency: transitive description: name: pubspec_parse - sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.3.0" recase: dependency: "direct main" description: @@ -567,10 +663,42 @@ packages: dependency: transitive description: name: screen_retriever - sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90" + sha256: "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c" url: "https://pub.dev" source: hosted - version: "0.1.9" + version: "0.2.0" + screen_retriever_linux: + dependency: transitive + description: + name: screen_retriever_linux + sha256: f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18 + url: "https://pub.dev" + source: hosted + version: "0.2.0" + screen_retriever_macos: + dependency: transitive + description: + name: screen_retriever_macos + sha256: "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149" + url: "https://pub.dev" + source: hosted + version: "0.2.0" + screen_retriever_platform_interface: + dependency: transitive + description: + name: screen_retriever_platform_interface + sha256: ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0 + url: "https://pub.dev" + source: hosted + version: "0.2.0" + screen_retriever_windows: + dependency: transitive + description: + name: screen_retriever_windows + sha256: "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13" + url: "https://pub.dev" + source: hosted + version: "0.2.0" shelf: dependency: transitive description: @@ -583,10 +711,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.0" sky_engine: dependency: transitive description: flutter @@ -608,14 +736,22 @@ 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" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -636,26 +772,26 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.0" super_clipboard: dependency: "direct main" description: name: super_clipboard - sha256: "6dbc0f90c3a4d09cb54e1f74bc0b0f4f306dfeda609c9fe240f65828a1438426" + sha256: "4a6ae6dfaa282ec1f2bff750976f535517ed8ca842d5deae13985eb11c00ac1f" url: "https://pub.dev" source: hosted - version: "0.2.3+1" + version: "0.8.24" super_native_extensions: dependency: transitive description: name: super_native_extensions - sha256: "6e015f1101e654070d00aba21080e0ed19bdcbd8b286114d8698ef3689c809b7" + sha256: a433bba8186cd6b707560c42535bf284804665231c00bca86faf1aa4968b7637 url: "https://pub.dev" source: hosted - version: "0.2.4" + version: "0.8.24" term_glyph: dependency: transitive description: @@ -668,10 +804,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.3" time: dependency: transitive description: @@ -692,18 +828,18 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" ubuntu_service: dependency: "direct main" description: name: ubuntu_service - sha256: f6ad4dfb099af41e750c59aad00d67a96e22df00f4962d2e25d56ae3db78be49 + sha256: af850c8927c97ba49749c262654fe84833c8f1d80b641016c8f72a18d2191379 url: "https://pub.dev" source: hosted - version: "0.2.4" + version: "0.4.0" udisks: dependency: "direct main" description: @@ -717,42 +853,42 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e" + sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" url: "https://pub.dev" source: hosted - version: "6.2.6" + version: "6.3.1" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9" + sha256: "0dea215895a4d254401730ca0ba8204b29109a34a99fb06ae559a2b60988d2de" url: "https://pub.dev" source: hosted - version: "6.3.2" + version: "6.3.13" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" + sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" url_launcher_platform_interface: dependency: transitive description: @@ -765,26 +901,26 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.3" uuid: dependency: transitive description: name: uuid - sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "4.5.1" vector_math: dependency: transitive description: @@ -805,34 +941,50 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "3.0.1" win32: dependency: transitive description: name: win32 - sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" + sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454" url: "https://pub.dev" source: hosted - version: "5.5.0" + version: "5.7.2" + win32_registry: + dependency: transitive + description: + name: win32_registry + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" + url: "https://pub.dev" + source: hosted + version: "1.1.5" window_manager: dependency: transitive description: name: window_manager - sha256: "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf" + sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059" url: "https://pub.dev" source: hosted - version: "0.3.9" + version: "0.4.3" windows_path_provider: dependency: "direct main" description: @@ -846,10 +998,10 @@ packages: dependency: "direct main" description: name: xdg_directories - sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.1.0" xml: dependency: transitive description: @@ -862,10 +1014,10 @@ packages: dependency: transitive description: name: xxh3 - sha256: a92b30944a9aeb4e3d4f3c3d4ddb3c7816ca73475cd603682c4f8149690f56d7 + sha256: cbeb0e1d10f4c6bf67b650f395eac0cc689425b5efc2ba0cc3d3e069a0beaeec url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" yaml: dependency: transitive description: @@ -878,82 +1030,50 @@ packages: dependency: "direct main" description: name: yaru - sha256: ca20337f0223a81bcbaaf899677d2f4ebe334b9cae696ce6aa1c4705a3a803ef - url: "https://pub.dev" - source: hosted - version: "0.5.8" - yaru_color_generator: - dependency: transitive - description: - name: yaru_color_generator - sha256: "78b96cefc4eef763e4786f891ce336cdd55ef8edc55494c4bea2bc9d10ef9c96" - url: "https://pub.dev" - source: hosted - version: "0.1.0" - yaru_colors: - dependency: transitive - description: - name: yaru_colors - sha256: "42814cafa3c4a6876962559ae9d8b9ff088a59635e649e4eae86d35905496063" + sha256: b226f045d3104422d7f4d87572cc57c75b7d5695adf6fa47dbab3bc664714e69 url: "https://pub.dev" source: hosted - version: "0.1.7" - yaru_icons: - dependency: "direct main" - description: - name: yaru_icons - sha256: "8ddd40522c882de898a493094f2f41687f7a0faaf3434b9c854a7605a53a2477" - url: "https://pub.dev" - source: hosted - version: "1.0.4" - yaru_widgets: - dependency: "direct main" - description: - name: yaru_widgets - sha256: "091fca04a859897c309a5a20e6dfca3039e7b7b756a31a05110806b61efdc2e8" - url: "https://pub.dev" - source: hosted - version: "2.2.1" + version: "5.3.1" yaru_window: - dependency: "direct main" + dependency: transitive description: name: yaru_window - sha256: "55c8f039d13aaa1b211a8cf0b7731ae2fdcac9b1be1e0994eb14ad1d17fecaf7" + sha256: bc2a1df3c6f33477b47f84bf0a9325df411dbb7bd483ac88e5bc1c019d2f2560 url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.1+1" yaru_window_linux: dependency: transitive description: name: yaru_window_linux - sha256: c45606cf75880ae6427bbe176dc5313356f16c876c7013a19aeee782882c40c2 + sha256: "46a1a0743dfd45794cdaf8c5b3a48771ab73632b50a693f59c83b07988e96689" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.1" yaru_window_manager: dependency: transitive description: name: yaru_window_manager - sha256: "2d358263d19ae6598df21d6d8c0d25e75c79a82f459b63b0013a13e395c48b23" + sha256: b36c909fa082a7cb6e2f259d4357e16f08d3d8ab086685b81d1916e457100d1e url: "https://pub.dev" source: hosted - version: "0.1.2" + version: "0.1.2+1" yaru_window_platform_interface: dependency: transitive description: name: yaru_window_platform_interface - sha256: e9f8cd34e207d7f7b771ae70dee347ed974cee06b981819c4181b3e474e52254 + sha256: "93493d7e17a9e887ffa94c518bc5a4b3eb5425c009446e3294c689cb1a87b7e1" url: "https://pub.dev" source: hosted - version: "0.1.2" + version: "0.1.2+1" yaru_window_web: dependency: transitive description: name: yaru_window_web - sha256: "3ff30758a330d7626d54643df0cca6c179782f401aba7752da9cc0d60c9a6f74" + sha256: "31468aeb515f72d5eeddcd62773094a4f48fee96f7f0494f8ce53ad3b38054f1" url: "https://pub.dev" source: hosted - version: "0.0.3" + version: "0.0.3+1" sdks: - dart: ">=3.3.0 <4.0.0" - flutter: ">=3.19.0" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.3" diff --git a/pubspec.yaml b/pubspec.yaml index 9d597b6..e8b4658 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ">=2.17.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: collection: ^1.16.0 @@ -15,22 +15,22 @@ dependencies: flutter: sdk: flutter - handy_window: ^0.3.1 + handy_window: ^0.4.0 intl: any isar: ^3.0.2 isar_flutter_libs: ^3.0.2 - material_design_icons_flutter: ^6.0.7096 - mime: ^1.0.0 + material_design_icons_flutter: ^7.0.7296 + mime: ^2.0.0 - pasteboard: ^0.2.0 + pasteboard: ^0.3.0 path: ^1.8.2 path_provider: ^2.0.2 provider: ^6.0.0 recase: ^4.1.0 - super_clipboard: ^0.2.3 - ubuntu_service: ^0.2.0 + super_clipboard: ^0.8.24 + ubuntu_service: ^0.4.0 udisks: git: https://github.com/HrX03/udisks.dart url_launcher: any @@ -38,10 +38,7 @@ dependencies: git: url: https://github.com/HrX03/windows_path_provider.git xdg_directories: ^1.0.0 - yaru: ^0.5.6 - yaru_icons: ^1.0.4 - yaru_widgets: ^2.1.1 - yaru_window: ^0.1.1 + yaru: ^5.3.1 dev_dependencies: build_runner: ^2.3.2 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 4c52a86..5e30d77 100755 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,8 +22,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("IsarFlutterLibsPlugin")); PasteboardPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PasteboardPlugin")); - ScreenRetrieverPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("ScreenRetrieverPlugin")); + ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); SuperNativeExtensionsPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("SuperNativeExtensionsPluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 498154e..4c09aa3 100755 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -6,7 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST irondash_engine_context isar_flutter_libs pasteboard - screen_retriever + screen_retriever_windows super_native_extensions url_launcher_windows window_manager