From b4d9863dda50e05e97ac37ce7ee16e19641e6ac8 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Sat, 14 Sep 2019 23:33:26 +0900 Subject: [PATCH] minor fixes --- lib/widgets/fullscreen/info/basic_section.dart | 4 ++-- lib/widgets/fullscreen/overlay_bottom.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/widgets/fullscreen/info/basic_section.dart b/lib/widgets/fullscreen/info/basic_section.dart index b91fb4dee..d6bb14565 100644 --- a/lib/widgets/fullscreen/info/basic_section.dart +++ b/lib/widgets/fullscreen/info/basic_section.dart @@ -15,8 +15,8 @@ class BasicSection extends StatelessWidget { @override Widget build(BuildContext context) { final date = entry.bestDate; - final dateText = '${DateFormat.yMMMd().format(date)} – ${DateFormat.Hm().format(date)}'; - final resolutionText = '${entry.width} × ${entry.height}${entry.isVideo ? '' : ' (${entry.megaPixels} MP)'}'; + final dateText = '${DateFormat.yMMMd().format(date)} at ${DateFormat.Hm().format(date)}'; + final resolutionText = '${entry.width} × ${entry.height}${(entry.isVideo || entry.isGif) ? '' : ' (${entry.megaPixels} MP)'}'; return Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/widgets/fullscreen/overlay_bottom.dart b/lib/widgets/fullscreen/overlay_bottom.dart index 11e18c8a3..60e9c3203 100644 --- a/lib/widgets/fullscreen/overlay_bottom.dart +++ b/lib/widgets/fullscreen/overlay_bottom.dart @@ -180,7 +180,7 @@ class _FullscreenBottomOverlayContent extends StatelessWidget { children: [ Icon(Icons.calendar_today, size: iconSize), SizedBox(width: iconPadding), - Expanded(flex: 3, child: Text('${DateFormat.yMMMd().format(date)} – ${DateFormat.Hm().format(date)}')), + Expanded(flex: 3, child: Text('${DateFormat.yMMMd().format(date)} at ${DateFormat.Hm().format(date)}')), Expanded(flex: 2, child: Text('${entry.width} × ${entry.height}')), ], );