Merge branch 'rewrite_device_sync' into daySearch
This commit is contained in:
commit
07e2c34acf
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:collection/collection.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:logging/logging.dart';
|
import 'package:logging/logging.dart';
|
||||||
import 'package:photos/core/configuration.dart';
|
import 'package:photos/core/configuration.dart';
|
||||||
|
@ -96,8 +97,10 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (sortKey == AlbumSortKey.albumName) {
|
if (sortKey == AlbumSortKey.albumName) {
|
||||||
// alphabetical ASC order
|
return compareAsciiLowerCaseNatural(
|
||||||
return first.collection.name.compareTo(second.collection.name);
|
first.collection.name,
|
||||||
|
second.collection.name,
|
||||||
|
);
|
||||||
} else if (sortKey == AlbumSortKey.newestPhoto) {
|
} else if (sortKey == AlbumSortKey.newestPhoto) {
|
||||||
return second.thumbnail.creationTime
|
return second.thumbnail.creationTime
|
||||||
.compareTo(first.thumbnail.creationTime);
|
.compareTo(first.thumbnail.creationTime);
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
// @dart=2.9
|
// @dart=2.9
|
||||||
|
|
||||||
|
import 'package:collection/collection.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:logging/logging.dart';
|
import 'package:logging/logging.dart';
|
||||||
import 'package:photos/core/configuration.dart';
|
import 'package:photos/core/configuration.dart';
|
||||||
|
@ -198,8 +199,10 @@ class _CreateCollectionPageState extends State<CreateCollectionPage> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
collectionsWithThumbnail.sort((first, second) {
|
collectionsWithThumbnail.sort((first, second) {
|
||||||
return (first.collection.name ?? "")
|
return compareAsciiLowerCaseNatural(
|
||||||
.compareTo((second.collection.name ?? ""));
|
first.collection.name ?? "",
|
||||||
|
second.collection.name ?? "",
|
||||||
|
);
|
||||||
});
|
});
|
||||||
return collectionsWithThumbnail;
|
return collectionsWithThumbnail;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue