fix: updating deprecated members to support +3.10

Stacked-Org · May 11, 2023 · 0004072 · 0004072
1 parent ec0a36b
commit 0004072
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/lib/src/code_generation/router_annotation/extended_navigator.dart b/lib/src/code_generation/router_annotation/extended_navigator.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:ui';
 
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
@@ -235,12 +236,10 @@ class ExtendedNavigatorState<T extends RouterBase?>
     assert(router != null);
     return Navigator(
       key: _navigatorKey,
-      initialRoute:
-          ambiguate(WidgetsBinding.instance)!.window.defaultRouteName !=
-                  Navigator.defaultRouteName
-              ? ambiguate(WidgetsBinding.instance)!.window.defaultRouteName
-              : initial ??
-                  ambiguate(WidgetsBinding.instance)!.window.defaultRouteName,
+      initialRoute: PlatformDispatcher.instance.defaultRouteName !=
+              Navigator.defaultRouteName
+          ? PlatformDispatcher.instance.defaultRouteName
+          : initial ?? PlatformDispatcher.instance.defaultRouteName,
       observers: List.from(widget.observers)..add(_heroController!),
       onGenerateRoute: (RouteSettings settings) {
         return router!.onGenerateRoute(settings, basePath);

diff --git a/lib/src/router/provider/stacked_route_information_provider.dart b/lib/src/router/provider/stacked_route_information_provider.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:stacked/src/router/parser/route_information_parser.dart';
@@ -19,7 +20,7 @@ class StackedRouteInformationProvider extends RouteInformationProvider
       bool Function(String? location)? neglectWhen}) {
     final initialRouteInfo = initialRouteInformation ??
         RouteInformation(
-            location: WidgetsBinding.instance.window.defaultRouteName);
+            location: PlatformDispatcher.instance.defaultRouteName);
     return StackedRouteInformationProvider._(
       initialRouteInformation: initialRouteInfo,
       neglectIf: neglectWhen,
@@ -56,8 +57,8 @@ class StackedRouteInformationProvider extends RouteInformationProvider
   RouteInformation get value => _value;
   RouteInformation _value;
 
-  RouteInformation _valueInEngine = RouteInformation(
-      location: WidgetsBinding.instance.window.defaultRouteName);
+  RouteInformation _valueInEngine =
+      RouteInformation(location: PlatformDispatcher.instance.defaultRouteName);
 
   void _platformReportsNewRouteInformation(RouteInformation routeInformation) {
     if (_value == routeInformation) return;

diff --git a/lib/src/view_models/ui/skeleton_loader.dart b/lib/src/view_models/ui/skeleton_loader.dart
@@ -99,10 +99,6 @@ class SkeletonLoaderState extends State<SkeletonLoader>
           // We only want to show this if the widget is loading OR if the widget is busy with the transition.
           child: widget.loading || _transitionToNewWidget
               ? AnimatedSize(
-                  /// TODO: This field is depreacted but I'm adding it
-                  /// to support older versions for flutter
-                  // ignore: deprecated_member_use
-                  vsync: this,
                   duration: const Duration(milliseconds: 450),
                   curve: Curves.easeOut,
                   child: ShaderMask(