Remove outdated Flutter Version checks in the Inspector (#3671)

* Remove outdated Flutter Version checks in the Inspector

* fix test

packages/devtools_app/lib/src/inspector/inspector_controller.dart

@@ -30,8 +30,6 @@ import '../primitives/auto_dispose.dart';
 import '../primitives/utils.dart';
 import '../shared/globals.dart';
 import '../shared/service_extensions.dart' as extensions;
-import '../shared/service_registrations.dart' as registrations;
-import '../shared/version.dart';
 import 'diagnostics_node.dart';
 import 'inspector_screen.dart';
 import 'inspector_service.dart';
@@ -77,8 +75,6 @@ class InspectorController extends DisposableController
     @required this.treeType,
     this.parent,
     this.isSummaryTree = true,
-    this.onExpandCollapseSupported,
-    this.onLayoutExplorerSupported,
   })  : _treeGroups = InspectorObjectGroupManager(
           serviceManager.inspectorService,
           'tree',
@@ -110,9 +106,6 @@ class InspectorController extends DisposableController
       details = null;
     }
 
-    _checkForExpandCollapseSupport();
-    _checkForLayoutExplorerSupport();
-
     addAutoDisposeListener(serviceManager.isolateManager.mainIsolate, () {
       final isolate = serviceManager.isolateManager.mainIsolate.value;
       if (isolate != _mainIsolate) {
@@ -200,10 +193,6 @@ class InspectorController extends DisposableController
 
   final bool isSummaryTree;
 
-  final VoidCallback onExpandCollapseSupported;
-
-  final VoidCallback onLayoutExplorerSupported;
-
   /// Parent InspectorController if this is a details subtree.
   InspectorController parent;
 
@@ -980,43 +969,4 @@ class InspectorController extends DisposableController
     details.inspectorTree.collapseToSelected();
     details.animateTo(details.inspectorTree.selection);
   }
-
-  /// execute given [callback] when minimum Flutter [version] is met.
-  void _onVersionSupported(
-    SemanticVersion version,
-    VoidCallback callback,
-  ) {
-    final flutterVersionServiceListenable = serviceManager
-        .registeredServiceListenable(registrations.flutterVersion.service);
-    addAutoDisposeListener(flutterVersionServiceListenable, () async {
-      final registered = flutterVersionServiceListenable.value;
-      if (registered) {
-        final flutterVersion =
-            FlutterVersion.parse((await serviceManager.flutterVersion).json);
-        if (_disposed) return;
-        if (flutterVersion.isSupported(supportedVersion: version)) {
-          callback();
-        }
-      }
-    });
-  }
-
-  void _checkForExpandCollapseSupport() {
-    if (onExpandCollapseSupported == null) return;
-    // Configurable subtree depth is available in versions of Flutter
-    // greater than or equal to 1.9.7, but the flutterVersion service is
-    // not available until 1.10.1, so we will check for 1.10.1 here.
-    _onVersionSupported(
-      SemanticVersion(major: 1, minor: 10, patch: 1),
-      onExpandCollapseSupported,
-    );
-  }
-
-  void _checkForLayoutExplorerSupport() {
-    if (onLayoutExplorerSupported == null) return;
-    _onVersionSupported(
-      SemanticVersion(major: 1, minor: 13, patch: 1),
-      onLayoutExplorerSupported,
-    );
-  }
 }

packages/devtools_app/lib/src/inspector/inspector_screen.dart

@@ -68,9 +68,6 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
         BlockingActionMixin,
         AutoDisposeMixin,
         SearchFieldMixin<InspectorScreenBody> {
-  bool _expandCollapseSupported = false;
-  bool _layoutExplorerSupported = false;
-
   InspectorController inspectorController;
 
   InspectorTreeController get summaryTreeController =>
@@ -123,8 +120,6 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
       inspectorTree: inspectorTreeController,
       detailsTree: detailsTree,
       treeType: FlutterTreeType.widget,
-      onExpandCollapseSupported: _onExpandCollapseSupported,
-      onLayoutExplorerSupported: _onLayoutExplorerSupported,
     );
 
     summaryTreeController.setSearchTarget(searchTarget);
@@ -184,7 +179,6 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
           detailsTree: detailsTree,
           controller: inspectorController,
           actionButtons: _expandCollapseButtons(),
-          layoutExplorerSupported: _layoutExplorerSupported,
         ),
       ],
     );
