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

fullscreen: fixed overlay layout

Browse source
This commit is contained in:
Thibault Deckers 2019-07-28 15:28:36 +09:00
parent 345fc71ceb
commit 801dd7c8da
1 changed files with 81 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
lib/image_fullscreen_overlay.dart
View file

@ -72,6 +72,7 @@ class FullscreenBottomOverlay extends StatefulWidget {
class _FullscreenBottomOverlayState extends State<FullscreenBottomOverlay> { class _FullscreenBottomOverlayState extends State<FullscreenBottomOverlay> {
Future<Map> _detailLoader; Future<Map> _detailLoader;
ImageEntry _lastEntry;
Map _lastDetails; Map _lastDetails;
ImageEntry get entry => widget.entries[widget.index]; ImageEntry get entry => widget.entries[widget.index];
@ -97,8 +98,6 @@ class _FullscreenBottomOverlayState extends State<FullscreenBottomOverlay> {
final innerPadding = EdgeInsets.all(8.0); final innerPadding = EdgeInsets.all(8.0);
final mediaQuery = MediaQuery.of(context); final mediaQuery = MediaQuery.of(context);
final overlayContentMaxWidth = mediaQuery.size.width - mediaQuery.viewPadding.horizontal - innerPadding.horizontal; final overlayContentMaxWidth = mediaQuery.size.width - mediaQuery.viewPadding.horizontal - innerPadding.horizontal;
final date = entry.getBestDate();
final subRowWidth = min(400.0, overlayContentMaxWidth);
return Blurred( return Blurred(
child: IgnorePointer( child: IgnorePointer(
child: Padding( child: Padding(
@ -106,64 +105,21 @@ class _FullscreenBottomOverlayState extends State<FullscreenBottomOverlay> {
child: Container( child: Container(
padding: innerPadding, padding: innerPadding,
color: kOverlayBackground, color: kOverlayBackground,
child: DefaultTextStyle( child: FutureBuilder(
style: TextStyle( future: _detailLoader,
shadows: [ builder: (futureContext, AsyncSnapshot<Map> snapshot) {
Shadow( if (snapshot.connectionState == ConnectionState.done && !snapshot.hasError) {
color: Colors.black87, _lastDetails = snapshot.data;
offset: Offset(0.0, 1.0), _lastEntry = entry;
) }
], return _lastEntry == null
), ? SizedBox.shrink()
child: Column( : _FullscreenBottomOverlayContent(
mainAxisSize: MainAxisSize.min, entry: _lastEntry,
crossAxisAlignment: CrossAxisAlignment.start, details: _lastDetails,
children: [ maxWidth: overlayContentMaxWidth,
SizedBox( );
width: overlayContentMaxWidth, },
child: Text(
entry.title,
overflow: TextOverflow.ellipsis,
),
),
SizedBox(height: 4),
SizedBox(
width: subRowWidth,
child: Row(
children: [
Icon(Icons.calendar_today, size: 16),
SizedBox(width: 8),
Expanded(child: Text('${DateFormat.yMMMd().format(date)} – ${DateFormat.Hm().format(date)}')),
Expanded(child: Text('${entry.width} × ${entry.height}')),
],
),
),
SizedBox(height: 4),
FutureBuilder(
future: _detailLoader,
builder: (futureContext, AsyncSnapshot<Map> snapshot) {
if (snapshot.connectionState == ConnectionState.done && !snapshot.hasError) {
_lastDetails = snapshot.data;
}
return (_lastDetails == null || _lastDetails.isEmpty)
? SizedBox.shrink()
: SizedBox(
width: subRowWidth,
child: Row(
children: [
Icon(Icons.camera, size: 16),
SizedBox(width: 8),
Expanded(child: Text((_lastDetails['aperture'] as String).replaceAll('f', 'ƒ'))),
Expanded(child: Text(_lastDetails['exposureTime'])),
Expanded(child: Text(_lastDetails['focalLength'])),
Expanded(child: Text(_lastDetails['iso'])),
],
),
);
},
)
],
),
), ),
), ),
), ),
@ -171,3 +127,68 @@ class _FullscreenBottomOverlayState extends State<FullscreenBottomOverlay> {
); );
} }
} }
class _FullscreenBottomOverlayContent extends StatelessWidget {
final ImageEntry entry;
final Map details;
final double maxWidth;
_FullscreenBottomOverlayContent({this.entry, this.details, this.maxWidth});
@override
Widget build(BuildContext context) {
final subRowWidth = min(400.0, maxWidth);
final date = entry.getBestDate();
return DefaultTextStyle(
style: TextStyle(
shadows: [
Shadow(
color: Colors.black87,
offset: Offset(0.0, 1.0),
)
],
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
width: maxWidth,
child: Text(
entry.title,
overflow: TextOverflow.ellipsis,
),
),
SizedBox(height: 4),
SizedBox(
width: subRowWidth,
child: Row(
children: [
Icon(Icons.calendar_today, size: 16),
SizedBox(width: 8),
Expanded(child: Text('${DateFormat.yMMMd().format(date)} – ${DateFormat.Hm().format(date)}')),
Expanded(child: Text('${entry.width} × ${entry.height}')),
],
),
),
if (details != null && details.isNotEmpty) ...[
SizedBox(height: 4),
SizedBox(
width: subRowWidth,
child: Row(
children: [
Icon(Icons.camera, size: 16),
SizedBox(width: 8),
Expanded(child: Text((details['aperture'] as String).replaceAll('f', 'ƒ'))),
Expanded(child: Text(details['exposureTime'])),
Expanded(child: Text(details['focalLength'])),
Expanded(child: Text(details['iso'])),
],
),
),
],
],
),
);
}
}