From a3024fdf4ee2a073389ffb1105213b19ad9b34e9 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Sun, 24 Nov 2024 00:52:29 +0100 Subject: [PATCH] minor --- lib/widgets/collection/app_bar.dart | 2 +- lib/widgets/collection/collection_grid.dart | 4 ++-- lib/widgets/common/basic/tv_edge_focus.dart | 2 +- lib/widgets/common/behaviour/pop/double_back.dart | 2 +- lib/widgets/common/behaviour/pop/tv_navigation.dart | 2 +- lib/widgets/common/identity/aves_app_bar.dart | 2 +- lib/widgets/debug/app_debug_page.dart | 2 +- lib/widgets/dialogs/entry_editors/rename_entry_set_page.dart | 2 +- lib/widgets/dialogs/pick_dialogs/album_pick_page.dart | 2 +- lib/widgets/explorer/app_bar.dart | 2 +- lib/widgets/filter_grids/common/app_bar.dart | 2 +- lib/widgets/filter_grids/common/filter_grid_page.dart | 2 +- lib/widgets/navigation/nav_bar/nav_bar.dart | 2 +- .../settings/privacy/file_picker/file_picker_page.dart | 2 +- lib/widgets/settings/settings_mobile_page.dart | 2 +- lib/widgets/settings/thumbnails/overlay.dart | 4 ++-- lib/widgets/viewer/info/info_app_bar.dart | 2 +- lib/widgets/viewer/overlay/viewer_buttons.dart | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/widgets/collection/app_bar.dart b/lib/widgets/collection/app_bar.dart index aae93bac0..e2f47293f 100644 --- a/lib/widgets/collection/app_bar.dart +++ b/lib/widgets/collection/app_bar.dart @@ -399,7 +399,7 @@ class _CollectionAppBarState extends State with SingleTickerPr (action) => _buildButtonIcon(context, action, enabled: canApply(action), selection: selection), ); - final animations = context.select((s) => s.accessibilityAnimations); + final animations = context.select((v) => v.accessibilityAnimations); return [ ...quickActionButtons, PopupMenuButton( diff --git a/lib/widgets/collection/collection_grid.dart b/lib/widgets/collection/collection_grid.dart index 874f9004a..7199fd7ad 100644 --- a/lib/widgets/collection/collection_grid.dart +++ b/lib/widgets/collection/collection_grid.dart @@ -88,7 +88,7 @@ class _CollectionGridState extends State { @override Widget build(BuildContext context) { - final spacing = context.select((s) => s.getTileLayout(settingsRouteKey) == TileLayout.mosaic ? CollectionGrid.mosaicLayoutSpacing : CollectionGrid.fixedExtentLayoutSpacing); + final spacing = context.select((v) => v.getTileLayout(settingsRouteKey) == TileLayout.mosaic ? CollectionGrid.mosaicLayoutSpacing : CollectionGrid.fixedExtentLayoutSpacing); if (_tileExtentController?.spacing != spacing) { _tileExtentController = TileExtentController( settingsRouteKey: settingsRouteKey, @@ -136,7 +136,7 @@ class _CollectionGridContentState extends State<_CollectionGridContent> { Widget build(BuildContext context) { final selectable = context.select, bool>((v) => v.value.canSelectMedia); final settingsRouteKey = context.read().settingsRouteKey; - final tileLayout = context.select((s) => s.getTileLayout(settingsRouteKey)); + final tileLayout = context.select((v) => v.getTileLayout(settingsRouteKey)); return Consumer( builder: (context, collection, child) { final sectionedListLayoutProvider = ValueListenableBuilder( diff --git a/lib/widgets/common/basic/tv_edge_focus.dart b/lib/widgets/common/basic/tv_edge_focus.dart index 9e624a030..190d047e6 100644 --- a/lib/widgets/common/basic/tv_edge_focus.dart +++ b/lib/widgets/common/basic/tv_edge_focus.dart @@ -14,7 +14,7 @@ class TvEdgeFocus extends StatelessWidget { @override Widget build(BuildContext context) { - final useTvLayout = context.select((s) => s.useTvLayout); + final useTvLayout = context.select((v) => v.useTvLayout); return useTvLayout ? Focus( focusNode: focusNode, diff --git a/lib/widgets/common/behaviour/pop/double_back.dart b/lib/widgets/common/behaviour/pop/double_back.dart index b5a2b3729..d73aa5661 100644 --- a/lib/widgets/common/behaviour/pop/double_back.dart +++ b/lib/widgets/common/behaviour/pop/double_back.dart @@ -20,7 +20,7 @@ class DoubleBackPopHandler extends PopHandler { @override bool canPop(BuildContext context) { - if (context.select((s) => !s.mustBackTwiceToExit)) return true; + if (context.select((v) => !v.mustBackTwiceToExit)) return true; if (Navigator.canPop(context)) return true; return false; } diff --git a/lib/widgets/common/behaviour/pop/tv_navigation.dart b/lib/widgets/common/behaviour/pop/tv_navigation.dart index b895aa917..720a397ae 100644 --- a/lib/widgets/common/behaviour/pop/tv_navigation.dart +++ b/lib/widgets/common/behaviour/pop/tv_navigation.dart @@ -20,7 +20,7 @@ class TvNavigationPopHandler implements PopHandler { @override bool canPop(BuildContext context) { - if (context.select((s) => !s.useTvLayout)) return true; + if (context.select((v) => !v.useTvLayout)) return true; if (_isHome(context)) return true; return false; } diff --git a/lib/widgets/common/identity/aves_app_bar.dart b/lib/widgets/common/identity/aves_app_bar.dart index f66653fc2..9089a2bc8 100644 --- a/lib/widgets/common/identity/aves_app_bar.dart +++ b/lib/widgets/common/identity/aves_app_bar.dart @@ -260,7 +260,7 @@ class _AvesFloatingBarState extends State with RouteAware { return ValueListenableBuilder( valueListenable: _isBlurAllowedNotifier, builder: (context, isBlurAllowed, child) { - final blurred = isBlurAllowed && context.select((s) => s.enableBlurEffect); + final blurred = isBlurAllowed && context.select((v) => v.enableBlurEffect); return Container( foregroundDecoration: BoxDecoration( border: Border.all( diff --git a/lib/widgets/debug/app_debug_page.dart b/lib/widgets/debug/app_debug_page.dart index 004d4193f..0eb919a7a 100644 --- a/lib/widgets/debug/app_debug_page.dart +++ b/lib/widgets/debug/app_debug_page.dart @@ -37,7 +37,7 @@ class AppDebugPage extends StatelessWidget { @override Widget build(BuildContext context) { - final animations = context.select((s) => s.accessibilityAnimations); + final animations = context.select((v) => v.accessibilityAnimations); return Directionality( textDirection: TextDirection.ltr, child: AvesScaffold( diff --git a/lib/widgets/dialogs/entry_editors/rename_entry_set_page.dart b/lib/widgets/dialogs/entry_editors/rename_entry_set_page.dart index b3962c5fc..85f1d8151 100644 --- a/lib/widgets/dialogs/entry_editors/rename_entry_set_page.dart +++ b/lib/widgets/dialogs/entry_editors/rename_entry_set_page.dart @@ -71,7 +71,7 @@ class _RenameEntrySetPageState extends State { final l10n = context.l10n; final textScaler = MediaQuery.textScalerOf(context); final effectiveThumbnailExtent = max(thumbnailExtent, textScaler.scale(thumbnailExtent)); - final animations = context.select((s) => s.accessibilityAnimations); + final animations = context.select((v) => v.accessibilityAnimations); return AvesScaffold( appBar: AppBar( title: Text(l10n.renameEntrySetPageTitle), diff --git a/lib/widgets/dialogs/pick_dialogs/album_pick_page.dart b/lib/widgets/dialogs/pick_dialogs/album_pick_page.dart index 66fd7a2b4..12ca7aff4 100644 --- a/lib/widgets/dialogs/pick_dialogs/album_pick_page.dart +++ b/lib/widgets/dialogs/pick_dialogs/album_pick_page.dart @@ -211,7 +211,7 @@ class _AlbumPickPageState extends State<_AlbumPickPage> { required bool Function(ChipSetAction action) isVisible, required void Function(ChipSetAction action) onActionSelected, }) { - final animations = context.select((s) => s.accessibilityAnimations); + final animations = context.select((v) => v.accessibilityAnimations); return [ if (widget.moveType != null) ..._quickActions.where(isVisible).map( diff --git a/lib/widgets/explorer/app_bar.dart b/lib/widgets/explorer/app_bar.dart index 5a9985f1e..f4883915a 100644 --- a/lib/widgets/explorer/app_bar.dart +++ b/lib/widgets/explorer/app_bar.dart @@ -104,7 +104,7 @@ class _ExplorerAppBarState extends State with WidgetsBindingObse } List _buildActions(BuildContext context, double maxWidth) { - final animations = context.select((s) => s.accessibilityAnimations); + final animations = context.select((v) => v.accessibilityAnimations); return [ IconButton( icon: const Icon(AIcons.search), diff --git a/lib/widgets/filter_grids/common/app_bar.dart b/lib/widgets/filter_grids/common/app_bar.dart index d75dd86f6..07bb607f2 100644 --- a/lib/widgets/filter_grids/common/app_bar.dart +++ b/lib/widgets/filter_grids/common/app_bar.dart @@ -329,7 +329,7 @@ class _FilterGridAppBarState _buildButtonIcon(context, actionDelegate, action, enabled: canApply(action)), ); - final animations = context.select((s) => s.accessibilityAnimations); + final animations = context.select((v) => v.accessibilityAnimations); return [ ...quickActionButtons, PopupMenuButton( diff --git a/lib/widgets/filter_grids/common/filter_grid_page.dart b/lib/widgets/filter_grids/common/filter_grid_page.dart index 9323ceb05..19769884e 100644 --- a/lib/widgets/filter_grids/common/filter_grid_page.dart +++ b/lib/widgets/filter_grids/common/filter_grid_page.dart @@ -286,7 +286,7 @@ class _FilterGridContentState extends State<_FilterG Widget build(BuildContext context) { final source = context.read(); final settingsRouteKey = context.read().settingsRouteKey; - final tileLayout = context.select((s) => s.getTileLayout(settingsRouteKey)); + final tileLayout = context.select((v) => v.getTileLayout(settingsRouteKey)); return Selector( selector: (context, query) => query.enabled, builder: (context, queryEnabled, child) { diff --git a/lib/widgets/navigation/nav_bar/nav_bar.dart b/lib/widgets/navigation/nav_bar/nav_bar.dart index 7e42b2fbe..87e9ea683 100644 --- a/lib/widgets/navigation/nav_bar/nav_bar.dart +++ b/lib/widgets/navigation/nav_bar/nav_bar.dart @@ -66,7 +66,7 @@ class _AppBottomNavBarState extends State { @override Widget build(BuildContext context) { - final showVideo = context.select((s) => !s.hiddenFilters.contains(MimeFilter.video)); + final showVideo = context.select((v) => !v.hiddenFilters.contains(MimeFilter.video)); final items = [ const AvesBottomNavItem(route: CollectionPage.routeName), diff --git a/lib/widgets/settings/privacy/file_picker/file_picker_page.dart b/lib/widgets/settings/privacy/file_picker/file_picker_page.dart index c9fa121e7..59a7b56cc 100644 --- a/lib/widgets/settings/privacy/file_picker/file_picker_page.dart +++ b/lib/widgets/settings/privacy/file_picker/file_picker_page.dart @@ -59,7 +59,7 @@ class _FilePickerPageState extends State { return !isHidden; } }).toList(); - final animations = context.select((s) => s.accessibilityAnimations); + final animations = context.select((v) => v.accessibilityAnimations); return PopScope( canPop: _directory.relativeDir.isEmpty, onPopInvokedWithResult: (didPop, result) { diff --git a/lib/widgets/settings/settings_mobile_page.dart b/lib/widgets/settings/settings_mobile_page.dart index ffb754546..664e1cfc4 100644 --- a/lib/widgets/settings/settings_mobile_page.dart +++ b/lib/widgets/settings/settings_mobile_page.dart @@ -46,7 +46,7 @@ class _SettingsMobilePageState extends State with FeedbackMi @override Widget build(BuildContext context) { - final animations = context.select((s) => s.accessibilityAnimations); + final animations = context.select((v) => v.accessibilityAnimations); return AvesScaffold( appBar: AppBar( title: InteractiveAppBarTitle( diff --git a/lib/widgets/settings/thumbnails/overlay.dart b/lib/widgets/settings/thumbnails/overlay.dart index 6a19793c1..108facaf2 100644 --- a/lib/widgets/settings/thumbnails/overlay.dart +++ b/lib/widgets/settings/thumbnails/overlay.dart @@ -143,7 +143,7 @@ class SettingsTileThumbnailLocationIcon extends SettingsTile { ); Widget _buildTrailing(BuildContext context) { - final iconType = context.select((s) => s.thumbnailLocationIcon); + final iconType = context.select((v) => v.thumbnailLocationIcon); return ThumbnailOverlayPage.buildTrailingIcon( context: context, key: iconType, @@ -168,7 +168,7 @@ class SettingsTileThumbnailTagIcon extends SettingsTile { ); Widget _buildTrailing(BuildContext context) { - final iconType = context.select((s) => s.thumbnailTagIcon); + final iconType = context.select((v) => v.thumbnailTagIcon); return ThumbnailOverlayPage.buildTrailingIcon( context: context, key: iconType, diff --git a/lib/widgets/viewer/info/info_app_bar.dart b/lib/widgets/viewer/info/info_app_bar.dart index 866b8f4cf..24f111962 100644 --- a/lib/widgets/viewer/info/info_app_bar.dart +++ b/lib/widgets/viewer/info/info_app_bar.dart @@ -50,7 +50,7 @@ class InfoAppBar extends StatelessWidget { final commonActions = EntryActions.commonMetadataActions.where(isVisible); final formatSpecificActions = EntryActions.formatSpecificMetadataActions.where(isVisible); final useTvLayout = settings.useTvLayout; - final animations = context.select((s) => s.accessibilityAnimations); + final animations = context.select((v) => v.accessibilityAnimations); return SliverAppBar( leading: useTvLayout ? null diff --git a/lib/widgets/viewer/overlay/viewer_buttons.dart b/lib/widgets/viewer/overlay/viewer_buttons.dart index 32e613aa3..4591d8ae4 100644 --- a/lib/widgets/viewer/overlay/viewer_buttons.dart +++ b/lib/widgets/viewer/overlay/viewer_buttons.dart @@ -252,7 +252,7 @@ class _ViewerButtonRowContentState extends State { final exportActions = widget.exportActions; final videoActions = widget.videoActions; final hasOverflowMenu = pageEntry.canRotate || pageEntry.canFlip || topLevelActions.isNotEmpty || exportActions.isNotEmpty || videoActions.isNotEmpty; - final animations = context.select((s) => s.accessibilityAnimations); + final animations = context.select((v) => v.accessibilityAnimations); return Selector( selector: (context, vc) => vc.getController(pageEntry), builder: (context, videoController, child) {