Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor fixes

Browse source
This commit is contained in:
Thibault Deckers 2019-08-10 15:41:17 +09:00
parent ea765fbdc9
commit b29b2ed219
4 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/model/image_entry.dart
View file

@ -91,7 +91,7 @@ class ImageEntry with ChangeNotifier {
int get megaPixels => (width * height / 1000000).round(); int get megaPixels => (width * height / 1000000).round();
DateTime get bestDate { DateTime get bestDate {
if (isCataloged && catalogMetadata.dateMillis > 0) return DateTime.fromMillisecondsSinceEpoch(catalogMetadata.dateMillis); if ((catalogMetadata?.dateMillis ?? 0) > 0) return DateTime.fromMillisecondsSinceEpoch(catalogMetadata.dateMillis);
if (sourceDateTakenMillis != null && sourceDateTakenMillis > 0) return DateTime.fromMillisecondsSinceEpoch(sourceDateTakenMillis); if (sourceDateTakenMillis != null && sourceDateTakenMillis > 0) return DateTime.fromMillisecondsSinceEpoch(sourceDateTakenMillis);
if (dateModifiedSecs != null && dateModifiedSecs > 0) return DateTime.fromMillisecondsSinceEpoch(dateModifiedSecs * 1000); if (dateModifiedSecs != null && dateModifiedSecs > 0) return DateTime.fromMillisecondsSinceEpoch(dateModifiedSecs * 1000);
return null; return null;

6
lib/widgets/album/thumbnail.dart
View file

@ -104,9 +104,9 @@ class ThumbnailState extends State<Thumbnail> {
iconSize: iconSize, iconSize: iconSize,
) )
else if (entry.isGif) else if (entry.isGif)
GifTag( GifTag(iconSize: iconSize)
iconSize: iconSize, else if (entry.hasGps)
), GpsTag(iconSize: iconSize)
], ],
); );
}), }),

14
lib/widgets/album/thumbnail_tags.dart
View file

@ -31,6 +31,20 @@ class GifTag extends StatelessWidget {
} }
} }
class GpsTag extends StatelessWidget {
final double iconSize;
const GpsTag({Key key, this.iconSize}) : super(key: key);
@override
Widget build(BuildContext context) {
return Tag(
icon: Icons.place,
iconSize: iconSize,
);
}
}
class Tag extends StatelessWidget { class Tag extends StatelessWidget {
final IconData icon; final IconData icon;
final double iconSize; final double iconSize;

14
lib/widgets/fullscreen/image_page.dart
View file

@ -47,11 +47,17 @@ class FullscreenPageState extends State<FullscreenPage> with SingleTickerProvide
_horizontalPager = PageController(initialPage: _currentHorizontalPage); _horizontalPager = PageController(initialPage: _currentHorizontalPage);
_verticalPager = PageController(initialPage: _currentVerticalPage); _verticalPager = PageController(initialPage: _currentVerticalPage);
_overlayAnimationController = AnimationController( _overlayAnimationController = AnimationController(
duration: Duration(milliseconds: 300), duration: Duration(milliseconds: 400),
vsync: this, vsync: this,
); );
_topOverlayScale = CurvedAnimation(parent: _overlayAnimationController, curve: Curves.easeOutQuart, reverseCurve: Curves.easeInQuart); _topOverlayScale = CurvedAnimation(
_bottomOverlayOffset = Tween(begin: Offset(0, 1), end: Offset(0, 0)).animate(CurvedAnimation(parent: _overlayAnimationController, curve: Curves.easeOutQuart, reverseCurve: Curves.easeInQuart)); parent: _overlayAnimationController,
curve: Curves.easeOutQuart,
);
_bottomOverlayOffset = Tween(begin: Offset(0, 1), end: Offset(0, 0)).animate(CurvedAnimation(
parent: _overlayAnimationController,
curve: Curves.easeOutQuart,
));
_overlayVisible.addListener(onOverlayVisibleChange); _overlayVisible.addListener(onOverlayVisibleChange);
Screen.keepOn(true); Screen.keepOn(true);
@ -101,7 +107,7 @@ class FullscreenPageState extends State<FullscreenPage> with SingleTickerProvide
if (notification is BackUpNotification) { if (notification is BackUpNotification) {
_verticalPager.animateToPage( _verticalPager.animateToPage(
0, 0,
duration: const Duration(milliseconds: 400), duration: const Duration(milliseconds: 350),
curve: Curves.easeInOut, curve: Curves.easeInOut,
); );
} }