Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Hosted Weblate 2024-11-24 00:52:35 +01:00
commit 6cdf7ebbd4
No known key found for this signature in database
GPG key ID: A3FAAA06E6569B4C
18 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/widgets/collection/app_bar.dart
View file

@ -399,7 +399,7 @@ class _CollectionAppBarState extends State<CollectionAppBar> with SingleTickerPr
(action) => _buildButtonIcon(context, action, enabled: canApply(action), selection: selection),
);
final animations = context.select<Settings, AccessibilityAnimations>((s) => s.accessibilityAnimations);
final animations = context.select<Settings, AccessibilityAnimations>((v) => v.accessibilityAnimations);
return [
...quickActionButtons,
PopupMenuButton<EntrySetAction>(

4
lib/widgets/collection/collection_grid.dart
View file

@ -88,7 +88,7 @@ class _CollectionGridState extends State<CollectionGrid> {
@override
Widget build(BuildContext context) {
final spacing = context.select<Settings, double>((s) => s.getTileLayout(settingsRouteKey) == TileLayout.mosaic ? CollectionGrid.mosaicLayoutSpacing : CollectionGrid.fixedExtentLayoutSpacing);
final spacing = context.select<Settings, double>((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<ValueNotifier<AppMode>, bool>((v) => v.value.canSelectMedia);
final settingsRouteKey = context.read<TileExtentController>().settingsRouteKey;
final tileLayout = context.select<Settings, TileLayout>((s) => s.getTileLayout(settingsRouteKey));
final tileLayout = context.select<Settings, TileLayout>((v) => v.getTileLayout(settingsRouteKey));
return Consumer<CollectionLens>(
builder: (context, collection, child) {
final sectionedListLayoutProvider = ValueListenableBuilder<double>(

2
lib/widgets/common/basic/tv_edge_focus.dart
View file

@ -14,7 +14,7 @@ class TvEdgeFocus extends StatelessWidget {
@override
Widget build(BuildContext context) {
final useTvLayout = context.select<Settings, bool>((s) => s.useTvLayout);
final useTvLayout = context.select<Settings, bool>((v) => v.useTvLayout);
return useTvLayout
? Focus(
focusNode: focusNode,

2
lib/widgets/common/behaviour/pop/double_back.dart
View file

@ -20,7 +20,7 @@ class DoubleBackPopHandler extends PopHandler {
@override
bool canPop(BuildContext context) {
if (context.select<Settings, bool>((s) => !s.mustBackTwiceToExit)) return true;
if (context.select<Settings, bool>((v) => !v.mustBackTwiceToExit)) return true;
if (Navigator.canPop(context)) return true;
return false;
}

2
lib/widgets/common/behaviour/pop/tv_navigation.dart
View file

@ -20,7 +20,7 @@ class TvNavigationPopHandler implements PopHandler {
@override
bool canPop(BuildContext context) {
if (context.select<Settings, bool>((s) => !s.useTvLayout)) return true;
if (context.select<Settings, bool>((v) => !v.useTvLayout)) return true;
if (_isHome(context)) return true;
return false;
}

2
lib/widgets/common/identity/aves_app_bar.dart
View file

@ -260,7 +260,7 @@ class _AvesFloatingBarState extends State<AvesFloatingBar> with RouteAware {
return ValueListenableBuilder<bool>(
valueListenable: _isBlurAllowedNotifier,
builder: (context, isBlurAllowed, child) {
final blurred = isBlurAllowed && context.select<Settings, bool>((s) => s.enableBlurEffect);
final blurred = isBlurAllowed && context.select<Settings, bool>((v) => v.enableBlurEffect);
return Container(
foregroundDecoration: BoxDecoration(
border: Border.all(

2
lib/widgets/debug/app_debug_page.dart
View file

@ -37,7 +37,7 @@ class AppDebugPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final animations = context.select<Settings, AccessibilityAnimations>((s) => s.accessibilityAnimations);
final animations = context.select<Settings, AccessibilityAnimations>((v) => v.accessibilityAnimations);
return Directionality(
textDirection: TextDirection.ltr,
child: AvesScaffold(

2
lib/widgets/dialogs/entry_editors/rename_entry_set_page.dart
View file

@ -71,7 +71,7 @@ class _RenameEntrySetPageState extends State<RenameEntrySetPage> {
final l10n = context.l10n;
final textScaler = MediaQuery.textScalerOf(context);
final effectiveThumbnailExtent = max(thumbnailExtent, textScaler.scale(thumbnailExtent));
final animations = context.select<Settings, AccessibilityAnimations>((s) => s.accessibilityAnimations);
final animations = context.select<Settings, AccessibilityAnimations>((v) => v.accessibilityAnimations);
return AvesScaffold(
appBar: AppBar(
title: Text(l10n.renameEntrySetPageTitle),

2
lib/widgets/dialogs/pick_dialogs/album_pick_page.dart
View file

@ -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<Settings, AccessibilityAnimations>((s) => s.accessibilityAnimations);
final animations = context.select<Settings, AccessibilityAnimations>((v) => v.accessibilityAnimations);
return [
if (widget.moveType != null)
..._quickActions.where(isVisible).map(

2
lib/widgets/explorer/app_bar.dart
View file

@ -104,7 +104,7 @@ class _ExplorerAppBarState extends State<ExplorerAppBar> with WidgetsBindingObse
}
List<Widget> _buildActions(BuildContext context, double maxWidth) {
final animations = context.select<Settings, AccessibilityAnimations>((s) => s.accessibilityAnimations);
final animations = context.select<Settings, AccessibilityAnimations>((v) => v.accessibilityAnimations);
return [
IconButton(
icon: const Icon(AIcons.search),

2
lib/widgets/filter_grids/common/app_bar.dart
View file

@ -329,7 +329,7 @@ class _FilterGridAppBarState<T extends CollectionFilter, CSAD extends ChipSetAct
(action) => _buildButtonIcon(context, actionDelegate, action, enabled: canApply(action)),
);
final animations = context.select<Settings, AccessibilityAnimations>((s) => s.accessibilityAnimations);
final animations = context.select<Settings, AccessibilityAnimations>((v) => v.accessibilityAnimations);
return [
...quickActionButtons,
PopupMenuButton<ChipSetAction>(

2
lib/widgets/filter_grids/common/filter_grid_page.dart
View file

@ -286,7 +286,7 @@ class _FilterGridContentState<T extends CollectionFilter> extends State<_FilterG
Widget build(BuildContext context) {
final source = context.read<CollectionSource>();
final settingsRouteKey = context.read<TileExtentController>().settingsRouteKey;
final tileLayout = context.select<Settings, TileLayout>((s) => s.getTileLayout(settingsRouteKey));
final tileLayout = context.select<Settings, TileLayout>((v) => v.getTileLayout(settingsRouteKey));
return Selector<Query, bool>(
selector: (context, query) => query.enabled,
builder: (context, queryEnabled, child) {

2
lib/widgets/navigation/nav_bar/nav_bar.dart
View file

@ -66,7 +66,7 @@ class _AppBottomNavBarState extends State<AppBottomNavBar> {
@override
Widget build(BuildContext context) {
final showVideo = context.select<Settings, bool>((s) => !s.hiddenFilters.contains(MimeFilter.video));
final showVideo = context.select<Settings, bool>((v) => !v.hiddenFilters.contains(MimeFilter.video));
final items = [
const AvesBottomNavItem(route: CollectionPage.routeName),

2
lib/widgets/settings/privacy/file_picker/file_picker_page.dart
View file

@ -59,7 +59,7 @@ class _FilePickerPageState extends State<FilePickerPage> {
return !isHidden;
}
}).toList();
final animations = context.select<Settings, AccessibilityAnimations>((s) => s.accessibilityAnimations);
final animations = context.select<Settings, AccessibilityAnimations>((v) => v.accessibilityAnimations);
return PopScope(
canPop: _directory.relativeDir.isEmpty,
onPopInvokedWithResult: (didPop, result) {

2
lib/widgets/settings/settings_mobile_page.dart
View file

@ -46,7 +46,7 @@ class _SettingsMobilePageState extends State<SettingsMobilePage> with FeedbackMi
@override
Widget build(BuildContext context) {
final animations = context.select<Settings, AccessibilityAnimations>((s) => s.accessibilityAnimations);
final animations = context.select<Settings, AccessibilityAnimations>((v) => v.accessibilityAnimations);
return AvesScaffold(
appBar: AppBar(
title: InteractiveAppBarTitle(

4
lib/widgets/settings/thumbnails/overlay.dart
View file

@ -143,7 +143,7 @@ class SettingsTileThumbnailLocationIcon extends SettingsTile {
);
Widget _buildTrailing(BuildContext context) {
final iconType = context.select<Settings, ThumbnailOverlayLocationIcon>((s) => s.thumbnailLocationIcon);
final iconType = context.select<Settings, ThumbnailOverlayLocationIcon>((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<Settings, ThumbnailOverlayTagIcon>((s) => s.thumbnailTagIcon);
final iconType = context.select<Settings, ThumbnailOverlayTagIcon>((v) => v.thumbnailTagIcon);
return ThumbnailOverlayPage.buildTrailingIcon(
context: context,
key: iconType,

2
lib/widgets/viewer/info/info_app_bar.dart
View file

@ -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<Settings, AccessibilityAnimations>((s) => s.accessibilityAnimations);
final animations = context.select<Settings, AccessibilityAnimations>((v) => v.accessibilityAnimations);
return SliverAppBar(
leading: useTvLayout
? null

2
lib/widgets/viewer/overlay/viewer_buttons.dart
View file

@ -252,7 +252,7 @@ class _ViewerButtonRowContentState extends State<ViewerButtonRowContent> {
final exportActions = widget.exportActions;
final videoActions = widget.videoActions;
final hasOverflowMenu = pageEntry.canRotate || pageEntry.canFlip || topLevelActions.isNotEmpty || exportActions.isNotEmpty || videoActions.isNotEmpty;
final animations = context.select<Settings, AccessibilityAnimations>((s) => s.accessibilityAnimations);
final animations = context.select<Settings, AccessibilityAnimations>((v) => v.accessibilityAnimations);
return Selector<VideoConductor, AvesVideoController?>(
selector: (context, vc) => vc.getController(pageEntry),
builder: (context, videoController, child) {