Skip to content

Commit 0004072

Browse files
authored
fix: updating deprecated members to support +3.10
1 parent ec0a36b commit 0004072

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

lib/src/code_generation/router_annotation/extended_navigator.dart

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'dart:async';
2+
import 'dart:ui';
23

34
import 'package:flutter/foundation.dart' show kIsWeb;
45
import 'package:flutter/material.dart';
@@ -235,12 +236,10 @@ class ExtendedNavigatorState<T extends RouterBase?>
235236
assert(router != null);
236237
return Navigator(
237238
key: _navigatorKey,
238-
initialRoute:
239-
ambiguate(WidgetsBinding.instance)!.window.defaultRouteName !=
240-
Navigator.defaultRouteName
241-
? ambiguate(WidgetsBinding.instance)!.window.defaultRouteName
242-
: initial ??
243-
ambiguate(WidgetsBinding.instance)!.window.defaultRouteName,
239+
initialRoute: PlatformDispatcher.instance.defaultRouteName !=
240+
Navigator.defaultRouteName
241+
? PlatformDispatcher.instance.defaultRouteName
242+
: initial ?? PlatformDispatcher.instance.defaultRouteName,
244243
observers: List.from(widget.observers)..add(_heroController!),
245244
onGenerateRoute: (RouteSettings settings) {
246245
return router!.onGenerateRoute(settings, basePath);

lib/src/router/provider/stacked_route_information_provider.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'package:flutter/foundation.dart';
12
import 'package:flutter/services.dart';
23
import 'package:flutter/widgets.dart';
34
import 'package:stacked/src/router/parser/route_information_parser.dart';
@@ -19,7 +20,7 @@ class StackedRouteInformationProvider extends RouteInformationProvider
1920
bool Function(String? location)? neglectWhen}) {
2021
final initialRouteInfo = initialRouteInformation ??
2122
RouteInformation(
22-
location: WidgetsBinding.instance.window.defaultRouteName);
23+
location: PlatformDispatcher.instance.defaultRouteName);
2324
return StackedRouteInformationProvider._(
2425
initialRouteInformation: initialRouteInfo,
2526
neglectIf: neglectWhen,
@@ -56,8 +57,8 @@ class StackedRouteInformationProvider extends RouteInformationProvider
5657
RouteInformation get value => _value;
5758
RouteInformation _value;
5859

59-
RouteInformation _valueInEngine = RouteInformation(
60-
location: WidgetsBinding.instance.window.defaultRouteName);
60+
RouteInformation _valueInEngine =
61+
RouteInformation(location: PlatformDispatcher.instance.defaultRouteName);
6162

6263
void _platformReportsNewRouteInformation(RouteInformation routeInformation) {
6364
if (_value == routeInformation) return;

lib/src/view_models/ui/skeleton_loader.dart

-4
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ class SkeletonLoaderState extends State<SkeletonLoader>
9999
// We only want to show this if the widget is loading OR if the widget is busy with the transition.
100100
child: widget.loading || _transitionToNewWidget
101101
? AnimatedSize(
102-
/// TODO: This field is depreacted but I'm adding it
103-
/// to support older versions for flutter
104-
// ignore: deprecated_member_use
105-
vsync: this,
106102
duration: const Duration(milliseconds: 450),
107103
curve: Curves.easeOut,
108104
child: ShaderMask(

0 commit comments

Comments
 (0)