Skip to content

Instance not yet initialised #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Instance not yet initialised #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b79be3
instance can only be evaluated from inside the library when it is not…
JesperBellenbaum May 3, 2023
db3ad69
remove null check
JesperBellenbaum May 3, 2023
23c5878
new material adjustments
JesperBellenbaum May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 64 additions & 58 deletions lib/src/gesture_navigation/gesture_route_transition_mixin.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ mixin GestureRouteTransitionMixin<T> on ModalRoute<T> {

GestureHandler get gestureHandler => gestureDelegate.gestureHandler;

GestureHandler? get barrierGestureHandler => gestureDelegate.barrierGestureHandler;
GestureHandler? get barrierGestureHandler =>
gestureDelegate.barrierGestureHandler;

@override
AnimationController createAnimationController() => gestureDelegate.createAnimationController();
AnimationController createAnimationController() =>
gestureDelegate.createAnimationController();

@override
void install() {
Expand All @@ -35,14 +37,16 @@ mixin GestureRouteTransitionMixin<T> on ModalRoute<T> {
}

@override
Widget buildTransitions(
BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) {
final transitionChild = buildPageTransitions(context, animation, secondaryAnimation, child);
return buildGestureListener(context, animation, secondaryAnimation, transitionChild);
Widget buildTransitions(BuildContext context, Animation<double> animation,
Animation<double> secondaryAnimation, Widget child) {
final transitionChild =
buildPageTransitions(context, animation, secondaryAnimation, child);
return buildGestureListener(
context, animation, secondaryAnimation, transitionChild);
}

Widget buildGestureListener(
BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) {
Widget buildGestureListener(BuildContext context, Animation<double> animation,
Animation<double> secondaryAnimation, Widget child) {
return GestureListener(
handler: gestureDelegate.gestureHandler,
behavior: gestureBehavior,
Expand All @@ -51,8 +55,8 @@ mixin GestureRouteTransitionMixin<T> on ModalRoute<T> {
);
}

Widget buildPageTransitions(
BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child);
Widget buildPageTransitions(BuildContext context, Animation<double> animation,
Animation<double> secondaryAnimation, Widget child);

@override
void changedInternalState() {
Expand All @@ -71,7 +75,7 @@ mixin GestureRouteTransitionMixin<T> on ModalRoute<T> {

Widget buildGestureModalBarrier(BuildContext context) {
final gestureHandler = barrierGestureHandler;
Widget barrier = buildModalBarrier(context, barrierDismissible && gestureHandler == null);
Widget barrier = buildModalBarrier();
if (gestureHandler != null) {
barrier = Stack(
children: [
Expand All @@ -88,57 +92,59 @@ mixin GestureRouteTransitionMixin<T> on ModalRoute<T> {
return barrier;
}

Widget buildModalBarrier(BuildContext context, bool barrierDismissible) {
Widget barrier;
if (barrierColor != null && barrierColor!.alpha != 0 && !offstage) {
// changedInternalState is called if barrierColor or offstage updates
assert(barrierColor != barrierColor!.withOpacity(0.0));
final Animation<Color?> color = animation!.drive(
ColorTween(
begin: barrierColor!.withOpacity(0.0),
end: barrierColor, // changedInternalState is called if barrierColor updates
).chain(CurveTween(curve: barrierCurve)), // changedInternalState is called if barrierCurve updates
);
barrier = AnimatedModalBarrier(
color: color,
dismissible: barrierDismissible, // changedInternalState is called if barrierDismissible updates
semanticsLabel: barrierLabel, // changedInternalState is called if barrierLabel updates
barrierSemanticsDismissible: semanticsDismissible,
);
} else {
barrier = ModalBarrier(
dismissible: barrierDismissible, // changedInternalState is called if barrierDismissible updates
semanticsLabel: barrierLabel, // changedInternalState is called if barrierLabel updates
barrierSemanticsDismissible: semanticsDismissible,
);
}
if (filter != null) {
barrier = BackdropFilter(
filter: filter!,
child: barrier,
);
}
barrier = IgnorePointer(
ignoring: animation!.status ==
AnimationStatus.reverse || // changedInternalState is called when animation.status updates
animation!.status == AnimationStatus.dismissed, // dismissed is possible when doing a manual pop gesture
child: barrier,
);
if (semanticsDismissible && this.barrierDismissible) {
// To be sorted after the _modalScope.
barrier = Semantics(
sortKey: const OrdinalSortKey(1.0),
child: barrier,
);
}
return barrier;
}
// Widget buildModalBarrier(BuildContext context, bool barrierDismissible) {
// Widget barrier;
// if (barrierColor != null && barrierColor!.alpha != 0 && !offstage) {
// // changedInternalState is called if barrierColor or offstage updates
// assert(barrierColor != barrierColor!.withOpacity(0.0));
// final Animation<Color?> color = animation!.drive(
// ColorTween(
// begin: barrierColor!.withOpacity(0.0),
// end: barrierColor, // changedInternalState is called if barrierColor updates
// ).chain(CurveTween(curve: barrierCurve)), // changedInternalState is called if barrierCurve updates
// );
// barrier = AnimatedModalBarrier(
// color: color,
// dismissible: barrierDismissible, // changedInternalState is called if barrierDismissible updates
// semanticsLabel: barrierLabel, // changedInternalState is called if barrierLabel updates
// barrierSemanticsDismissible: semanticsDismissible,
// );
// } else {
// barrier = ModalBarrier(
// dismissible: barrierDismissible, // changedInternalState is called if barrierDismissible updates
// semanticsLabel: barrierLabel, // changedInternalState is called if barrierLabel updates
// barrierSemanticsDismissible: semanticsDismissible,
// );
// }
// if (filter != null) {
// barrier = BackdropFilter(
// filter: filter!,
// child: barrier,
// );
// }
// barrier = IgnorePointer(
// ignoring: animation!.status ==
// AnimationStatus.reverse || // changedInternalState is called when animation.status updates
// animation!.status == AnimationStatus.dismissed, // dismissed is possible when doing a manual pop gesture
// child: barrier,
// );
// if (semanticsDismissible && this.barrierDismissible) {
// // To be sorted after the _modalScope.
// barrier = Semantics(
// sortKey: const OrdinalSortKey(1.0),
// child: barrier,
// );
// }
// return barrier;
// }

@override
Iterable<OverlayEntry> createOverlayEntries() {
final modalOverlays = List<OverlayEntry>.from(super.createOverlayEntries(), growable: false);
final modalOverlays =
List<OverlayEntry>.from(super.createOverlayEntries(), growable: false);
if (barrierGestureHandler != null) {
_modalBarrier = OverlayEntry(builder: (context) => buildGestureModalBarrier(context));
_modalBarrier =
OverlayEntry(builder: (context) => buildGestureModalBarrier(context));
modalOverlays[0] = _modalBarrier!;
}
return modalOverlays;
Expand Down
33 changes: 25 additions & 8 deletions lib/src/gesture_navigation/navigator_gesture_recognizer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import '../gestures_binding.dart';

mixin NavigatorGesturesPreventingCancelingMixin on GestureRecognizer {
static NavigatorGesturesBinding? getGestureBinding() {
if (GestureBinding.instance is NavigatorGesturesBinding) return GestureBinding.instance as NavigatorGesturesBinding;
if (GestureBinding.instance is NavigatorGesturesBinding) {
return GestureBinding.instance as NavigatorGesturesBinding;
}
return null;
}

Expand Down Expand Up @@ -33,14 +35,29 @@ mixin NavigatorGesturesOneSequenceMixin on OneSequenceGestureRecognizer
}
}

class RouteHorizontalDragGestureRecognizer extends HorizontalDragGestureRecognizer
with NavigatorGesturesPreventingCancelingMixin, NavigatorGesturesOneSequenceMixin {
RouteHorizontalDragGestureRecognizer({Object? debugOwner, PointerDeviceKind? kind /*, Set<PointerDeviceKind>? supportedDevices */})
: super(debugOwner: debugOwner, kind: kind/*, supportedDevices: supportedDevices */);
class RouteHorizontalDragGestureRecognizer
extends HorizontalDragGestureRecognizer
with
NavigatorGesturesPreventingCancelingMixin,
NavigatorGesturesOneSequenceMixin {
RouteHorizontalDragGestureRecognizer(
{Object? debugOwner,
PointerDeviceKind? kind /*, Set<PointerDeviceKind>? supportedDevices */
})
: super(
debugOwner: debugOwner, /*, supportedDevices: supportedDevices */
);
}

class RouteVerticalDragGestureRecognizer extends VerticalDragGestureRecognizer
with NavigatorGesturesPreventingCancelingMixin, NavigatorGesturesOneSequenceMixin {
RouteVerticalDragGestureRecognizer({Object? debugOwner, PointerDeviceKind? kind /*, Set<PointerDeviceKind>? supportedDevices */})
: super(debugOwner: debugOwner, kind: kind/*, supportedDevices: supportedDevices */);
with
NavigatorGesturesPreventingCancelingMixin,
NavigatorGesturesOneSequenceMixin {
RouteVerticalDragGestureRecognizer(
{Object? debugOwner,
PointerDeviceKind? kind /*, Set<PointerDeviceKind>? supportedDevices */
})
: super(
debugOwner: debugOwner, /*, supportedDevices: supportedDevices */
);
}
4 changes: 2 additions & 2 deletions lib/src/gestures_binding.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ class NavigatorGesturesFlutterBinding extends WidgetsFlutterBinding with Navigat
/// binding instance to a [TestWidgetsFlutterBinding], not a
/// [NavigatorGesturesFlutterBinding].
static WidgetsBinding ensureInitialized() {
if (WidgetsBinding.instance == null) NavigatorGesturesFlutterBinding();
return WidgetsBinding.instance!;
NavigatorGesturesFlutterBinding();
return WidgetsBinding.instance;
}
}

Expand Down