From 237d1c1bf4544e557b7b78474b31a3c2d2c625a8 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 25 Oct 2023 16:56:31 -0500 Subject: [PATCH] fix(mobile): incorrect date range (#4644) * fix(mobile): incorrect date range * remove comment * pr feedback --- .../album/views/album_viewer_page.dart | 9 +++++++-- mobile/lib/shared/models/album.dart | 6 ++++++ mobile/lib/shared/models/album.g.dart | Bin 43044 -> 49526 bytes 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mobile/lib/modules/album/views/album_viewer_page.dart b/mobile/lib/modules/album/views/album_viewer_page.dart index 23358f335..a0ae8a213 100644 --- a/mobile/lib/modules/album/views/album_viewer_page.dart +++ b/mobile/lib/modules/album/views/album_viewer_page.dart @@ -164,8 +164,13 @@ class AlbumViewerPage extends HookConsumerWidget { } Widget buildAlbumDateRange(Album album) { - final DateTime startDate = album.assets.first.fileCreatedAt; - final DateTime endDate = album.assets.last.fileCreatedAt; //Need default. + final DateTime? startDate = album.startDate; + final DateTime? endDate = album.endDate; + + if (startDate == null || endDate == null) { + return const SizedBox(); + } + final String startDateText = (startDate.year == endDate.year ? DateFormat.MMMd() : DateFormat.yMMMd()) diff --git a/mobile/lib/shared/models/album.dart b/mobile/lib/shared/models/album.dart index 94afe1d76..f338abca3 100644 --- a/mobile/lib/shared/models/album.dart +++ b/mobile/lib/shared/models/album.dart @@ -18,6 +18,8 @@ class Album { required this.name, required this.createdAt, required this.modifiedAt, + this.startDate, + this.endDate, this.lastModifiedAssetTimestamp, required this.shared, }); @@ -30,6 +32,8 @@ class Album { String name; DateTime createdAt; DateTime modifiedAt; + DateTime? startDate; + DateTime? endDate; DateTime? lastModifiedAssetTimestamp; bool shared; final IsarLink owner = IsarLink(); @@ -144,6 +148,8 @@ class Album { modifiedAt: dto.updatedAt, lastModifiedAssetTimestamp: dto.lastModifiedAssetTimestamp, shared: dto.shared, + startDate: dto.startDate, + endDate: dto.endDate, ); a.owner.value = await db.users.getById(dto.ownerId); if (dto.albumThumbnailAssetId != null) { diff --git a/mobile/lib/shared/models/album.g.dart b/mobile/lib/shared/models/album.g.dart index 63f71f380f1a2fe1764f2da292893fa018d7e74c..9cdb59a5e8e2bae5385479c8ce82271e1117a2c0 100644 GIT binary patch delta 1193 zcmaJ=OH30{6wOFG{Umleoe4!+VEm<@)C#4wrGSA5#we*JBtWbzMmvTOz@%+-p(Vxz zxFBjdiHNa@0mIs462rn6HpJ)(w=R^0Cb}W0iHRHIn@(pO33N91-8uK2bMAfbJ>NX= z>u%kPpvfXlXZys0v_LmCw1w^Y5$HknKRd?|T!+*^KXy=AT zo)lo^1WP{CHWmokasPBPzBrGeleNLc28di2+e+l7Sid62Mu^;7*3ZY4YGqcsb(N?t zpGn9+*enH(^Whff1;Zc58i^T}fuD2XCwBxNxI>8Y6^zX3Hs?W_Z@@|3OeIKm6dtZo z9_RnGXorJ~Qb}Jw8%*iz_sK(?uT-Jkb^2HWa!ru!jw zCKCIV_Elo=8!}?fkP+L4?0-zPZq7x_Tkg1#bF%I$(Av>gH3P}58LGKdQPAs{>cjL+?!{y8*xm2=qxo^Nmk8(qbzT-Q5HyR`QOHlqN=+`&E6zwPN==#UC3tkQvyk0nDy@C1+q;h^9dUPbvg=bFq&;%Ae_QDNlbOJwy4bH4pGI)IifO?#MmaE7L}a5QdDWO zuc-XwCqStfVeZL3V!WH@i2ak_{Lgledis_u2 d|8LS|+