Merge branch 'master' into flutter-lints

Author: srawlins

packages/devtools_app/integration_test/test/live_connection/eval_utils.dart

@@ -73,7 +73,7 @@ class EvalTester {
   Future<void> selectWidgetTreeNode(Finder finder) async {
     await tapAndPump(
       find.descendant(
-        of: find.byKey(InspectorScreenBodyState.summaryTreeKey),
+        of: find.byKey(InspectorScreenBodyState.inspectorTreeKey),
         matching: finder,
       ),
     );

packages/devtools_app/lib/devtools_app.dart

@@ -24,11 +24,11 @@ export 'src/screens/deep_link_validation/deep_links_controller.dart';
 export 'src/screens/deep_link_validation/deep_links_screen.dart';
 export 'src/screens/dtd/dtd_tools_controller.dart';
 export 'src/screens/dtd/dtd_tools_screen.dart';
-export 'src/screens/inspector/inspector_controller.dart';
-export 'src/screens/inspector/inspector_screen_body.dart';
-export 'src/screens/inspector/inspector_tree_controller.dart';
-export 'src/screens/inspector_shared/inspector_screen.dart';
-export 'src/screens/inspector_shared/inspector_screen_controller.dart';
+export 'src/screens/inspector_v2/inspector_controller.dart';
+export 'src/screens/inspector_v2/inspector_screen.dart';
+export 'src/screens/inspector_v2/inspector_screen_body.dart';
+export 'src/screens/inspector_v2/inspector_screen_controller.dart';
+export 'src/screens/inspector_v2/inspector_tree_controller.dart';
 export 'src/screens/logging/log_details_controller.dart';
 export 'src/screens/logging/logging_controller.dart';
 export 'src/screens/logging/logging_screen.dart';
@@ -76,7 +76,7 @@ export 'src/shared/analytics/analytics_controller.dart';
 export 'src/shared/charts/treemap.dart';
 export 'src/shared/console/console_service.dart';
 export 'src/shared/console/eval/eval_service.dart';
-export 'src/shared/console/eval/inspector_tree.dart';
+export 'src/shared/console/eval/inspector_tree_v2.dart';
 export 'src/shared/console/primitives/simple_items.dart';
 export 'src/shared/console/widgets/description.dart';
 export 'src/shared/diagnostics/diagnostics_node.dart';

packages/devtools_app/lib/src/app.dart

@@ -31,8 +31,8 @@ import 'screens/deep_link_validation/deep_links_controller.dart';
 import 'screens/deep_link_validation/deep_links_screen.dart';
 import 'screens/dtd/dtd_tools_controller.dart';
 import 'screens/dtd/dtd_tools_screen.dart';
-import 'screens/inspector_shared/inspector_screen.dart';
-import 'screens/inspector_shared/inspector_screen_controller.dart';
+import 'screens/inspector_v2/inspector_screen.dart';
+import 'screens/inspector_v2/inspector_screen_controller.dart';
 import 'screens/logging/logging_controller.dart';
 import 'screens/logging/logging_screen.dart';
 import 'screens/memory/framework/memory_controller.dart';

packages/devtools_app/lib/src/screens/deep_link_validation/deep_link_list_view.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
+import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
@@ -439,7 +440,8 @@ class _NotificationCardSection extends StatelessWidget {
           children: [
             if (domainErrorCount > 0)
               NotificationCard(
-                title: '$domainErrorCount domain not verified',
+                title:
+                    '$domainErrorCount ${pluralize('domain', domainErrorCount)} not verified',
                 description:
                     'This affects all deep links. Fix issues to make users go directly to your app.',
                 actionButton: TextButton(
@@ -461,7 +463,8 @@ class _NotificationCardSection extends StatelessWidget {
               const SizedBox(width: defaultSpacing),
             if (pathErrorCount > 0)
               NotificationCard(
-                title: '$pathErrorCount path not working',
+                title:
+                    '$pathErrorCount ${pluralize('path', pathErrorCount)} not working',
                 description:
                     'Fix these path to make sure users are directed to your app',
                 actionButton: TextButton(