From 7b9213e82e7d40ef3c3f2839ec5f096e5c52bc32 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Sun, 22 Oct 2023 23:51:05 +0300 Subject: [PATCH] fixes, upgrades --- .../model/provider/MediaStoreImageProvider.kt | 9 ++++- lib/geo/topojson.dart | 36 +++++++++---------- lib/model/events.dart | 4 +-- lib/widgets/about/about_tv_page.dart | 2 +- lib/widgets/about/tv_license_page.dart | 8 ++--- lib/widgets/common/basic/insets.dart | 2 +- .../common/basic/labeled_checkbox.dart | 4 +-- .../known_extent_scroll_physics.dart | 4 +-- lib/widgets/common/behaviour/routes.dart | 9 +++-- .../behaviour/sloppy_scroll_physics.dart | 4 +-- lib/widgets/common/fx/sweeper.dart | 12 +++---- lib/widgets/common/grid/item_tracker.dart | 8 ++--- .../common/grid/sections/fixed/row.dart | 4 +-- .../common/grid/sections/mosaic/row.dart | 4 +-- lib/widgets/common/grid/sliver.dart | 9 +++-- .../common/map/leaflet/latlng_tween.dart | 9 ++--- lib/widgets/common/search/page.dart | 7 ++-- lib/widgets/common/thumbnail/image.dart | 5 ++- .../pick_dialogs/location_pick_page.dart | 3 +- .../common/covered_filter_chip.dart | 14 ++++---- lib/widgets/map/address_row.dart | 3 +- lib/widgets/navigation/nav_bar/floating.dart | 5 ++- lib/widgets/viewer/entry_vertical_pager.dart | 13 +++---- .../info/metadata/metadata_section.dart | 1 - lib/widgets/viewer/overlay/histogram.dart | 5 ++- .../viewer/overlay/thumbnail_preview.dart | 5 ++- .../viewer/overlay/viewer_buttons.dart | 6 ++-- .../viewer/visual/entry_page_view.dart | 15 +++++--- lib/widgets/wallpaper_page.dart | 8 ++--- .../lib/src/pan/gesture_detector_scope.dart | 4 +-- plugins/aves_magnifier/pubspec.lock | 8 ++--- plugins/aves_map/lib/src/geo_entry.dart | 24 +++++-------- plugins/aves_map/pubspec.lock | 8 ++--- plugins/aves_model/pubspec.lock | 8 ++--- plugins/aves_platform_meta/pubspec.lock | 8 ++--- plugins/aves_report/pubspec.lock | 8 ++--- plugins/aves_report_console/pubspec.lock | 8 ++--- plugins/aves_report_crashlytics/pubspec.lock | 24 ++++++------- plugins/aves_screen_state/pubspec.lock | 8 ++--- plugins/aves_services/pubspec.lock | 8 ++--- plugins/aves_services_google/pubspec.lock | 8 ++--- plugins/aves_services_huawei/pubspec.lock | 8 ++--- plugins/aves_services_none/pubspec.lock | 8 ++--- plugins/aves_ui/pubspec.lock | 8 ++--- plugins/aves_utils/pubspec.lock | 8 ++--- plugins/aves_video/pubspec.lock | 8 ++--- plugins/aves_video_ffmpeg/pubspec.lock | 8 ++--- plugins/aves_video_ijk/pubspec.lock | 8 ++--- plugins/aves_video_mpv/pubspec.lock | 16 ++++----- pubspec.lock | 34 +++++++++--------- 50 files changed, 216 insertions(+), 232 deletions(-) diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt index 1dd700ebf..d921615bd 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt @@ -725,12 +725,19 @@ class MediaStoreImageProvider : ImageProvider() { val df = StorageUtils.getDocumentFile(activity, oldPath, oldMediaUri) df ?: throw Exception("failed to get document at path=$oldPath") + val requestedName = newFile.name val renamed = df.renameTo(newFile.name) if (!renamed) { throw Exception("failed to rename document at path=$oldPath") } + val effectiveName = df.name + if (requestedName != effectiveName) { + Log.w(LOG_TAG, "requested renaming document at uri=$oldMediaUri path=$oldPath with name=${requestedName} but got name=$effectiveName") + } + val newPath = File(newFile.parentFile, df.name).path + scanObsoletePath(activity, oldMediaUri, oldPath, mimeType) - return scanNewPathByMediaStore(activity, newFile.path, mimeType) + return scanNewPathByMediaStore(activity, newPath, mimeType) } private suspend fun renameSingleByFile( diff --git a/lib/geo/topojson.dart b/lib/geo/topojson.dart index de9961cd4..c03f7d553 100644 --- a/lib/geo/topojson.dart +++ b/lib/geo/topojson.dart @@ -55,7 +55,7 @@ class Topology extends TopologyJsonObject { final List>> arcs; final Transform? transform; - Topology.parse(Map data) + Topology.parse(super.data) : objects = Map.fromEntries((data['objects'] as Map).cast().entries.map((kv) { final name = kv.key; final geometry = Geometry.build(kv.value); @@ -63,7 +63,7 @@ class Topology extends TopologyJsonObject { }).whereNotNull()), arcs = (data['arcs'] as List).cast().map((arc) => arc.cast().map((position) => position.cast()).toList()).toList(), transform = data.containsKey('transform') ? Transform.parse((data['transform'] as Map).cast()) : null, - super.parse(data); + super.parse(); List> _arcAt(int index) { var arc = arcs[index < 0 ? ~index : index]; @@ -131,10 +131,10 @@ abstract class Geometry extends TopologyJsonObject { final dynamic id; final Map? properties; - Geometry.parse(Map data) + Geometry.parse(super.data) : id = data.containsKey('id') ? data['id'] : null, properties = data.containsKey('properties') ? data['properties'] as Map? : null, - super.parse(data); + super.parse(); static Geometry? build(Map data) { final type = _parseTopoJsonObjectType(data['type'] as String?); @@ -165,41 +165,41 @@ abstract class Geometry extends TopologyJsonObject { class Point extends Geometry { final List coordinates; - Point.parse(Map data) + Point.parse(super.data) : coordinates = (data['coordinates'] as List).cast(), - super.parse(data); + super.parse(); } class MultiPoint extends Geometry { final List> coordinates; - MultiPoint.parse(Map data) + MultiPoint.parse(super.data) : coordinates = (data['coordinates'] as List).cast().map((position) => position.cast()).toList(), - super.parse(data); + super.parse(); } class LineString extends Geometry { final List arcs; - LineString.parse(Map data) + LineString.parse(super.data) : arcs = (data['arcs'] as List).cast(), - super.parse(data); + super.parse(); } class MultiLineString extends Geometry { final List> arcs; - MultiLineString.parse(Map data) + MultiLineString.parse(super.data) : arcs = (data['arcs'] as List).cast().map((arc) => arc.cast()).toList(), - super.parse(data); + super.parse(); } class Polygon extends Geometry { final List> arcs; - Polygon.parse(Map data) + Polygon.parse(super.data) : arcs = (data['arcs'] as List).cast().map((arc) => arc.cast()).toList(), - super.parse(data); + super.parse(); List>>? _rings; @@ -217,9 +217,9 @@ class Polygon extends Geometry { class MultiPolygon extends Geometry { final List>> arcs; - MultiPolygon.parse(Map data) + MultiPolygon.parse(super.data) : arcs = (data['arcs'] as List).cast().map((polygon) => polygon.cast().map((arc) => arc.cast()).toList()).toList(), - super.parse(data); + super.parse(); List>>>? _polygons; @@ -237,9 +237,9 @@ class MultiPolygon extends Geometry { class GeometryCollection extends Geometry { final List geometries; - GeometryCollection.parse(Map data) + GeometryCollection.parse(super.data) : geometries = (data['geometries'] as List).cast>().map(Geometry.build).whereNotNull().toList(), - super.parse(data); + super.parse(); @override bool containsPoint(Topology topology, List point) { diff --git a/lib/model/events.dart b/lib/model/events.dart index e6fea841f..8a82b1e23 100644 --- a/lib/model/events.dart +++ b/lib/model/events.dart @@ -13,10 +13,10 @@ class ActionEvent extends Equatable { @immutable class ActionStartedEvent extends ActionEvent { - const ActionStartedEvent(T action) : super(action); + const ActionStartedEvent(super.action); } @immutable class ActionEndedEvent extends ActionEvent { - const ActionEndedEvent(T action) : super(action); + const ActionEndedEvent(super.action); } diff --git a/lib/widgets/about/about_tv_page.dart b/lib/widgets/about/about_tv_page.dart index 9f52238ac..10875ea09 100644 --- a/lib/widgets/about/about_tv_page.dart +++ b/lib/widgets/about/about_tv_page.dart @@ -61,7 +61,7 @@ class AboutTvPage extends StatelessWidget { } class _Content extends StatefulWidget { - const _Content({Key? key}) : super(key: key); + const _Content(); @override State<_Content> createState() => _ContentState(); diff --git a/lib/widgets/about/tv_license_page.dart b/lib/widgets/about/tv_license_page.dart index ef229b3e9..a6822d725 100644 --- a/lib/widgets/about/tv_license_page.dart +++ b/lib/widgets/about/tv_license_page.dart @@ -219,9 +219,7 @@ class _PackageLicensePageState extends State<_PackageLicensePage> { return true; }()); for (final LicenseEntry license in widget.licenseEntries) { - if (!mounted) { - return; - } + if (!mounted) return; assert(() { Timeline.timeSync('_initLicenses()', () {}, flow: Flow.step(debugFlowId)); return true; @@ -231,9 +229,7 @@ class _PackageLicensePageState extends State<_PackageLicensePage> { Priority.animation, debugLabel: 'License', ); - if (!mounted) { - return; - } + if (!mounted) return; setState(() { _licenses.add(const Padding( padding: EdgeInsets.all(18.0), diff --git a/lib/widgets/common/basic/insets.dart b/lib/widgets/common/basic/insets.dart index 106756878..53f5e1870 100644 --- a/lib/widgets/common/basic/insets.dart +++ b/lib/widgets/common/basic/insets.dart @@ -122,7 +122,7 @@ class BottomPaddingSliver extends StatelessWidget { } class TvTileGridBottomPaddingSliver extends StatelessWidget { - const TvTileGridBottomPaddingSliver({Key? key}) : super(key: key); + const TvTileGridBottomPaddingSliver({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/basic/labeled_checkbox.dart b/lib/widgets/common/basic/labeled_checkbox.dart index 286b89247..c106e0749 100644 --- a/lib/widgets/common/basic/labeled_checkbox.dart +++ b/lib/widgets/common/basic/labeled_checkbox.dart @@ -7,11 +7,11 @@ class LabeledCheckbox extends StatefulWidget { final String text; const LabeledCheckbox({ - Key? key, + super.key, required this.value, required this.onChanged, required this.text, - }) : super(key: key); + }); @override State createState() => _LabeledCheckboxState(); diff --git a/lib/widgets/common/behaviour/known_extent_scroll_physics.dart b/lib/widgets/common/behaviour/known_extent_scroll_physics.dart index 57bb1b809..018a049ab 100644 --- a/lib/widgets/common/behaviour/known_extent_scroll_physics.dart +++ b/lib/widgets/common/behaviour/known_extent_scroll_physics.dart @@ -9,8 +9,8 @@ class KnownExtentScrollPhysics extends ScrollPhysics { const KnownExtentScrollPhysics({ required this.indexToScrollOffset, required this.scrollOffsetToIndex, - ScrollPhysics? parent, - }) : super(parent: parent); + super.parent, + }); @override KnownExtentScrollPhysics applyTo(ScrollPhysics? ancestor) { diff --git a/lib/widgets/common/behaviour/routes.dart b/lib/widgets/common/behaviour/routes.dart index a9f5760f9..e9a42d8a0 100644 --- a/lib/widgets/common/behaviour/routes.dart +++ b/lib/widgets/common/behaviour/routes.dart @@ -16,10 +16,9 @@ class DirectPageTransitionsTheme extends PageTransitionsTheme { class DirectMaterialPageRoute extends PageRouteBuilder { DirectMaterialPageRoute({ - RouteSettings? settings, + super.settings, required WidgetBuilder builder, }) : super( - settings: settings, transitionDuration: Duration.zero, pageBuilder: (context, a, sa) => builder(context), ); @@ -32,9 +31,9 @@ class DirectMaterialPageRoute extends PageRouteBuilder { class TransparentMaterialPageRoute extends PageRouteBuilder { TransparentMaterialPageRoute({ - RouteSettings? settings, - required RoutePageBuilder pageBuilder, - }) : super(settings: settings, pageBuilder: pageBuilder); + super.settings, + required super.pageBuilder, + }); @override bool get opaque => false; diff --git a/lib/widgets/common/behaviour/sloppy_scroll_physics.dart b/lib/widgets/common/behaviour/sloppy_scroll_physics.dart index 67b321183..f850795ad 100644 --- a/lib/widgets/common/behaviour/sloppy_scroll_physics.dart +++ b/lib/widgets/common/behaviour/sloppy_scroll_physics.dart @@ -13,8 +13,8 @@ class SloppyScrollPhysics extends ScrollPhysics { const SloppyScrollPhysics({ required this.gestureSettings, this.touchSlopFactor = 1, - ScrollPhysics? parent, - }) : super(parent: parent); + super.parent, + }); @override SloppyScrollPhysics applyTo(ScrollPhysics? ancestor) { diff --git a/lib/widgets/common/fx/sweeper.dart b/lib/widgets/common/fx/sweeper.dart index bb01c693b..fc218fa3b 100644 --- a/lib/widgets/common/fx/sweeper.dart +++ b/lib/widgets/common/fx/sweeper.dart @@ -114,14 +114,12 @@ class _SweeperState extends State with SingleTickerProviderStateMixin { setState(() {}); await Future.delayed(ADurations.sweeperOpacityAnimation * timeDilation); _isAppearing = false; - if (mounted) { - _angleAnimationController.reset(); - unawaited(_angleAnimationController.forward()); - } - } - if (mounted) { - setState(() {}); + if (!mounted) return; + _angleAnimationController.reset(); + unawaited(_angleAnimationController.forward()); } + if (!mounted) return; + setState(() {}); } } diff --git a/lib/widgets/common/grid/item_tracker.dart b/lib/widgets/common/grid/item_tracker.dart index 8ef7203fa..52048a563 100644 --- a/lib/widgets/common/grid/item_tracker.dart +++ b/lib/widgets/common/grid/item_tracker.dart @@ -135,11 +135,9 @@ class _GridItemTrackerState extends State> with WidgetsBin // so that we can handle window orientation change with the previous metrics, // regardless of the `View`/`WidgetsBindingObserver` order uncertainty await Future.delayed(const Duration(milliseconds: 500)); - - if (mounted) { - _lastSectionedListLayout = context.read>(); - _lastScrollableSize = scrollableSize; - } + if (!mounted) return; + _lastSectionedListLayout = context.read>(); + _lastScrollableSize = scrollableSize; } void _onLayoutChanged() { diff --git a/lib/widgets/common/grid/sections/fixed/row.dart b/lib/widgets/common/grid/sections/fixed/row.dart index 9e37f7675..f0f9e1c1b 100644 --- a/lib/widgets/common/grid/sections/fixed/row.dart +++ b/lib/widgets/common/grid/sections/fixed/row.dart @@ -11,8 +11,8 @@ class FixedExtentGridRow extends MultiChildRenderObjectWidget { required this.height, required this.spacing, required this.textDirection, - required List children, - }) : super(children: children); + required super.children, + }); @override RenderObject createRenderObject(BuildContext context) { diff --git a/lib/widgets/common/grid/sections/mosaic/row.dart b/lib/widgets/common/grid/sections/mosaic/row.dart index 8d0aae525..2cf0aa829 100644 --- a/lib/widgets/common/grid/sections/mosaic/row.dart +++ b/lib/widgets/common/grid/sections/mosaic/row.dart @@ -13,8 +13,8 @@ class MosaicGridRow extends MultiChildRenderObjectWidget { required this.rowLayout, required this.spacing, required this.textDirection, - required List children, - }) : super(children: children); + required super.children, + }); @override RenderObject createRenderObject(BuildContext context) { diff --git a/lib/widgets/common/grid/sliver.dart b/lib/widgets/common/grid/sliver.dart index 5be6b8415..299e70134 100644 --- a/lib/widgets/common/grid/sliver.dart +++ b/lib/widgets/common/grid/sliver.dart @@ -41,9 +41,9 @@ class _SliverKnownExtentList extends SliverMultiBoxAdaptorWidget { final List sectionLayouts; const _SliverKnownExtentList({ - required SliverChildDelegate delegate, + required super.delegate, required this.sectionLayouts, - }) : super(delegate: delegate); + }); @override _RenderSliverKnownExtentBoxAdaptor createRenderObject(BuildContext context) { @@ -69,10 +69,9 @@ class _RenderSliverKnownExtentBoxAdaptor extends RenderSliverMultiBoxAdaptor { } _RenderSliverKnownExtentBoxAdaptor({ - required RenderSliverBoxChildManager childManager, + required super.childManager, required List sectionLayouts, - }) : _sectionLayouts = sectionLayouts, - super(childManager: childManager); + }) : _sectionLayouts = sectionLayouts; SectionLayout? sectionAtIndex(int index) => sectionLayouts.firstWhereOrNull((section) => section.hasChild(index)); diff --git a/lib/widgets/common/map/leaflet/latlng_tween.dart b/lib/widgets/common/map/leaflet/latlng_tween.dart index 2b3d6960c..1593c9c04 100644 --- a/lib/widgets/common/map/leaflet/latlng_tween.dart +++ b/lib/widgets/common/map/leaflet/latlng_tween.dart @@ -4,12 +4,9 @@ import 'package:latlong2/latlong.dart'; class LatLngTween extends Tween { LatLngTween({ - required LatLng? begin, - required LatLng? end, - }) : super( - begin: begin, - end: end, - ); + required super.begin, + required super.end, + }); @override LatLng? lerp(double t) => LatLngUtils.lerp(begin, end, t); diff --git a/lib/widgets/common/search/page.dart b/lib/widgets/common/search/page.dart index fe1f32f61..0de3dde77 100644 --- a/lib/widgets/common/search/page.dart +++ b/lib/widgets/common/search/page.dart @@ -91,10 +91,9 @@ class _SearchPageState extends State { void _onQueryChanged() { _debouncer(() { - if (mounted) { - // rebuild ourselves because query changed. - setState(() {}); - } + if (!mounted) return; + // rebuild ourselves because query changed. + setState(() {}); }); } diff --git a/lib/widgets/common/thumbnail/image.dart b/lib/widgets/common/thumbnail/image.dart index be5b43eb9..4c19eabcd 100644 --- a/lib/widgets/common/thumbnail/image.dart +++ b/lib/widgets/common/thumbnail/image.dart @@ -161,9 +161,8 @@ class _ThumbnailImageState extends State { } void _onError(Object exception, StackTrace? stackTrace) { - if (mounted) { - setState(() => _lastException = exception); - } + if (!mounted) return; + setState(() => _lastException = exception); } bool _needSizedProvider(ImageInfo? currentImageInfo) { diff --git a/lib/widgets/dialogs/pick_dialogs/location_pick_page.dart b/lib/widgets/dialogs/pick_dialogs/location_pick_page.dart index 310c6d821..cce0f670f 100644 --- a/lib/widgets/dialogs/pick_dialogs/location_pick_page.dart +++ b/lib/widgets/dialogs/pick_dialogs/location_pick_page.dart @@ -296,7 +296,8 @@ class _AddressRowState extends State<_AddressRow> { Future _updateAddress() async { final location = widget.location; final addressLine = await _getAddressLine(location); - if (mounted && location == widget.location) { + if (!mounted) return; + if (location == widget.location) { _addressLineNotifier.value = addressLine; } } diff --git a/lib/widgets/filter_grids/common/covered_filter_chip.dart b/lib/widgets/filter_grids/common/covered_filter_chip.dart index 8eb664eb5..27637aae8 100644 --- a/lib/widgets/filter_grids/common/covered_filter_chip.dart +++ b/lib/widgets/filter_grids/common/covered_filter_chip.dart @@ -68,26 +68,26 @@ class CoveredFilterChip extends StatelessWidget { stream: covers.entryChangeStream.where((event) => event == null || event.contains(filter)), builder: (context, snapshot) => Consumer( builder: (context, source, child) { - switch (T) { - case AlbumFilter: + switch (filter) { + case AlbumFilter filter: { - final album = (filter as AlbumFilter).album; + final album = filter.album; return StreamBuilder( stream: source.eventBus.on().where((event) => event.directories == null || event.directories!.contains(album)), builder: (context, snapshot) => _buildChip(context, source), ); } - case LocationFilter: + case LocationFilter filter: { - final countryCode = (filter as LocationFilter).code; + final countryCode = filter.code; return StreamBuilder( stream: source.eventBus.on().where((event) => event.countryCodes == null || event.countryCodes!.contains(countryCode)), builder: (context, snapshot) => _buildChip(context, source), ); } - case TagFilter: + case TagFilter filter: { - final tag = (filter as TagFilter).tag; + final tag = filter.tag; return StreamBuilder( stream: source.eventBus.on().where((event) => event.tags == null || event.tags!.contains(tag)), builder: (context, snapshot) => _buildChip(context, source), diff --git a/lib/widgets/map/address_row.dart b/lib/widgets/map/address_row.dart index 2bdfdfc42..87e7db02a 100644 --- a/lib/widgets/map/address_row.dart +++ b/lib/widgets/map/address_row.dart @@ -92,7 +92,8 @@ class _MapAddressRowState extends State { Future _updateAddress() async { final entry = widget.entry; final addressLine = await _getAddressLine(entry); - if (mounted && entry == widget.entry) { + if (!mounted) return; + if (entry == widget.entry) { _addressLineNotifier.value = addressLine; } } diff --git a/lib/widgets/navigation/nav_bar/floating.dart b/lib/widgets/navigation/nav_bar/floating.dart index 85d729eb3..2c4f27ad7 100644 --- a/lib/widgets/navigation/nav_bar/floating.dart +++ b/lib/widgets/navigation/nav_bar/floating.dart @@ -44,9 +44,8 @@ class _FloatingNavBarState extends State with SingleTickerProvid curve: Curves.linear, )) ..addListener(() { - if (mounted) { - setState(() {}); - } + if (!mounted) return; + setState(() {}); }); _registerWidget(widget); } diff --git a/lib/widgets/viewer/entry_vertical_pager.dart b/lib/widgets/viewer/entry_vertical_pager.dart index b81cb75fa..a3eaa15e1 100644 --- a/lib/widgets/viewer/entry_vertical_pager.dart +++ b/lib/widgets/viewer/entry_vertical_pager.dart @@ -358,19 +358,16 @@ class _ViewerVerticalPageViewState extends State { } else { Navigator.maybeOf(context)?.pop(); } - + if (!mounted) return; // needed to refresh when entry changes but the page does not (e.g. on page deletion) - if (mounted) { - setState(() {}); - } + setState(() {}); } // when the entry image itself changed (e.g. after rotation) void _onVisualChanged() async { - // rebuild to refresh the Image inside ImagePage - if (mounted) { - setState(() {}); - } + if (!mounted) return; + // rebuild to refresh the `Image` inside `ImagePage` + setState(() {}); } void _onPlayPauseIntent(PlayPauseIntent intent) { diff --git a/lib/widgets/viewer/info/metadata/metadata_section.dart b/lib/widgets/viewer/info/metadata/metadata_section.dart index 42ba3ccb6..c72588edc 100644 --- a/lib/widgets/viewer/info/metadata/metadata_section.dart +++ b/lib/widgets/viewer/info/metadata/metadata_section.dart @@ -144,7 +144,6 @@ class _MetadataSectionSliverState extends State { Future _getMetadata() async { if (!mounted) return; - final titledDirectories = await entry.getMetadataDirectories(context); metadataNotifier.value = Map.fromEntries(titledDirectories); _expandedDirectoryNotifier.value = null; diff --git a/lib/widgets/viewer/overlay/histogram.dart b/lib/widgets/viewer/overlay/histogram.dart index 0508c1104..62a4e9ca8 100644 --- a/lib/widgets/viewer/overlay/histogram.dart +++ b/lib/widgets/viewer/overlay/histogram.dart @@ -80,9 +80,8 @@ class _ImageHistogramState extends State { final targetEntry = entry; final forceUpdate = targetEntry.isAnimated; final newLevels = await viewStateController.getHistogramLevels(info, forceUpdate); - if (mounted) { - setState(() => _levels = targetEntry == entry ? newLevels : {}); - } + if (!mounted) return; + setState(() => _levels = targetEntry == entry ? newLevels : {}); } } diff --git a/lib/widgets/viewer/overlay/thumbnail_preview.dart b/lib/widgets/viewer/overlay/thumbnail_preview.dart index de3936e50..f1d656a92 100644 --- a/lib/widgets/viewer/overlay/thumbnail_preview.dart +++ b/lib/widgets/viewer/overlay/thumbnail_preview.dart @@ -65,8 +65,7 @@ class _ViewerThumbnailPreviewState extends State { } void _onScrollerIndexChanged() => _debouncer(() { - if (mounted) { - ShowEntryNotification(animate: false, index: _entryIndexNotifier.value).dispatch(context); - } + if (!mounted) return; + ShowEntryNotification(animate: false, index: _entryIndexNotifier.value).dispatch(context); }); } diff --git a/lib/widgets/viewer/overlay/viewer_buttons.dart b/lib/widgets/viewer/overlay/viewer_buttons.dart index efbdd0aff..9c0f610ea 100644 --- a/lib/widgets/viewer/overlay/viewer_buttons.dart +++ b/lib/widgets/viewer/overlay/viewer_buttons.dart @@ -279,9 +279,9 @@ class _ViewerButtonRowContentState extends State { icon: AIcons.export, title: context.l10n.entryActionExport, items: [ - ...exportInternalActions.map((action) => _buildPopupMenuItem(context, action, videoController)).toList(), + ...exportInternalActions.map((action) => _buildPopupMenuItem(context, action, videoController)), if (exportInternalActions.isNotEmpty && exportExternalActions.isNotEmpty) const PopupMenuDivider(height: 0), - ...exportExternalActions.map((action) => _buildPopupMenuItem(context, action, videoController)).toList(), + ...exportExternalActions.map((action) => _buildPopupMenuItem(context, action, videoController)), ], ), if (videoActions.isNotEmpty) @@ -291,7 +291,7 @@ class _ViewerButtonRowContentState extends State { icon: AIcons.video, title: context.l10n.settingsVideoSectionTitle, items: [ - ...videoActions.map((action) => _buildPopupMenuItem(context, action, videoController)).toList(), + ...videoActions.map((action) => _buildPopupMenuItem(context, action, videoController)), ], ), if (!kReleaseMode) ...[ diff --git a/lib/widgets/viewer/visual/entry_page_view.dart b/lib/widgets/viewer/visual/entry_page_view.dart index f483bfe01..3b598c336 100644 --- a/lib/widgets/viewer/visual/entry_page_view.dart +++ b/lib/widgets/viewer/visual/entry_page_view.dart @@ -268,14 +268,14 @@ class _EntryPageViewState extends State with SingleTickerProvider var move = Offset.zero; var dropped = false; double? startValue; - final valueNotifier = ValueNotifier(null); + ValueNotifier? valueNotifier; onScaleStart = (details, doubleTap, boundaries) { dropped = details.pointerCount > 1 || doubleTap; if (dropped) return; startValue = null; - valueNotifier.value = null; + valueNotifier = ValueNotifier(null); final alignmentX = details.focalPoint.dx / boundaries.viewportSize.width; final action = alignmentX > .5 ? SwipeAction.volume : SwipeAction.brightness; action.get().then((v) => startValue = v); @@ -284,15 +284,17 @@ class _EntryPageViewState extends State with SingleTickerProvider _actionFeedbackOverlayEntry = OverlayEntry( builder: (context) => SwipeActionFeedback( action: action, - valueNotifier: valueNotifier, + valueNotifier: valueNotifier!, ), ); Overlay.of(context).insert(_actionFeedbackOverlayEntry!); }; onScaleUpdate = (details) { + if (valueNotifier == null) return false; + move += details.focalPointDelta; dropped |= details.pointerCount > 1; - if (valueNotifier.value == null) { + if (valueNotifier!.value == null) { dropped |= MagnifierGestureRecognizer.isXPan(move); } if (dropped) return false; @@ -300,12 +302,14 @@ class _EntryPageViewState extends State with SingleTickerProvider final _startValue = startValue; if (_startValue != null) { final double value = (_startValue - move.dy / SwipeActionFeedback.height).clamp(0, 1); - valueNotifier.value = value; + valueNotifier!.value = value; swipeAction?.set(value); } return true; }; onScaleEnd = (details) { + valueNotifier?.dispose(); + final overlayEntry = _actionFeedbackOverlayEntry; _actionFeedbackOverlayEntry = null; if (overlayEntry != null) { @@ -482,6 +486,7 @@ class _EntryPageViewState extends State with SingleTickerProvider } double? _getSideRatio() { + if (!mounted) return null; final isPortrait = MediaQuery.orientationOf(context) == Orientation.portrait; return isPortrait ? 1 / 5 : 1 / 8; } diff --git a/lib/widgets/wallpaper_page.dart b/lib/widgets/wallpaper_page.dart index ad67533fa..0d438810d 100644 --- a/lib/widgets/wallpaper_page.dart +++ b/lib/widgets/wallpaper_page.dart @@ -31,9 +31,9 @@ class WallpaperPage extends StatelessWidget { final AvesEntry? entry; const WallpaperPage({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -60,9 +60,9 @@ class EntryEditor extends StatefulWidget { final AvesEntry entry; const EntryEditor({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State createState() => _EntryEditorState(); diff --git a/plugins/aves_magnifier/lib/src/pan/gesture_detector_scope.dart b/plugins/aves_magnifier/lib/src/pan/gesture_detector_scope.dart index 0ac3689a6..d46412132 100644 --- a/plugins/aves_magnifier/lib/src/pan/gesture_detector_scope.dart +++ b/plugins/aves_magnifier/lib/src/pan/gesture_detector_scope.dart @@ -27,8 +27,8 @@ class MagnifierGestureDetectorScope extends InheritedWidget { this.touchSlopFactor = .8, this.escapeByFling = true, this.acceptPointerEvent, - required Widget child, - }) : super(child: child); + required super.child, + }); static MagnifierGestureDetectorScope? maybeOf(BuildContext context) { return context.dependOnInheritedWidgetOfExactType(); diff --git a/plugins/aves_magnifier/pubspec.lock b/plugins/aves_magnifier/pubspec.lock index 490b26e85..f4a11f7ab 100644 --- a/plugins/aves_magnifier/pubspec.lock +++ b/plugins/aves_magnifier/pubspec.lock @@ -41,18 +41,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_map/lib/src/geo_entry.dart b/plugins/aves_map/lib/src/geo_entry.dart index 046ce4c1b..4699e38aa 100644 --- a/plugins/aves_map/lib/src/geo_entry.dart +++ b/plugins/aves_map/lib/src/geo_entry.dart @@ -6,22 +6,14 @@ class GeoEntry extends Clusterable { GeoEntry({ this.entry, - double? latitude, - double? longitude, - bool? isCluster = false, - int? clusterId, - int? pointsSize, - String? markerId, - String? childMarkerId, - }) : super( - latitude: latitude, - longitude: longitude, - isCluster: isCluster, - clusterId: clusterId, - pointsSize: pointsSize, - markerId: markerId, - childMarkerId: childMarkerId, - ); + super.latitude, + super.longitude, + super.isCluster = false, + super.clusterId, + super.pointsSize, + super.markerId, + super.childMarkerId, + }); factory GeoEntry.createCluster(BaseCluster cluster, double longitude, double latitude) { return GeoEntry( diff --git a/plugins/aves_map/pubspec.lock b/plugins/aves_map/pubspec.lock index 3cb0de8f7..31971e688 100644 --- a/plugins/aves_map/pubspec.lock +++ b/plugins/aves_map/pubspec.lock @@ -73,10 +73,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" flutter_map: dependency: "direct main" description: @@ -121,10 +121,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" lists: dependency: transitive description: diff --git a/plugins/aves_model/pubspec.lock b/plugins/aves_model/pubspec.lock index 9edc64bfa..2e9523da0 100644 --- a/plugins/aves_model/pubspec.lock +++ b/plugins/aves_model/pubspec.lock @@ -34,18 +34,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_platform_meta/pubspec.lock b/plugins/aves_platform_meta/pubspec.lock index 684b0b7d0..e65911230 100644 --- a/plugins/aves_platform_meta/pubspec.lock +++ b/plugins/aves_platform_meta/pubspec.lock @@ -26,18 +26,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_report/pubspec.lock b/plugins/aves_report/pubspec.lock index fe97c83ca..dd5c31c49 100644 --- a/plugins/aves_report/pubspec.lock +++ b/plugins/aves_report/pubspec.lock @@ -26,18 +26,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_report_console/pubspec.lock b/plugins/aves_report_console/pubspec.lock index e7335379f..dbaaf6b00 100644 --- a/plugins/aves_report_console/pubspec.lock +++ b/plugins/aves_report_console/pubspec.lock @@ -33,18 +33,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_report_crashlytics/pubspec.lock b/plugins/aves_report_crashlytics/pubspec.lock index 20461fa51..75f02cb49 100644 --- a/plugins/aves_report_crashlytics/pubspec.lock +++ b/plugins/aves_report_crashlytics/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "2e3a565cdd40b32df6ff9a0d1f16b9144fcce769455597ee9195f568ffbb3a59" + sha256: "76c15c4167f820b74abcd8c6fc5e393e1ed5e1207a34e9b22953603e03b3ba6a" url: "https://pub.dev" source: hosted - version: "1.3.8" + version: "1.3.9" async: dependency: transitive description: @@ -68,10 +68,10 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: "761d0a00562ba09d491eacdceaf1885df62d072c9431bf3110333e2a9904b1e1" + sha256: "57bba167105d2315d243a4524939406df688f38a5b6d7a4159382bbbe43cdd00" url: "https://pub.dev" source: hosted - version: "2.18.0" + version: "2.19.0" firebase_core_platform_interface: dependency: transitive description: @@ -92,18 +92,18 @@ packages: dependency: "direct main" description: name: firebase_crashlytics - sha256: "85f1098487d1b177bb4b7e0d552f57029d6964d2da665104d6299acce2f58bb6" + sha256: c58902959e7a73aadcf82c87e8d64f6eb10b5287fd7aaadfab5c2ef34ec11ff5 url: "https://pub.dev" source: hosted - version: "3.4.0" + version: "3.4.1" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: "8bdcca9109595d353b467a97278becb726286596741b9cc0ace59abf9def9645" + sha256: "9d2f76bda1542615f75fb501a8c7afc6288d69c3728fdc762bf3d51f0ee0f4cb" url: "https://pub.dev" source: hosted - version: "3.6.8" + version: "3.6.9" flutter: dependency: "direct main" description: flutter @@ -113,10 +113,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" flutter_test: dependency: transitive description: flutter @@ -139,10 +139,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" matcher: dependency: transitive description: diff --git a/plugins/aves_screen_state/pubspec.lock b/plugins/aves_screen_state/pubspec.lock index 684b0b7d0..e65911230 100644 --- a/plugins/aves_screen_state/pubspec.lock +++ b/plugins/aves_screen_state/pubspec.lock @@ -26,18 +26,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_services/pubspec.lock b/plugins/aves_services/pubspec.lock index 0a575fd78..1ab8ace1d 100644 --- a/plugins/aves_services/pubspec.lock +++ b/plugins/aves_services/pubspec.lock @@ -80,10 +80,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" flutter_map: dependency: transitive description: @@ -128,10 +128,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" lists: dependency: transitive description: diff --git a/plugins/aves_services_google/pubspec.lock b/plugins/aves_services_google/pubspec.lock index 0745daee6..d92f6e0f2 100644 --- a/plugins/aves_services_google/pubspec.lock +++ b/plugins/aves_services_google/pubspec.lock @@ -127,10 +127,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" flutter_map: dependency: transitive description: @@ -284,10 +284,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" lists: dependency: transitive description: diff --git a/plugins/aves_services_huawei/pubspec.lock b/plugins/aves_services_huawei/pubspec.lock index 7ce676c1c..854ab83d3 100644 --- a/plugins/aves_services_huawei/pubspec.lock +++ b/plugins/aves_services_huawei/pubspec.lock @@ -94,10 +94,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" flutter_map: dependency: transitive description: @@ -160,10 +160,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" lists: dependency: transitive description: diff --git a/plugins/aves_services_none/pubspec.lock b/plugins/aves_services_none/pubspec.lock index 03b7b3396..38f6316ea 100644 --- a/plugins/aves_services_none/pubspec.lock +++ b/plugins/aves_services_none/pubspec.lock @@ -87,10 +87,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" flutter_map: dependency: transitive description: @@ -135,10 +135,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" lists: dependency: transitive description: diff --git a/plugins/aves_ui/pubspec.lock b/plugins/aves_ui/pubspec.lock index ce8fcf357..289da566e 100644 --- a/plugins/aves_ui/pubspec.lock +++ b/plugins/aves_ui/pubspec.lock @@ -26,18 +26,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_utils/pubspec.lock b/plugins/aves_utils/pubspec.lock index f5a37c6a6..8c988d5aa 100644 --- a/plugins/aves_utils/pubspec.lock +++ b/plugins/aves_utils/pubspec.lock @@ -26,18 +26,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_video/pubspec.lock b/plugins/aves_video/pubspec.lock index 003e4bb71..becf9ff06 100644 --- a/plugins/aves_video/pubspec.lock +++ b/plugins/aves_video/pubspec.lock @@ -48,18 +48,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_video_ffmpeg/pubspec.lock b/plugins/aves_video_ffmpeg/pubspec.lock index d3c918a91..0166c23cf 100644 --- a/plugins/aves_video_ffmpeg/pubspec.lock +++ b/plugins/aves_video_ffmpeg/pubspec.lock @@ -72,18 +72,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_video_ijk/pubspec.lock b/plugins/aves_video_ijk/pubspec.lock index 0529b3bd0..f92261b58 100644 --- a/plugins/aves_video_ijk/pubspec.lock +++ b/plugins/aves_video_ijk/pubspec.lock @@ -64,18 +64,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: diff --git a/plugins/aves_video_mpv/pubspec.lock b/plugins/aves_video_mpv/pubspec.lock index 9e1686292..82ed7ce21 100644 --- a/plugins/aves_video_mpv/pubspec.lock +++ b/plugins/aves_video_mpv/pubspec.lock @@ -111,10 +111,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" flutter_web_plugins: dependency: transitive description: flutter @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" material_color_utilities: dependency: transitive description: @@ -172,10 +172,10 @@ packages: dependency: "direct main" description: name: media_kit - sha256: "3dffc6d0c19117d51fbc42a7f89612e0595665800a596289ab7a80bdd93e0ad1" + sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a" url: "https://pub.dev" source: hosted - version: "1.1.9" + version: "1.1.10+1" media_kit_libs_android_video: dependency: "direct main" description: @@ -196,10 +196,10 @@ packages: dependency: "direct main" description: name: media_kit_video - sha256: b8df9cf97aba1861af83b00ac16f5cac536debe0781a934a554b77c157a8f7e8 + sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882 url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.4" meta: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock index cf31fc33b..d364c4652 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "2e3a565cdd40b32df6ff9a0d1f16b9144fcce769455597ee9195f568ffbb3a59" + sha256: "76c15c4167f820b74abcd8c6fc5e393e1ed5e1207a34e9b22953603e03b3ba6a" url: "https://pub.dev" source: hosted - version: "1.3.8" + version: "1.3.9" analyzer: dependency: transitive description: @@ -331,7 +331,7 @@ packages: description: path: "." ref: HEAD - resolved-ref: cfcb070b627f110d01dff88809dcea20faa13444 + resolved-ref: "7c4032fa0fc17b5a5d3fec1ac854afd6cd55670e" url: "https://github.com/deckerst/expansion_tile_card.git" source: git version: "3.0.0" @@ -380,10 +380,10 @@ packages: dependency: transitive description: name: firebase_core - sha256: "761d0a00562ba09d491eacdceaf1885df62d072c9431bf3110333e2a9904b1e1" + sha256: "57bba167105d2315d243a4524939406df688f38a5b6d7a4159382bbbe43cdd00" url: "https://pub.dev" source: hosted - version: "2.18.0" + version: "2.19.0" firebase_core_platform_interface: dependency: transitive description: @@ -404,18 +404,18 @@ packages: dependency: transitive description: name: firebase_crashlytics - sha256: "85f1098487d1b177bb4b7e0d552f57029d6964d2da665104d6299acce2f58bb6" + sha256: c58902959e7a73aadcf82c87e8d64f6eb10b5287fd7aaadfab5c2ef34ec11ff5 url: "https://pub.dev" source: hosted - version: "3.4.0" + version: "3.4.1" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: "8bdcca9109595d353b467a97278becb726286596741b9cc0ace59abf9def9645" + sha256: "9d2f76bda1542615f75fb501a8c7afc6288d69c3728fdc762bf3d51f0ee0f4cb" url: "https://pub.dev" source: hosted - version: "3.6.8" + version: "3.6.9" flex_color_picker: dependency: "direct main" description: @@ -486,10 +486,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" flutter_localization_nn: dependency: "direct main" description: @@ -747,10 +747,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" lists: dependency: transitive description: @@ -851,10 +851,10 @@ packages: dependency: transitive description: name: media_kit - sha256: "3dffc6d0c19117d51fbc42a7f89612e0595665800a596289ab7a80bdd93e0ad1" + sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a" url: "https://pub.dev" source: hosted - version: "1.1.9" + version: "1.1.10+1" media_kit_libs_android_video: dependency: transitive description: @@ -875,10 +875,10 @@ packages: dependency: transitive description: name: media_kit_video - sha256: b8df9cf97aba1861af83b00ac16f5cac536debe0781a934a554b77c157a8f7e8 + sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882 url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.4" meta: dependency: transitive description: