Rename some variables (flutter#4956)

* Rename some variables

* formatting

Author: kenzieschmoll

packages/devtools_app/lib/src/app.dart

@@ -229,17 +229,17 @@ class DevToolsAppState extends State<DevToolsApp> with AutoDisposeMixin {
         return ValueListenableBuilder<bool>(
           valueListenable: preferences.vmDeveloperModeEnabled,
           builder: (_, __, child) {
-            final tabs = _visibleScreens()
+            final screens = _visibleScreens()
                 .where((p) => embed && page != null ? p.screenId == page : true)
                 .where((p) => !hide.contains(p.screenId))
                 .toList();
-            if (tabs.isEmpty) return child ?? const SizedBox.shrink();
+            if (screens.isEmpty) return child ?? const SizedBox.shrink();
             return _providedControllers(
               child: DevToolsScaffold(
                 embed: embed,
                 ideTheme: ideTheme,
                 page: page,
-                tabs: tabs,
+                screens: screens,
                 actions: [
                   // TODO(https://github.com/flutter/devtools/issues/1941)
                   if (serviceManager.connectedApp!.isFlutterAppNow!) ...[

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

@@ -37,7 +37,7 @@ import 'status_line.dart';
 class DevToolsScaffold extends StatefulWidget {
   const DevToolsScaffold({
     Key? key,
-    required this.tabs,
+    required this.screens,
     this.page,
     this.actions,
     this.embed = false,
@@ -51,7 +51,7 @@ class DevToolsScaffold extends StatefulWidget {
     List<Widget>? actions,
   }) : this(
           key: key,
-          tabs: [SimpleScreen(child)],
+          screens: [SimpleScreen(child)],
           ideTheme: ideTheme,
           actions: actions,
         );
@@ -77,7 +77,7 @@ class DevToolsScaffold extends StatefulWidget {
       EdgeInsets.symmetric(horizontal: isEmbedded() ? 2.0 : 16.0);
 
   /// All of the [Screen]s that it's possible to navigate to from this Scaffold.
-  final List<Screen> tabs;
+  final List<Screen> screens;
 
   /// The page being rendered.
   final String? page;
@@ -134,22 +134,23 @@ class DevToolsScaffoldState extends State<DevToolsScaffold>
   void didUpdateWidget(DevToolsScaffold oldWidget) {
     super.didUpdateWidget(oldWidget);
 
-    if (widget.tabs.length != oldWidget.tabs.length) {
+    if (widget.screens.length != oldWidget.screens.length) {
       var newIndex = 0;
       // Stay on the current tab if possible when the collection of tabs changes.
       if (_tabController != null &&
-          widget.tabs.contains(oldWidget.tabs[_tabController!.index])) {
-        newIndex = widget.tabs.indexOf(oldWidget.tabs[_tabController!.index]);
+          widget.screens.contains(oldWidget.screens[_tabController!.index])) {
+        newIndex =
+            widget.screens.indexOf(oldWidget.screens[_tabController!.index]);
       }
       // Create a new tab controller to reflect the changed tabs.
       _setupTabController();
       _tabController!.index = newIndex;
-    } else if (widget.tabs[_tabController!.index].screenId != widget.page) {
+    } else if (widget.screens[_tabController!.index].screenId != widget.page) {
       // If the page changed (eg. the route was modified by pressing back in the
       // browser), animate to the new one.
       final newIndex = widget.page == null
           ? 0 // When there's no supplied page, we show the first one.
-          : widget.tabs.indexWhere((t) => t.screenId == widget.page);
+          : widget.screens.indexWhere((t) => t.screenId == widget.page);
       _tabController!.animateTo(newIndex);
     }
   }
@@ -183,19 +184,19 @@ class DevToolsScaffoldState extends State<DevToolsScaffold>
 
   void _setupTabController() {
     _tabController?.dispose();
-    _tabController = TabController(length: widget.tabs.length, vsync: this);
+    _tabController = TabController(length: widget.screens.length, vsync: this);
 
     if (widget.page != null) {
       final initialIndex =
-          widget.tabs.indexWhere((screen) => screen.screenId == widget.page);
+          widget.screens.indexWhere((screen) => screen.screenId == widget.page);
       if (initialIndex != -1) {
         _tabController!.index = initialIndex;
       }
     }
 
-    _currentScreen = widget.tabs[_tabController!.index];
+    _currentScreen = widget.screens[_tabController!.index];
     _tabController!.addListener(() {
-      final screen = widget.tabs[_tabController!.index];
+      final screen = widget.screens[_tabController!.index];
 
       if (_currentScreen != screen) {
         setState(() {
@@ -246,7 +247,7 @@ class DevToolsScaffoldState extends State<DevToolsScaffold>
     final existingTabIndex = _tabController!.index;
 
     final newIndex =
-        widget.tabs.indexWhere((screen) => screen.screenId == pageId);
+        widget.screens.indexWhere((screen) => screen.screenId == pageId);
 
     if (newIndex != -1 && newIndex != existingTabIndex) {
       DevToolsRouterDelegate.of(context).navigateIfNotCurrent(pageId);
@@ -278,7 +279,7 @@ class DevToolsScaffoldState extends State<DevToolsScaffold>
   Widget build(BuildContext context) {
     // Build the screens for each tab and wrap them in the appropriate styling.
     final tabBodies = [
-      for (var screen in widget.tabs)
+      for (var screen in widget.screens)
         Container(
           // TODO(kenz): this padding creates a flash when dragging and dropping
           // into the app size screen because it creates space that is outside
@@ -380,17 +381,17 @@ class DevToolsScaffoldState extends State<DevToolsScaffold>
 
     // Add a leading [BulletSpacer] to the actions if the screen is not narrow.
     final actions = List<Widget>.from(widget.actions ?? []);
-    if (!isNarrow && actions.isNotEmpty && widget.tabs.length > 1) {
+    if (!isNarrow && actions.isNotEmpty && widget.screens.length > 1) {
       actions.insert(0, const BulletSpacer(useAccentColor: true));
     }
 
-    final bool hasMultipleTabs = widget.tabs.length > 1;
+    final bool hasMultipleTabs = widget.screens.length > 1;
 
     if (hasMultipleTabs) {
       tabBar = TabBar(
         controller: _tabController,
         isScrollable: true,
-        tabs: [for (var screen in widget.tabs) screen.buildTab(context)],
+        tabs: [for (var screen in widget.screens) screen.buildTab(context)],
       );
       preferredSize = isNarrow
           ? Size.fromHeight(
@@ -461,7 +462,7 @@ class DevToolsScaffoldState extends State<DevToolsScaffold>
     // Approximate size of the title. Add [defaultSpacing] to account for
     // title's leading padding.
     double wideWidth = painter.width + defaultSpacing;
-    for (var tab in widget.tabs) {
+    for (var tab in widget.screens) {
       wideWidth += tab.approximateWidth(textTheme);
     }
     final actionsLength = widget.actions?.length ?? 0;

packages/devtools_app/test/shared/scaffold_bebugger_test.dart renamed to packages/devtools_app/test/shared/scaffold_debugger_test.dart

@@ -55,7 +55,7 @@ void main() {
     await tester.pumpWidget(
       wrapWithControllers(
         DevToolsScaffold(
-          tabs: [
+          screens: [
             _TestScreen(
               DebuggerScreen.id,
               debuggerScreenKey,

packages/devtools_app/test/shared/scaffold_debugging_controls_test.dart

@@ -51,7 +51,7 @@ void main() {
     await tester.pumpWidget(
       wrapWithControllers(
         DevToolsScaffold(
-          tabs: const [_screen1, _screen2],
+          screens: const [_screen1, _screen2],
           ideTheme: IdeTheme(),
         ),
         debugger: mockDebuggerController,

packages/devtools_app/test/shared/scaffold_no_app_test.dart

@@ -49,7 +49,7 @@ void main() {
       wrapScaffold(
         wrapWithNotifications(
           DevToolsScaffold(
-            tabs: const [_screen1, _screen2],
+            screens: const [_screen1, _screen2],
             ideTheme: IdeTheme(),
           ),
         ),

packages/devtools_app/test/shared/scaffold_profile_test.dart

@@ -51,7 +51,7 @@ void main() {
     await tester.pumpWidget(
       wrapWithControllers(
         DevToolsScaffold(
-          tabs: const [_screen1, _screen2],
+          screens: const [_screen1, _screen2],
           ideTheme: IdeTheme(),
         ),
         debugger: mockDebuggerController,

packages/devtools_app/test/shared/scaffold_test.dart

@@ -47,7 +47,7 @@ void main() {
       wrapScaffold(
         wrapWithNotifications(
           DevToolsScaffold(
-            tabs: const [_screen1, _screen2, _screen3, _screen4, _screen5],
+            screens: const [_screen1, _screen2, _screen3, _screen4, _screen5],
             ideTheme: IdeTheme(),
           ),
         ),
@@ -65,7 +65,7 @@ void main() {
       wrapScaffold(
         wrapWithNotifications(
           DevToolsScaffold(
-            tabs: const [_screen1, _screen2, _screen3, _screen4, _screen5],
+            screens: const [_screen1, _screen2, _screen3, _screen4, _screen5],
             ideTheme: IdeTheme(),
           ),
         ),
@@ -82,7 +82,7 @@ void main() {
       wrapScaffold(
         wrapWithNotifications(
           DevToolsScaffold(
-            tabs: const [_screen1],
+            screens: const [_screen1],
             ideTheme: IdeTheme(),
           ),
         ),
@@ -97,7 +97,7 @@ void main() {
       wrapScaffold(
         wrapWithNotifications(
           DevToolsScaffold(
-            tabs: const [_screen1, _screen2],
+            screens: const [_screen1, _screen2],
             ideTheme: IdeTheme(),
           ),
         ),
@@ -126,7 +126,7 @@ void main() {
       wrapScaffold(
         wrapWithNotifications(
           DevToolsScaffold(
-            tabs: const [_screen1, _screen2],
+            screens: const [_screen1, _screen2],
             page: _screen2.screenId,
             ideTheme: IdeTheme(),
           ),