Compare commits

..

No commits in common. "3aa0014b6a8a9093acfc1c51708011d8d7b6687c" and "49d0a2175fe75c6706ee4ff32670356a56a1efd7" have entirely different histories.

3 changed files with 11 additions and 17 deletions

View file

@ -29,6 +29,8 @@ class AnimatedDialog extends StatefulWidget {
}
class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProviderStateMixin {
final GlobalKey _key = GlobalKey();
late Size _closedSize;
late Offset _closedOffset;
@ -127,6 +129,7 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
@override
Widget build(BuildContext context) {
return GestureDetector(
key: _key,
onTap: _openDialog,
child: Opacity(
opacity: _isDialogShown ? 0 : 1,
@ -137,13 +140,13 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
void _setClosedOffset() {
WidgetsBinding.instance.addPostFrameCallback((_) {
final renderBox = context.findRenderObject()! as RenderBox?;
final renderBox = _key.currentContext?.findRenderObject()! as RenderBox?;
if (renderBox != null) {
final size = MediaQuery.sizeOf(context);
final padding = MediaQuery.paddingOf(context);
final maxWidth = size.width - padding.horizontal - Dimens.dialogMargin.horizontal;
final maxHeight = size.height - padding.vertical - Dimens.dialogMargin.vertical;
_closedSize = context.size!;
_closedSize = _key.currentContext!.size!;
_sizeTween = SizeTween(
begin: _closedSize,
end: Size(
@ -153,16 +156,7 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
);
_sizeAnimation = _sizeTween.animate(_defaultCurvedAnimation);
final globalOffset = renderBox.localToGlobal(Offset.zero);
try {
_closedOffset = Offset(
//TODO: when updating layout or changing one of selected picker values, X offset is negative for some reason
globalOffset.dx > 0 ? globalOffset.dx : _closedOffset.dx,
globalOffset.dy,
);
} catch (_) {
_closedOffset = globalOffset;
}
_closedOffset = renderBox.localToGlobal(Offset.zero);
_offsetAnimation = SizeTween(
begin: Size(
_closedOffset.dx + _closedSize.width / 2,

View file

@ -861,11 +861,11 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "v4.1.2"
resolved-ref: "6bb16eb49232649eca02704b3a40890b0184d8b5"
ref: "v4.1.1"
resolved-ref: "2317ef3a1e93e06505a033ecbd5cee3758b2dbc0"
url: "https://github.com/vodemn/m3_lightmeter_iap"
source: git
version: "4.1.2+37"
version: "4.1.1+36"
m3_lightmeter_resources:
dependency: "direct main"
description:

View file

@ -1,7 +1,7 @@
name: lightmeter
description: Lightmeter app inspired by Material 3 design system.
publish_to: "none"
version: 2.0.0+63
version: 2.0.0+62
environment:
sdk: ">=3.0.0 <4.0.0"
@ -33,7 +33,7 @@ dependencies:
m3_lightmeter_iap:
git:
url: "https://github.com/vodemn/m3_lightmeter_iap"
ref: v4.1.2
ref: v4.1.1
m3_lightmeter_resources:
git:
url: "https://github.com/vodemn/m3_lightmeter_resources"