KazukyAkayashi/m3_lightmeter
KazukyAkayashi/m3_lightmeter
1
0
Fork 0
mirror of https://github.com/vodemn/m3_lightmeter.git synced 2024-11-22 07:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Open AnimatedDialog with Navigator

Browse source
This commit is contained in:
Vadim 2022-12-11 19:19:38 +03:00
parent 9abad012e3
commit 7018f06270
3 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/screens/metering/components/bottom_controls/bottom_controls.dart
View file

@ -28,7 +28,7 @@ class MeteringBottomControls extends StatelessWidget {
child: SafeArea(
top: false,
child: Padding(
padding: const EdgeInsets.symmetric(vertical: Dimens.paddingM),
padding: const EdgeInsets.symmetric(vertical: Dimens.paddingL),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [

4
lib/screens/metering/components/topbar/components/reading_container.dart
View file

@ -51,10 +51,10 @@ class _ReadingValueBuilder extends StatelessWidget {
reading.label,
style: textTheme.labelMedium?.copyWith(color: Theme.of(context).colorScheme.onPrimaryContainer),
),
const SizedBox(height: Dimens.grid8),
const SizedBox(height: Dimens.grid4),
Text(
reading.value,
style: textTheme.bodyLarge?.copyWith(color: Theme.of(context).colorScheme.onPrimaryContainer),
style: textTheme.titleMedium?.copyWith(color: Theme.of(context).colorScheme.onPrimaryContainer),
),
],
);

42
lib/screens/metering/components/topbar/components/shared/animated_dialog.dart
View file

@ -22,7 +22,6 @@ class AnimatedDialog extends StatefulWidget {
class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProviderStateMixin {
final GlobalKey _key = GlobalKey();
final LayerLink _layerLink = LayerLink();
late final Size _closedSize;
late final Offset _closedOffset;
@ -36,7 +35,8 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
late final Animation<double> _borderRadiusAnimation;
late final Animation<double> _closedOpacityAnimation;
late final Animation<double> _openedOpacityAnimation;
OverlayEntry? _overlayEntry;
bool _isDialogShown = false;
@override
void initState() {
@ -88,8 +88,8 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
begin: _closedSize,
end: widget.openedSize ??
Size(
mediaQuery.size.width - mediaQuery.padding.horizontal - Dimens.paddingM * 4,
mediaQuery.size.height - mediaQuery.padding.vertical - Dimens.paddingM * 4,
mediaQuery.size.width - mediaQuery.padding.horizontal - Dimens.paddingM * 2,
mediaQuery.size.height - mediaQuery.padding.vertical - Dimens.paddingM * 2,
),
);
_sizeAnimation = _sizeTween.animate(_defaultCurvedAnimation);
@ -120,10 +120,8 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
return InkWell(
key: _key,
onTap: _openDialog,
child: CompositedTransformTarget(
link: _layerLink,
child: Opacity(
opacity: _overlayEntry != null ? 0 : 1,
opacity: _isDialogShown ? 0 : 1,
child: ClipRRect(
borderRadius: BorderRadius.circular(Dimens.borderRadiusM),
child: ColoredBox(
@ -132,17 +130,18 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
),
),
),
),
);
}
void _openDialog() {
setState(() {
_overlayEntry = OverlayEntry(
builder: (context) => CompositedTransformFollower(
offset: Offset(-_closedOffset.dx, -_closedOffset.dy),
link: _layerLink,
showWhenUnlinked: false,
Navigator.of(context).push(
PageRouteBuilder(
barrierColor: Colors.transparent,
opaque: false,
transitionDuration: Duration.zero,
reverseTransitionDuration: Duration.zero,
pageBuilder: (_, __, ___) => WillPopScope(
onWillPop: () => _animateReverse().then((value) => true),
child: _AnimatedOverlay(
controller: _animationController,
barrierColorAnimation: _barrierColorAnimation,
@ -164,20 +163,27 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
child: widget.child,
),
),
),
);
_animateForward();
}
void _animateForward() {
setState(() {
_isDialogShown = true;
});
Overlay.of(context)?.insert(_overlayEntry!);
_animationController.forward();
}
Future<void> close() async {
Future<void> _animateReverse() async {
_animationController.reverse();
await Future.delayed(_animationController.reverseDuration! * timeDilation);
_overlayEntry?.remove();
setState(() {
_overlayEntry = null;
_isDialogShown = false;
});
}
Future<void> close() => _animateReverse().then((_) => Navigator.of(context).pop());
}
class _AnimatedOverlay extends StatelessWidget {