added backward compability (Flutter 3)

egitheri · May 14, 2022 · 6eb294b · 6eb294b
1 parent b5ef10a
commit 6eb294b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/lib/get_core/src/typedefs.dart b/lib/get_core/src/typedefs.dart
@@ -1 +1,3 @@
 typedef ValueUpdater<T> = T Function();
+
+T? ambiguate<T>(T? value) => value;
diff --git a/lib/get_instance/src/lifecycle.dart b/lib/get_instance/src/lifecycle.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/scheduler.dart';
 
+import '../../get.dart';
+
 /// The [GetLifeCycle]
 ///
 /// ```dart
@@ -16,7 +18,8 @@ mixin GetLifeCycleMixin {
   @protected
   @mustCallSuper
   void onInit() {
-    SchedulerBinding.instance?.addPostFrameCallback((_) => onReady());
+    ambiguate(SchedulerBinding.instance)
+        ?.addPostFrameCallback((_) => onReady());
   }
 
   /// Called 1 frame after onInit(). It is the perfect place to enter

diff --git a/lib/get_navigation/src/extension_navigation.dart b/lib/get_navigation/src/extension_navigation.dart
@@ -358,7 +358,7 @@ extension ExtensionSnackbar on GetInterface {
     if (instantInit) {
       controller.show();
     } else {
-      SchedulerBinding.instance!.addPostFrameCallback((_) {
+      ambiguate(SchedulerBinding.instance)!.addPostFrameCallback((_) {
         controller.show();
       });
     }
@@ -469,7 +469,7 @@ extension ExtensionSnackbar on GetInterface {
       controller.show();
     } else {
       //routing.isSnackbar = true;
-      SchedulerBinding.instance!.addPostFrameCallback((_) {
+      ambiguate(SchedulerBinding.instance)!.addPostFrameCallback((_) {
         controller.show();
       });
     }

diff --git a/lib/get_navigation/src/router_report.dart b/lib/get_navigation/src/router_report.dart
@@ -52,7 +52,7 @@ class RouterReportManager<T> {
 
   void reportRouteDispose(T disposed) {
     if (Get.smartManagement != SmartManagement.onlyBuilder) {
-      WidgetsBinding.instance!.addPostFrameCallback((_) {
+      ambiguate(WidgetsBinding.instance)!.addPostFrameCallback((_) {
         _removeDependencyByRoute(disposed);
       });
     }

diff --git a/lib/get_navigation/src/snackbar/snackbar.dart b/lib/get_navigation/src/snackbar/snackbar.dart
@@ -449,7 +449,7 @@ You need to either use message[String], or messageText[Widget] or define a userI
   }
 
   void _configureLeftBarFuture() {
-    SchedulerBinding.instance!.addPostFrameCallback(
+    ambiguate(SchedulerBinding.instance)!.addPostFrameCallback(
       (_) {
         final keyContext = _backgroundBoxKey.currentContext;
         if (keyContext != null) {

diff --git a/lib/get_state_manager/src/simple/get_controllers.dart b/lib/get_state_manager/src/simple/get_controllers.dart
@@ -96,13 +96,13 @@ mixin FullLifeCycleMixin on FullLifeCycleController {
   @override
   void onInit() {
     super.onInit();
-    WidgetsBinding.instance!.addObserver(this);
+    ambiguate(WidgetsBinding.instance)!.addObserver(this);
   }
 
   @mustCallSuper
   @override
   void onClose() {
-    WidgetsBinding.instance!.removeObserver(this);
+    ambiguate(WidgetsBinding.instance)!.removeObserver(this);
     super.onClose();
   }
 

diff --git a/lib/get_state_manager/src/simple/simple_builder.dart b/lib/get_state_manager/src/simple/simple_builder.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/widgets.dart';
 
+import '../../../get_core/src/typedefs.dart';
 import 'list_notifier.dart';
 
 typedef ValueBuilderUpdateCallback<T> = void Function(T snapshot);
@@ -102,13 +103,14 @@ mixin ObserverComponent on ComponentElement {
 
   Future<bool> _safeRebuild() async {
     if (dirty) return false;
-    if (SchedulerBinding.instance == null) {
+    if (ambiguate(SchedulerBinding.instance) == null) {
       markNeedsBuild();
     } else {
       // refresh was called during the building
-      if (SchedulerBinding.instance!.schedulerPhase != SchedulerPhase.idle) {
+      if (ambiguate(SchedulerBinding.instance)!.schedulerPhase 
+      != SchedulerPhase.idle) {
         // Await for the end of build
-        await SchedulerBinding.instance!.endOfFrame;
+        await ambiguate(SchedulerBinding.instance)!.endOfFrame;
         if (dirty) return false;
       }
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		typedef ValueUpdater<T> = T Function();

		T? ambiguate<T>(T? value) => value;