From d84775217d91ae9d0d39ab6ea80e29343203954f Mon Sep 17 00:00:00 2001 From: amrnrd Date: Wed, 25 May 2022 11:03:56 +0200 Subject: [PATCH 1/2] remove safe navigation operator from SchedulerBinding.instance to support flutter 3.0 --- flare_flutter/lib/flare_render_box.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flare_flutter/lib/flare_render_box.dart b/flare_flutter/lib/flare_render_box.dart index 753fc9c..c730a95 100644 --- a/flare_flutter/lib/flare_render_box.dart +++ b/flare_flutter/lib/flare_render_box.dart @@ -164,10 +164,10 @@ abstract class FlareRenderBox extends RenderBox { if (isPlaying) { // Paint again if (_frameCallbackID != -1) { - SchedulerBinding.instance?.cancelFrameCallbackWithId(_frameCallbackID); + SchedulerBinding.instance.cancelFrameCallbackWithId(_frameCallbackID); } _frameCallbackID = - SchedulerBinding.instance?.scheduleFrameCallback(_beginFrame) ?? -1; + SchedulerBinding.instance.scheduleFrameCallback(_beginFrame) ?? -1; } final Canvas canvas = context.canvas; @@ -269,7 +269,7 @@ abstract class FlareRenderBox extends RenderBox { } else { _lastFrameTime = _notPlayingFlag; if (_frameCallbackID != -1) { - SchedulerBinding.instance?.cancelFrameCallbackWithId(_frameCallbackID); + SchedulerBinding.instance.cancelFrameCallbackWithId(_frameCallbackID); } } } From 2ab67931326cb47d1ac5efbbc8807ad42a6a9b60 Mon Sep 17 00:00:00 2001 From: amrnrd Date: Sat, 28 May 2022 19:35:44 +0200 Subject: [PATCH 2/2] remove null safety operator from SchedulerBinding --- flare_flutter/lib/flare_render_box.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flare_flutter/lib/flare_render_box.dart b/flare_flutter/lib/flare_render_box.dart index c730a95..138ca72 100644 --- a/flare_flutter/lib/flare_render_box.dart +++ b/flare_flutter/lib/flare_render_box.dart @@ -167,7 +167,7 @@ abstract class FlareRenderBox extends RenderBox { SchedulerBinding.instance.cancelFrameCallbackWithId(_frameCallbackID); } _frameCallbackID = - SchedulerBinding.instance.scheduleFrameCallback(_beginFrame) ?? -1; + SchedulerBinding.instance.scheduleFrameCallback(_beginFrame); } final Canvas canvas = context.canvas;