Fix analysis errors after rebase on latest

Author: DanTup

packages/devtools_app/lib/main.dart

@@ -4,7 +4,6 @@
 
 // @dart=2.9
 
-import 'package:devtools_app/src/url_strategy/url_strategy.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 

packages/devtools_app/lib/src/shared/routing.dart

@@ -137,7 +137,7 @@ class DevToolsRouterDelegate extends RouterDelegate<DevToolsRouteConfiguration>
   /// If page and args would be the same, does nothing.
   /// Existing arguments (for example &uri=) will be preserved unless
   /// overwritten by [argUpdates].
-  void navigateIfNotCurrent(String page, [Map<String, String>? argUpdates]) {
+  void navigateIfNotCurrent(String page, [Map<String, String?>? argUpdates]) {
     final pageChanged = page != currentConfiguration!.page;
     final argsChanged = _changesArgs(argUpdates);
     if (!pageChanged && !argsChanged) {
@@ -209,7 +209,7 @@ class DevToolsRouterDelegate extends RouterDelegate<DevToolsRouteConfiguration>
 
   /// Checks whether applying [changes] over the current routes args will result
   /// in any changes.
-  bool _changesArgs(Map<String, String>? changes) => !mapEquals(
+  bool _changesArgs(Map<String, String?>? changes) => !mapEquals(
         {...currentConfiguration!.args, ...?changes},
         {...currentConfiguration!.args},
       );

packages/devtools_app/lib/src/shared/scaffold.dart

@@ -232,7 +232,7 @@ class DevToolsScaffoldState extends State<DevToolsScaffold>
         Router.neglect(context, () {
           routerDelegate.navigateIfNotCurrent(
             _currentScreen.screenId,
-            routerDelegate.currentConfiguration.args,
+            routerDelegate.currentConfiguration?.args,
           );
         });
       });