@@ -316,8 +310,6 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
   }
 
   Widget _expandCollapseButtons() {
-    if (!_expandCollapseSupported) return null;
-
     return Container(
       alignment: Alignment.centerRight,
       decoration: BoxDecoration(
@@ -355,18 +347,6 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
     );
   }
 
-  void _onExpandCollapseSupported() {
-    setState(() {
-      _expandCollapseSupported = true;
-    });
-  }
-
-  void _onLayoutExplorerSupported() {
-    setState(() {
-      _layoutExplorerSupported = true;
-    });
-  }
-
   void _refreshInspector() {
     ga.select(analytics_constants.inspector, analytics_constants.refresh);
     blockWhileInProgress(() async {

packages/devtools_app/lib/src/inspector/inspector_screen_details_tab.dart

@@ -18,14 +18,12 @@ class InspectorDetailsTabController extends StatefulWidget {
     this.detailsTree,
     this.actionButtons,
     this.controller,
-    this.layoutExplorerSupported,
     Key key,
   }) : super(key: key);
 
   final Widget detailsTree;
   final Widget actionButtons;
   final InspectorController controller;
-  final bool layoutExplorerSupported;
 
   @override
   _InspectorDetailsTabControllerState createState() =>
@@ -37,39 +35,30 @@ class _InspectorDetailsTabControllerState
     with TickerProviderStateMixin, AutoDisposeMixin {
   static const _detailsTreeTabIndex = 1;
   static const _tabsLengthWithLayoutExplorer = 2;
-  static const _tabsLengthWithoutLayoutExplorer = 1;
 
-  TabController _tabControllerWithLayoutExplorer;
-  TabController _tabControllerWithoutLayoutExplorer;
+  TabController _tabController;
 
   @override
   void initState() {
     super.initState();
     addAutoDisposeListener(
-      _tabControllerWithLayoutExplorer =
-          TabController(length: _tabsLengthWithLayoutExplorer, vsync: this),
-    );
-    addAutoDisposeListener(
-      _tabControllerWithoutLayoutExplorer =
-          TabController(length: _tabsLengthWithoutLayoutExplorer, vsync: this),
+      _tabController = TabController(
+        length: _tabsLengthWithLayoutExplorer,
+        vsync: this,
+      ),
     );
   }
 
   @override
   Widget build(BuildContext context) {
     final tabs = <Tab>[
-      if (widget.layoutExplorerSupported) _buildTab('Layout Explorer'),
+      _buildTab('Layout Explorer'),
       _buildTab('Widget Details Tree'),
     ];
     final tabViews = <Widget>[
-      if (widget.layoutExplorerSupported)
-        LayoutExplorerTab(controller: widget.controller),
+      LayoutExplorerTab(controller: widget.controller),
       widget.detailsTree,
     ];
-    final _tabController = widget.layoutExplorerSupported
-        ? _tabControllerWithLayoutExplorer
-        : _tabControllerWithoutLayoutExplorer;
-
     final theme = Theme.of(context);
     final focusColor = theme.focusColor;
     final borderSide = BorderSide(color: focusColor);

packages/devtools_app/test/inspector_screen_test.dart

@@ -74,7 +74,8 @@ void main() {
       fakeExtensionManager.fakeFrame();
     }
 
-    testWidgets('builds its tab', (WidgetTester tester) async {
+    testWidgetsWithWindowSize('builds its tab', windowSize,
+        (WidgetTester tester) async {
       await tester.pumpWidget(buildInspectorScreen());
       await tester.pumpAndSettle();
       expect(find.byType(InspectorScreenBody), findsOneWidget);