From f78b466229d1ca3cb2d8403766a78f9d8583bc7d Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Wed, 23 Sep 2020 11:54:37 +0900 Subject: [PATCH] minor hashcode changes --- lib/model/filters/album.dart | 2 +- lib/model/filters/favourite.dart | 2 +- lib/model/filters/location.dart | 4 ++-- lib/model/filters/mime.dart | 2 +- lib/model/filters/query.dart | 2 +- lib/model/filters/tag.dart | 2 +- lib/services/image_file_service.dart | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/model/filters/album.dart b/lib/model/filters/album.dart index 5a1f454ca..2c64b5985 100644 --- a/lib/model/filters/album.dart +++ b/lib/model/filters/album.dart @@ -83,7 +83,7 @@ class AlbumFilter extends CollectionFilter { } @override - int get hashCode => hashValues('AlbumFilter', album); + int get hashCode => hashValues(type, album); @override String toString() { diff --git a/lib/model/filters/favourite.dart b/lib/model/filters/favourite.dart index fb703e733..cee2aff50 100644 --- a/lib/model/filters/favourite.dart +++ b/lib/model/filters/favourite.dart @@ -31,5 +31,5 @@ class FavouriteFilter extends CollectionFilter { } @override - int get hashCode => 'FavouriteFilter'.hashCode; + int get hashCode => type.hashCode; } diff --git a/lib/model/filters/location.dart b/lib/model/filters/location.dart index 74ea8d1e8..83f8b60c0 100644 --- a/lib/model/filters/location.dart +++ b/lib/model/filters/location.dart @@ -4,7 +4,7 @@ import 'package:aves/widgets/common/icons.dart'; import 'package:flutter/widgets.dart'; class LocationFilter extends CollectionFilter { - static const type = 'country'; + static const type = 'location'; static const locationSeparator = ';'; final LocationLevel level; @@ -57,7 +57,7 @@ class LocationFilter extends CollectionFilter { } @override - int get hashCode => hashValues('LocationFilter', level, _location); + int get hashCode => hashValues(type, level, _location); @override String toString() { diff --git a/lib/model/filters/mime.dart b/lib/model/filters/mime.dart index cd1000439..3ed29003a 100644 --- a/lib/model/filters/mime.dart +++ b/lib/model/filters/mime.dart @@ -80,5 +80,5 @@ class MimeFilter extends CollectionFilter { } @override - int get hashCode => hashValues('MimeFilter', mime); + int get hashCode => hashValues(type, mime); } diff --git a/lib/model/filters/query.dart b/lib/model/filters/query.dart index 78937d159..00ac31fde 100644 --- a/lib/model/filters/query.dart +++ b/lib/model/filters/query.dart @@ -68,5 +68,5 @@ class QueryFilter extends CollectionFilter { } @override - int get hashCode => hashValues('QueryFilter', query); + int get hashCode => hashValues(type, query); } diff --git a/lib/model/filters/tag.dart b/lib/model/filters/tag.dart index 96bab615a..d75b67da2 100644 --- a/lib/model/filters/tag.dart +++ b/lib/model/filters/tag.dart @@ -43,7 +43,7 @@ class TagFilter extends CollectionFilter { } @override - int get hashCode => hashValues('TagFilter', tag); + int get hashCode => hashValues(type, tag); @override String toString() { diff --git a/lib/services/image_file_service.dart b/lib/services/image_file_service.dart index 684026a30..8011b97da 100644 --- a/lib/services/image_file_service.dart +++ b/lib/services/image_file_service.dart @@ -233,7 +233,7 @@ class ImageOpEvent { } @override - int get hashCode => hashValues('ImageOpEvent', success, uri); + int get hashCode => hashValues(success, uri); @override String toString() {