beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into rewrite_device_sync

Browse source
This commit is contained in:
ashilkn 2022-09-16 15:58:33 +05:30
parent 611341f9c5 858aeee515
commit cbd1ff0a52
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ui/collections_gallery_widget.dart
View file

@ -2,6 +2,7 @@
import 'dart:async';
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:logging/logging.dart';
import 'package:photos/core/configuration.dart';
@ -96,8 +97,10 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
return 1;
}
if (sortKey == AlbumSortKey.albumName) {
// alphabetical ASC order
return first.collection.name.compareTo(second.collection.name);
return compareAsciiLowerCaseNatural(
first.collection.name,
second.collection.name,
);
} else if (sortKey == AlbumSortKey.newestPhoto) {
return second.thumbnail.creationTime
.compareTo(first.thumbnail.creationTime);

7
lib/ui/create_collection_page.dart
View file

@ -1,5 +1,6 @@
// @dart=2.9
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:logging/logging.dart';
import 'package:photos/core/configuration.dart';
@ -198,8 +199,10 @@ class _CreateCollectionPageState extends State<CreateCollectionPage> {
}
}
collectionsWithThumbnail.sort((first, second) {
return (first.collection.name ?? "")
.compareTo((second.collection.name ?? ""));
return compareAsciiLowerCaseNatural(
first.collection.name ?? "",
second.collection.name ?? "",
);
});
return collectionsWithThumbnail;
}