From 766b7234052ff5b9b8a07d32fc92eed5b673eafa Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Thu, 9 Sep 2021 18:00:57 +0900 Subject: [PATCH] use dart 2.14 --- lib/image_providers/uri_image_provider.dart | 1 - lib/model/settings/settings.dart | 2 +- lib/utils/pedantic.dart | 2 -- lib/widgets/collection/app_bar.dart | 1 - lib/widgets/collection/entry_set_action_delegate.dart | 1 - lib/widgets/common/fx/sweeper.dart | 2 +- lib/widgets/common/thumbnail/decorated.dart | 2 +- lib/widgets/home_page.dart | 3 ++- lib/widgets/viewer/embedded/embedded_data_opener.dart | 3 ++- lib/widgets/viewer/entry_action_delegate.dart | 2 +- lib/widgets/viewer/overlay/bottom/panorama.dart | 3 ++- lib/widgets/viewer/printer.dart | 1 - lib/widgets/viewer/video_action_delegate.dart | 1 - lib/widgets/viewer/visual/entry_page_view.dart | 3 +-- pubspec.lock | 2 +- pubspec.yaml | 2 +- test_driver/app_test.dart | 3 ++- 17 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 lib/utils/pedantic.dart diff --git a/lib/image_providers/uri_image_provider.dart b/lib/image_providers/uri_image_provider.dart index 23e11f9f5..9478b86e6 100644 --- a/lib/image_providers/uri_image_provider.dart +++ b/lib/image_providers/uri_image_provider.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:ui' as ui show Codec; import 'package:aves/services/services.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; diff --git a/lib/model/settings/settings.dart b/lib/model/settings/settings.dart index b06cc923f..117991a74 100644 --- a/lib/model/settings/settings.dart +++ b/lib/model/settings/settings.dart @@ -1,3 +1,4 @@ +import 'dart:async'; import 'dart:convert'; import 'dart:math'; @@ -12,7 +13,6 @@ import 'package:aves/model/settings/screen_on.dart'; import 'package:aves/model/source/enums.dart'; import 'package:aves/services/device_service.dart'; import 'package:aves/services/services.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:collection/collection.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; diff --git a/lib/utils/pedantic.dart b/lib/utils/pedantic.dart deleted file mode 100644 index d98c609ed..000000000 --- a/lib/utils/pedantic.dart +++ /dev/null @@ -1,2 +0,0 @@ -// cf https://github.com/google/pedantic/blob/master/lib/pedantic.dart -void unawaited(Future? future) {} diff --git a/lib/widgets/collection/app_bar.dart b/lib/widgets/collection/app_bar.dart index 4ce99fc00..68d93af84 100644 --- a/lib/widgets/collection/app_bar.dart +++ b/lib/widgets/collection/app_bar.dart @@ -11,7 +11,6 @@ import 'package:aves/model/source/collection_source.dart'; import 'package:aves/model/source/enums.dart'; import 'package:aves/services/app_shortcut_service.dart'; import 'package:aves/theme/durations.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:aves/widgets/collection/entry_set_action_delegate.dart'; import 'package:aves/widgets/collection/filter_bar.dart'; import 'package:aves/widgets/common/app_bar_subtitle.dart'; diff --git a/lib/widgets/collection/entry_set_action_delegate.dart b/lib/widgets/collection/entry_set_action_delegate.dart index 8e6b636ad..b52b3d802 100644 --- a/lib/widgets/collection/entry_set_action_delegate.dart +++ b/lib/widgets/collection/entry_set_action_delegate.dart @@ -13,7 +13,6 @@ import 'package:aves/services/image_op_events.dart'; import 'package:aves/services/services.dart'; import 'package:aves/theme/durations.dart'; import 'package:aves/utils/android_file_utils.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:aves/widgets/collection/collection_page.dart'; import 'package:aves/widgets/common/action_mixins/feedback.dart'; import 'package:aves/widgets/common/action_mixins/permission_aware.dart'; diff --git a/lib/widgets/common/fx/sweeper.dart b/lib/widgets/common/fx/sweeper.dart index 5be9447e7..2227508d5 100644 --- a/lib/widgets/common/fx/sweeper.dart +++ b/lib/widgets/common/fx/sweeper.dart @@ -1,7 +1,7 @@ +import 'dart:async'; import 'dart:math'; import 'package:aves/theme/durations.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; diff --git a/lib/widgets/common/thumbnail/decorated.dart b/lib/widgets/common/thumbnail/decorated.dart index 93f16b6d0..50f52623c 100644 --- a/lib/widgets/common/thumbnail/decorated.dart +++ b/lib/widgets/common/thumbnail/decorated.dart @@ -34,7 +34,7 @@ class DecoratedThumbnail extends StatelessWidget { // hero tag should include a collection identifier, so that it animates // between different views of the entry in the same collection (e.g. thumbnails <-> viewer) // but not between different collection instances, even with the same attributes (e.g. reloading collection page via drawer) - final heroTag = hero ? hashValues(collection?.id, entry.uri) : null; + final heroTag = hero ? Object.hashAll([collection?.id, entry.uri]) : null; final isSvg = entry.isSvg; Widget child = ThumbnailImage( entry: entry, diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart index d16d53954..0a39dbb70 100644 --- a/lib/widgets/home_page.dart +++ b/lib/widgets/home_page.dart @@ -1,3 +1,5 @@ +import 'dart:async'; + import 'package:aves/app_mode.dart'; import 'package:aves/model/entry.dart'; import 'package:aves/model/filters/filters.dart'; @@ -10,7 +12,6 @@ import 'package:aves/services/global_search.dart'; import 'package:aves/services/services.dart'; import 'package:aves/services/viewer_service.dart'; import 'package:aves/utils/android_file_utils.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:aves/widgets/collection/collection_page.dart'; import 'package:aves/widgets/common/behaviour/routes.dart'; import 'package:aves/widgets/filter_grids/albums_page.dart'; diff --git a/lib/widgets/viewer/embedded/embedded_data_opener.dart b/lib/widgets/viewer/embedded/embedded_data_opener.dart index a621d1ba9..4216eba25 100644 --- a/lib/widgets/viewer/embedded/embedded_data_opener.dart +++ b/lib/widgets/viewer/embedded/embedded_data_opener.dart @@ -1,8 +1,9 @@ +import 'dart:async'; + import 'package:aves/model/entry.dart'; import 'package:aves/ref/mime_types.dart'; import 'package:aves/services/android_app_service.dart'; import 'package:aves/services/services.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:aves/widgets/common/action_mixins/feedback.dart'; import 'package:aves/widgets/common/behaviour/routes.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; diff --git a/lib/widgets/viewer/entry_action_delegate.dart b/lib/widgets/viewer/entry_action_delegate.dart index e7b0793d6..253353271 100644 --- a/lib/widgets/viewer/entry_action_delegate.dart +++ b/lib/widgets/viewer/entry_action_delegate.dart @@ -1,3 +1,4 @@ +import 'dart:async'; import 'dart:convert'; import 'package:aves/app_mode.dart'; @@ -13,7 +14,6 @@ import 'package:aves/services/android_app_service.dart'; import 'package:aves/services/image_op_events.dart'; import 'package:aves/services/services.dart'; import 'package:aves/theme/durations.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:aves/widgets/collection/collection_page.dart'; import 'package:aves/widgets/common/action_mixins/feedback.dart'; import 'package:aves/widgets/common/action_mixins/permission_aware.dart'; diff --git a/lib/widgets/viewer/overlay/bottom/panorama.dart b/lib/widgets/viewer/overlay/bottom/panorama.dart index 78be3c16f..58dbe902a 100644 --- a/lib/widgets/viewer/overlay/bottom/panorama.dart +++ b/lib/widgets/viewer/overlay/bottom/panorama.dart @@ -1,6 +1,7 @@ +import 'dart:async'; + import 'package:aves/model/entry.dart'; import 'package:aves/services/services.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; import 'package:aves/widgets/viewer/overlay/common.dart'; import 'package:aves/widgets/viewer/panorama_page.dart'; diff --git a/lib/widgets/viewer/printer.dart b/lib/widgets/viewer/printer.dart index 72e3ed4e4..d653082ec 100644 --- a/lib/widgets/viewer/printer.dart +++ b/lib/widgets/viewer/printer.dart @@ -4,7 +4,6 @@ import 'dart:convert'; import 'package:aves/model/entry.dart'; import 'package:aves/model/entry_images.dart'; import 'package:aves/services/services.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:aves/widgets/common/action_mixins/feedback.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; import 'package:flutter/widgets.dart'; diff --git a/lib/widgets/viewer/video_action_delegate.dart b/lib/widgets/viewer/video_action_delegate.dart index 0b5c21bd6..64f07cfff 100644 --- a/lib/widgets/viewer/video_action_delegate.dart +++ b/lib/widgets/viewer/video_action_delegate.dart @@ -7,7 +7,6 @@ import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/services/services.dart'; import 'package:aves/theme/durations.dart'; import 'package:aves/utils/android_file_utils.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:aves/widgets/collection/collection_page.dart'; import 'package:aves/widgets/common/action_mixins/feedback.dart'; import 'package:aves/widgets/common/action_mixins/permission_aware.dart'; diff --git a/lib/widgets/viewer/visual/entry_page_view.dart b/lib/widgets/viewer/visual/entry_page_view.dart index 452d65f07..ef67e1a81 100644 --- a/lib/widgets/viewer/visual/entry_page_view.dart +++ b/lib/widgets/viewer/visual/entry_page_view.dart @@ -21,7 +21,6 @@ import 'package:aves/widgets/viewer/visual/state.dart'; import 'package:aves/widgets/viewer/visual/subtitle/subtitle.dart'; import 'package:aves/widgets/viewer/visual/vector.dart'; import 'package:aves/widgets/viewer/visual/video.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -117,7 +116,7 @@ class _EntryPageViewState extends State { return Consumer( builder: (context, info, child) => Hero( - tag: info != null && info.entry == mainEntry ? hashValues(info.collectionId, mainEntry.uri) : hashCode, + tag: info != null && info.entry == mainEntry ? Object.hashAll([info.collectionId, mainEntry.uri]) : hashCode, transitionOnUserGestures: true, child: child!, ), diff --git a/pubspec.lock b/pubspec.lock index bc16696b0..9752149d7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1193,5 +1193,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.13.0 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">=2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 1db898fd8..6b999e8bf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ version: 1.5.1+55 publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.14.0 <3.0.0' dependencies: flutter: diff --git a/test_driver/app_test.dart b/test_driver/app_test.dart index 52da9a1d6..e6974cace 100644 --- a/test_driver/app_test.dart +++ b/test_driver/app_test.dart @@ -1,6 +1,7 @@ // ignore_for_file: avoid_print +import 'dart:async'; + import 'package:aves/model/source/enums.dart'; -import 'package:aves/utils/pedantic.dart'; import 'package:flutter_driver/flutter_driver.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart';