overlay: responsive layout

This commit is contained in:
Thibault Deckers 2020-03-31 14:14:15 +09:00
parent c470d030be
commit dd4ac33b6d

View file

@ -1,3 +1,5 @@
import 'dart:math';
import 'package:aves/model/image_entry.dart'; import 'package:aves/model/image_entry.dart';
import 'package:aves/widgets/common/fx/sweeper.dart'; import 'package:aves/widgets/common/fx/sweeper.dart';
import 'package:aves/widgets/common/menu_row.dart'; import 'package:aves/widgets/common/menu_row.dart';
@ -6,6 +8,7 @@ import 'package:aves/widgets/fullscreen/overlay/common.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:outline_material_icons/outline_material_icons.dart'; import 'package:outline_material_icons/outline_material_icons.dart';
import 'package:provider/provider.dart';
class FullscreenTopOverlay extends StatelessWidget { class FullscreenTopOverlay extends StatelessWidget {
final List<ImageEntry> entries; final List<ImageEntry> entries;
@ -17,6 +20,8 @@ class FullscreenTopOverlay extends StatelessWidget {
ImageEntry get entry => entries[index]; ImageEntry get entry => entries[index];
static const double padding = 8;
const FullscreenTopOverlay({ const FullscreenTopOverlay({
Key key, Key key,
@required this.entries, @required this.entries,
@ -30,15 +35,26 @@ class FullscreenTopOverlay extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// TODO TLAD adapt count according to available width and portrait/landscape return SafeArea(
const recentActionCount = 3; minimum: (viewInsets ?? EdgeInsets.zero) + (viewPadding ?? EdgeInsets.zero),
child: Padding(
padding: const EdgeInsets.all(padding),
child: Selector<MediaQueryData, Orientation>(
selector: (c, mq) => mq.orientation,
builder: (c, orientation, child) {
final targetCount = orientation == Orientation.landscape ? 3 : 2;
return LayoutBuilder(
builder: (context, constraints) {
final availableCount = (constraints.maxWidth / (kMinInteractiveDimension + padding)).floor() - 2;
final recentActionCount = min(targetCount, availableCount);
final recentActions = [ final recentActions = [
FullscreenAction.toggleFavourite, FullscreenAction.toggleFavourite,
FullscreenAction.share, FullscreenAction.share,
FullscreenAction.delete, FullscreenAction.delete,
FullscreenAction.info, FullscreenAction.info,
FullscreenAction.rename, FullscreenAction.rename,
].take(recentActionCount).where(_canDo); ].where(_canDo).take(recentActionCount);
final inAppActions = [ final inAppActions = [
FullscreenAction.info, FullscreenAction.info,
FullscreenAction.toggleFavourite, FullscreenAction.toggleFavourite,
@ -56,11 +72,7 @@ class FullscreenTopOverlay extends StatelessWidget {
FullscreenAction.openMap, FullscreenAction.openMap,
].where(_canDo); ].where(_canDo);
return SafeArea( return Row(
minimum: (viewInsets ?? EdgeInsets.zero) + (viewPadding ?? EdgeInsets.zero),
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
children: [ children: [
OverlayButton( OverlayButton(
scale: scale, scale: scale,
@ -80,6 +92,10 @@ class FullscreenTopOverlay extends StatelessWidget {
), ),
), ),
], ],
);
},
);
},
), ),
), ),
); );
@ -171,7 +187,7 @@ class FullscreenTopOverlay extends StatelessWidget {
} }
return child != null return child != null
? Padding( ? Padding(
padding: const EdgeInsetsDirectional.only(end: 8), padding: const EdgeInsetsDirectional.only(end: padding),
child: OverlayButton( child: OverlayButton(
scale: scale, scale: scale,
child: child, child: child,