From 319fd9584b9ff9c015cc33fbd67d28909986061e Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Fri, 5 Feb 2021 12:24:07 +0900 Subject: [PATCH] minor change --- lib/model/source/collection_lens.dart | 9 +++++---- lib/widgets/drawer/collection_tile.dart | 3 --- lib/widgets/filter_grids/common/filter_nav_page.dart | 3 --- lib/widgets/home_page.dart | 2 -- lib/widgets/search/search_delegate.dart | 2 -- lib/widgets/stats/stats.dart | 5 +---- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/lib/model/source/collection_lens.dart b/lib/model/source/collection_lens.dart index 93d49148a..ec7d3702a 100644 --- a/lib/model/source/collection_lens.dart +++ b/lib/model/source/collection_lens.dart @@ -5,6 +5,7 @@ import 'package:aves/model/entry.dart'; import 'package:aves/model/filters/album.dart'; import 'package:aves/model/filters/filters.dart'; import 'package:aves/model/filters/location.dart'; +import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/model/source/location.dart'; import 'package:aves/model/source/section_keys.dart'; @@ -32,13 +33,13 @@ class CollectionLens with ChangeNotifier, CollectionActivityMixin, CollectionSel CollectionLens({ @required this.source, Iterable filters, - @required EntryGroupFactor groupFactor, - @required EntrySortFactor sortFactor, + EntryGroupFactor groupFactor, + EntrySortFactor sortFactor, this.id, this.listenToSource = true, }) : filters = {if (filters != null) ...filters.where((f) => f != null)}, - groupFactor = groupFactor ?? EntryGroupFactor.month, - sortFactor = sortFactor ?? EntrySortFactor.date { + groupFactor = groupFactor ?? settings.collectionGroupFactor, + sortFactor = sortFactor ?? settings.collectionSortFactor { id ??= hashCode; if (listenToSource) { _subscriptions.add(source.eventBus.on().listen((e) => _refresh())); diff --git a/lib/widgets/drawer/collection_tile.dart b/lib/widgets/drawer/collection_tile.dart index e255a8059..61c2ad3bd 100644 --- a/lib/widgets/drawer/collection_tile.dart +++ b/lib/widgets/drawer/collection_tile.dart @@ -1,5 +1,4 @@ import 'package:aves/model/filters/filters.dart'; -import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/widgets/collection/collection_page.dart'; @@ -47,8 +46,6 @@ class CollectionNavTile extends StatelessWidget { builder: (context) => CollectionPage(CollectionLens( source: source, filters: [filter], - groupFactor: settings.collectionGroupFactor, - sortFactor: settings.collectionSortFactor, )), ), (route) => false, diff --git a/lib/widgets/filter_grids/common/filter_nav_page.dart b/lib/widgets/filter_grids/common/filter_nav_page.dart index 64f3a5656..326ec83af 100644 --- a/lib/widgets/filter_grids/common/filter_nav_page.dart +++ b/lib/widgets/filter_grids/common/filter_nav_page.dart @@ -3,7 +3,6 @@ import 'dart:ui'; import 'package:aves/main.dart'; import 'package:aves/model/actions/chip_actions.dart'; import 'package:aves/model/filters/filters.dart'; -import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/model/source/enums.dart'; @@ -78,8 +77,6 @@ class FilterNavigationPage extends StatelessWidget { builder: (context) => CollectionPage(CollectionLens( source: source, filters: [filter], - groupFactor: settings.collectionGroupFactor, - sortFactor: settings.collectionSortFactor, )), ), ), diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart index 1a0374e18..d4d5718a0 100644 --- a/lib/widgets/home_page.dart +++ b/lib/widgets/home_page.dart @@ -161,8 +161,6 @@ class _HomePageState extends State { CollectionLens( source: source, filters: filters, - groupFactor: settings.collectionGroupFactor, - sortFactor: settings.collectionSortFactor, ), ), ); diff --git a/lib/widgets/search/search_delegate.dart b/lib/widgets/search/search_delegate.dart index f1d008e86..446672b87 100644 --- a/lib/widgets/search/search_delegate.dart +++ b/lib/widgets/search/search_delegate.dart @@ -219,8 +219,6 @@ class CollectionSearchDelegate { builder: (context) => CollectionPage(CollectionLens( source: source, filters: [filter], - groupFactor: settings.collectionGroupFactor, - sortFactor: settings.collectionSortFactor, )), ), (route) => false, diff --git a/lib/widgets/stats/stats.dart b/lib/widgets/stats/stats.dart index 0292f1a0a..a11c82b21 100644 --- a/lib/widgets/stats/stats.dart +++ b/lib/widgets/stats/stats.dart @@ -1,11 +1,10 @@ import 'dart:math'; +import 'package:aves/model/entry.dart'; import 'package:aves/model/filters/filters.dart'; import 'package:aves/model/filters/location.dart'; import 'package:aves/model/filters/mime.dart'; import 'package:aves/model/filters/tag.dart'; -import 'package:aves/model/entry.dart'; -import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/theme/icons.dart'; @@ -273,8 +272,6 @@ class StatsPage extends StatelessWidget { builder: (context) => CollectionPage(CollectionLens( source: source, filters: [filter], - groupFactor: settings.collectionGroupFactor, - sortFactor: settings.collectionSortFactor, )), ), (route) => false,