diff --git a/packages/devtools_app/lib/devtools_app.dart b/packages/devtools_app/lib/devtools_app.dart index 58e62b503a3..5125d710595 100644 --- a/packages/devtools_app/lib/devtools_app.dart +++ b/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_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/inspector/inspector_controller.dart'; +export 'src/screens/inspector/inspector_screen.dart'; +export 'src/screens/inspector/inspector_screen_body.dart'; +export 'src/screens/inspector/inspector_screen_controller.dart'; +export 'src/screens/inspector/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_v2.dart'; +export 'src/shared/console/eval/inspector_tree.dart'; export 'src/shared/console/primitives/simple_items.dart'; export 'src/shared/console/widgets/description.dart'; export 'src/shared/diagnostics/diagnostics_node.dart'; diff --git a/packages/devtools_app/lib/src/app.dart b/packages/devtools_app/lib/src/app.dart index fdbd7804893..d2661868b1b 100644 --- a/packages/devtools_app/lib/src/app.dart +++ b/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_v2/inspector_screen.dart'; -import 'screens/inspector_v2/inspector_screen_controller.dart'; +import 'screens/inspector/inspector_screen.dart'; +import 'screens/inspector/inspector_screen_controller.dart'; import 'screens/logging/logging_controller.dart'; import 'screens/logging/logging_screen.dart'; import 'screens/memory/framework/memory_controller.dart'; @@ -683,8 +683,6 @@ List defaultScreens({ DevToolsScreen( HomeScreen(sampleData: sampleData), ), - // TODO(https://github.com/flutter/devtools/issues/7860): Clean-up after - // Inspector V2 has been released. DevToolsScreen( InspectorScreen(), createController: (_) => InspectorScreenController(), diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart similarity index 99% rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_controller.dart rename to packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart index f8694bc92e6..e1db0b59c2a 100644 --- a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_controller.dart +++ b/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart @@ -26,7 +26,7 @@ import '../../service/service_extensions.dart' as extensions; import '../../shared/analytics/analytics.dart' as ga; import '../../shared/analytics/constants.dart' as gac; import '../../shared/analytics/metrics.dart'; -import '../../shared/console/eval/inspector_tree_v2.dart'; +import '../../shared/console/eval/inspector_tree.dart'; import '../../shared/console/primitives/simple_items.dart'; import '../../shared/diagnostics/diagnostics_node.dart'; import '../../shared/diagnostics/inspector_service.dart'; @@ -397,7 +397,7 @@ class InspectorController extends DisposableController ga.select( gac.inspector, gac.refreshEmptyTree, - screenMetricsProvider: () => InspectorScreenMetrics.v2(), + screenMetricsProvider: () => InspectorScreenMetrics(), ); firstInspectorTreeLoadCompleted = true; } @@ -776,7 +776,7 @@ class InspectorController extends DisposableController ga.select( gac.inspector, gac.onDeviceSelection, - screenMetricsProvider: () => InspectorScreenMetrics.v2(), + screenMetricsProvider: () => InspectorScreenMetrics(), ); } catch (error, st) { if (selectionGroups.next == group) { diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_controls.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart similarity index 90% rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_controls.dart rename to packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart index 2f1e53b922f..cdb8cec00c6 100644 --- a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_controls.dart +++ b/packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart @@ -10,7 +10,6 @@ import 'package:flutter/material.dart'; import '../../service/service_extension_widgets.dart'; import '../../service/service_extensions.dart' as extensions; import '../../shared/analytics/constants.dart' as gac; -import '../../shared/feature_flags.dart'; import '../../shared/globals.dart'; import '../../shared/ui/common_widgets.dart'; import 'inspector_controller.dart'; @@ -30,8 +29,6 @@ class InspectorControls extends StatelessWidget { final activeButtonColor = Theme.of( context, ).colorScheme.activeToggleButtonColor; - final isInspectorV2 = - controller != null && FeatureFlags.inspectorV2.isEnabled; return Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -49,16 +46,13 @@ class InspectorControls extends StatelessWidget { : extensions.toggleOnDeviceWidgetInspector, ], minScreenWidthForText: minScreenWidthForText, - minScreenWidthForTextBeforeTruncating: isInspectorV2 - ? minScreenWidthForTextBeforeTruncating - : null, + minScreenWidthForTextBeforeTruncating: + minScreenWidthForTextBeforeTruncating, ); }, ), - if (isInspectorV2) ...[ - const SizedBox(width: defaultSpacing), - ShowImplementationWidgetsButton(controller: controller!), - ], + const SizedBox(width: defaultSpacing), + ShowImplementationWidgetsButton(controller: controller!), const Spacer(), const SizedBox(width: defaultSpacing), const InspectorServiceExtensionButtonGroup(), diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_data_models.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_data_models.dart similarity index 99% rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_data_models.dart rename to packages/devtools_app/lib/src/screens/inspector/inspector_data_models.dart index 1d166cedad5..188dabd14b6 100644 --- a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_data_models.dart +++ b/packages/devtools_app/lib/src/screens/inspector/inspector_data_models.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -/// @docImport '../inspector_v2/layout_explorer/ui/overflow_indicator_painter.dart'; +/// @docImport '../inspector/layout_explorer/ui/overflow_indicator_painter.dart'; library; import 'dart:math' as math; diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen.dart rename to packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart similarity index 99% rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart rename to packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart index b43e9ff50a9..a112e94250a 100644 --- a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart +++ b/packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart @@ -12,7 +12,7 @@ import 'package:flutter/material.dart'; import '../../shared/analytics/analytics.dart' as ga; import '../../shared/analytics/constants.dart' as gac; import '../../shared/analytics/metrics.dart'; -import '../../shared/console/eval/inspector_tree_v2.dart'; +import '../../shared/console/eval/inspector_tree.dart'; import '../../shared/globals.dart'; import '../../shared/managers/error_badge_manager.dart'; import '../../shared/primitives/blocking_action_mixin.dart'; @@ -206,7 +206,7 @@ class InspectorScreenBodyState extends State ga.select( gac.inspector, gac.refresh, - screenMetricsProvider: () => InspectorScreenMetrics.v2(), + screenMetricsProvider: () => InspectorScreenMetrics(), ); unawaited( blockWhileInProgress(() async { diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_screen_controller.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_controller.dart rename to packages/devtools_app/lib/src/screens/inspector/inspector_screen_controller.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_settings_dialog.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_settings_dialog.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_settings_dialog.dart rename to packages/devtools_app/lib/src/screens/inspector/inspector_settings_dialog.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_tree_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart similarity index 99% rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_tree_controller.dart rename to packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart index a29c12f22e2..4e772e48c1e 100644 --- a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_tree_controller.dart +++ b/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart @@ -16,7 +16,7 @@ import 'package:logging/logging.dart'; import '../../shared/analytics/analytics.dart' as ga; import '../../shared/analytics/constants.dart' as gac; import '../../shared/analytics/metrics.dart'; -import '../../shared/console/eval/inspector_tree_v2.dart'; +import '../../shared/console/eval/inspector_tree.dart'; import '../../shared/console/widgets/description.dart'; import '../../shared/diagnostics/diagnostics_node.dart'; import '../../shared/globals.dart'; @@ -133,7 +133,7 @@ class InspectorTreeController extends DisposableController gac.inspector, gac.inspectorTreeControllerInitialized, nonInteraction: true, - screenMetricsProvider: () => InspectorScreenMetrics.v2( + screenMetricsProvider: () => InspectorScreenMetrics( inspectorTreeControllerId: gaId, rootSetCount: _rootSetCount, rowCount: _rowsInTree.value.length, @@ -181,7 +181,7 @@ class InspectorTreeController extends DisposableController gac.inspector, gac.inspectorTreeControllerRootChange, nonInteraction: true, - screenMetricsProvider: () => InspectorScreenMetrics.v2( + screenMetricsProvider: () => InspectorScreenMetrics( inspectorTreeControllerId: gaId, rootSetCount: ++_rootSetCount, rowCount: _rowsInTree.value.length, @@ -567,7 +567,7 @@ class InspectorTreeController extends DisposableController ga.select( gac.inspector, gac.treeNodeSelection, - screenMetricsProvider: () => InspectorScreenMetrics.v2(), + screenMetricsProvider: () => InspectorScreenMetrics(), ); final diagnostic = node?.diagnostic; if (diagnostic != null && diagnostic.groupIsHidden) { @@ -1156,7 +1156,7 @@ class _InspectorTreeState extends State screenId, gac.pageReady, screenMetricsProvider: () => - InspectorScreenMetrics.v2(rowCount: rows.length), + InspectorScreenMetrics(rowCount: rows.length), ); unawaited( serviceConnection.sendDwdsEvent( @@ -1467,7 +1467,6 @@ class InspectorRowContent extends StatelessWidget { isSelected: row.isSelected, searchValue: searchValue, errorText: error?.errorMessage, - emphasizeNodesFromLocalProject: true, nodeDescriptionHighlightStyle: searchValue.isEmpty || !row.isSearchMatch ? DiagnosticsTextStyles.regular( diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/box/box.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/box/box.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/box/box.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/box/box.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/flex/flex.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/flex.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/flex/flex.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/flex.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/flex/utils.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/utils.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/flex/utils.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/utils.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/arrow.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/arrow.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/dimension.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/dimension.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/dimension.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/dimension.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/free_space.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/free_space.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/free_space.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/free_space.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/layout_explorer_widget.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/layout_explorer_widget.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/layout_explorer_widget.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/layout_explorer_widget.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/overflow_indicator_painter.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/overflow_indicator_painter.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/overflow_indicator_painter.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/overflow_indicator_painter.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/theme.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/theme.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/theme.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/theme.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/utils.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/utils.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/utils.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/utils.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/widget_constraints.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widget_constraints.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/widget_constraints.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widget_constraints.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/widgets_theme.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widgets_theme.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/widgets_theme.dart rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widgets_theme.dart diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/widget_details.dart b/packages/devtools_app/lib/src/screens/inspector/widget_details.dart similarity index 96% rename from packages/devtools_app/lib/src/screens/inspector_v2/widget_details.dart rename to packages/devtools_app/lib/src/screens/inspector/widget_details.dart index cd8ed215c0f..7f12ed522c0 100644 --- a/packages/devtools_app/lib/src/screens/inspector_v2/widget_details.dart +++ b/packages/devtools_app/lib/src/screens/inspector/widget_details.dart @@ -6,7 +6,7 @@ import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/widgets.dart'; -import '../../shared/console/eval/inspector_tree_v2.dart'; +import '../../shared/console/eval/inspector_tree.dart'; import '../../shared/diagnostics/diagnostics_node.dart'; import 'inspector_controller.dart'; import 'layout_explorer/box/box.dart'; diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/widget_properties/properties_view.dart b/packages/devtools_app/lib/src/screens/inspector/widget_properties/properties_view.dart similarity index 100% rename from packages/devtools_app/lib/src/screens/inspector_v2/widget_properties/properties_view.dart rename to packages/devtools_app/lib/src/screens/inspector/widget_properties/properties_view.dart diff --git a/packages/devtools_app/lib/src/screens/logging/logging_controller.dart b/packages/devtools_app/lib/src/screens/logging/logging_controller.dart index 786ff86ead8..da6f1cedf8f 100644 --- a/packages/devtools_app/lib/src/screens/logging/logging_controller.dart +++ b/packages/devtools_app/lib/src/screens/logging/logging_controller.dart @@ -27,7 +27,7 @@ import '../../shared/primitives/message_bus.dart'; import '../../shared/primitives/utils.dart'; import '../../shared/ui/filter.dart'; import '../../shared/ui/search.dart'; -import '../inspector_v2/inspector_tree_controller.dart'; +import '../inspector/inspector_tree_controller.dart'; import 'log_details_controller.dart'; import 'logging_screen.dart'; import 'metadata.dart'; diff --git a/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart b/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart index 635e5ce5a33..aef066c8670 100644 --- a/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart +++ b/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart @@ -200,8 +200,12 @@ class DevToolsAnalyticsEvent { ? screenMetrics.iosBundleId : null, // [InspectorScreenMetrics] + // TODO(https://github.com/flutter/devtools/issues/9563): Remove this + // dimension after dashboards have been updated to not include it. The + // legacy inspector will be removed in Flutter 3.47 (Aug 2026), leaving + // the V2 inspector the only inspector. isV2Inspector: screenMetrics is InspectorScreenMetrics - ? screenMetrics.isV2.toString() + ? true.toString() : null, ); } @@ -371,7 +375,7 @@ class DevToolsAnalyticsException { : null, // [InspectorScreenMetrics] isV2Inspector: screenMetrics is InspectorScreenMetrics - ? screenMetrics.isV2.toString() + ? true.toString() : null, ); } diff --git a/packages/devtools_app/lib/src/shared/analytics/constants.dart b/packages/devtools_app/lib/src/shared/analytics/constants.dart index aaf721b6fbb..3d293268840 100644 --- a/packages/devtools_app/lib/src/shared/analytics/constants.dart +++ b/packages/devtools_app/lib/src/shared/analytics/constants.dart @@ -134,8 +134,6 @@ const vmDeveloperMode = 'vmDeveloperMode'; const wasm = 'wasm'; const verboseLogging = 'verboseLogging'; const inspectorHoverEvalMode = 'inspectorHoverEvalMode'; -const inspectorV2Enabled = 'inspectorV2Enabled'; -const inspectorV2Disabled = 'inspectorV2Disabled'; const inspectorAutoRefreshEnabled = 'inspectorAutoRefreshEnabled'; const clearLogs = 'clearLogs'; const copyLogs = 'copyLogs'; diff --git a/packages/devtools_app/lib/src/shared/analytics/metrics.dart b/packages/devtools_app/lib/src/shared/analytics/metrics.dart index a1be45f256e..70a846566ce 100644 --- a/packages/devtools_app/lib/src/shared/analytics/metrics.dart +++ b/packages/devtools_app/lib/src/shared/analytics/metrics.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -/// @docImport '../../screens/inspector_v2/inspector_tree_controller.dart'; +/// @docImport '../../screens/inspector/inspector_tree_controller.dart'; /// @docImport '../../screens/performance/panes/flutter_frames/flutter_frame_model.dart'; library; @@ -67,18 +67,15 @@ class ProfilerScreenMetrics extends ScreenAnalyticsMetrics { } class InspectorScreenMetrics extends ScreenAnalyticsMetrics { - InspectorScreenMetrics.v2({ + InspectorScreenMetrics({ this.rootSetCount, this.rowCount, this.inspectorTreeControllerId, - }) : isV2 = true; + }); static const summaryTreeGaId = 0; static const detailsTreeGaId = 1; - /// Whether these metrics are for the V2 inspector. - final bool isV2; - /// The number of times the root has been set, since the /// [InspectorTreeController] with id [inspectorTreeControllerId], has been /// initialized. diff --git a/packages/devtools_app/lib/src/shared/console/eval/inspector_tree_v2.dart b/packages/devtools_app/lib/src/shared/console/eval/inspector_tree.dart similarity index 100% rename from packages/devtools_app/lib/src/shared/console/eval/inspector_tree_v2.dart rename to packages/devtools_app/lib/src/shared/console/eval/inspector_tree.dart diff --git a/packages/devtools_app/lib/src/shared/console/widgets/description.dart b/packages/devtools_app/lib/src/shared/console/widgets/description.dart index f7006f910b0..1d914afccd6 100644 --- a/packages/devtools_app/lib/src/shared/console/widgets/description.dart +++ b/packages/devtools_app/lib/src/shared/console/widgets/description.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -/// @docImport '../../../screens/inspector_v2/inspector_tree_controller.dart'; +/// @docImport '../../../screens/inspector/inspector_tree_controller.dart'; library; import 'package:devtools_app_shared/ui.dart'; @@ -17,7 +17,7 @@ import '../../primitives/utils.dart'; import '../../ui/hover.dart'; import '../../ui/icons.dart'; import '../../ui/utils.dart'; -import '../eval/inspector_tree_v2.dart'; +import '../eval/inspector_tree.dart'; import 'expandable_variable.dart'; final _colorIconMaker = ColorIconMaker(); @@ -41,7 +41,6 @@ class DiagnosticsNodeDescription extends StatelessWidget { this.multiline = false, this.style, this.nodeDescriptionHighlightStyle, - this.emphasizeNodesFromLocalProject = false, this.actionLabel, this.actionCallback, this.customDescription, @@ -57,10 +56,6 @@ class DiagnosticsNodeDescription extends StatelessWidget { final bool multiline; final TextStyle? style; final TextStyle? nodeDescriptionHighlightStyle; - // TODO(https://github.com/flutter/devtools/issues/7860): Remove and default - // to true when turning on inspector V2. This is currently true for the V2 - // inspector and false for the legacy inspector. - final bool emphasizeNodesFromLocalProject; final String? actionLabel; final VoidCallback? actionCallback; final String? customDescription; @@ -307,7 +302,10 @@ class DiagnosticsNodeDescription extends StatelessWidget { ); // provide some contrast between the name and description if both are // present. - textStyle = textStyle.merge(theme.subtleTextStyle); + final fontSize = textStyle.fontSize; + textStyle = textStyle.merge( + theme.subtleTextStyle.copyWith(fontSize: fontSize), + ); } if (diagnosticLocal.isCreatedByLocalProject) { @@ -399,21 +397,14 @@ class DiagnosticsNodeDescription extends StatelessWidget { } } - // TODO(https://github.com/flutter/devtools/issues/7860): Remove this - // if-block once the widget details tree is gone. This bolding is only - // used there. - if (!emphasizeNodesFromLocalProject && - !diagnosticLocal.isSummaryTree && - diagnosticLocal.isCreatedByLocalProject) { - textStyle = textStyle.merge(DiagnosticsTextStyles.regularBold); - } - // Grey out nodes that were not created by the local project to emphasize // those that were: - if (emphasizeNodesFromLocalProject && - !diagnosticLocal.isCreatedByLocalProject && + if (!diagnosticLocal.isCreatedByLocalProject && diagnosticLocal.description != '[root]') { - textStyle = textStyle.merge(theme.subtleTextStyle); + final fontSize = textStyle.fontSize; + textStyle = textStyle.merge( + theme.subtleTextStyle.copyWith(fontSize: fontSize), + ); } var diagnosticDescription = buildDescription( diff --git a/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart b/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart index b149944769e..9f07dbbdb40 100644 --- a/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart +++ b/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart @@ -13,7 +13,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:vm_service/vm_service.dart'; -import '../../screens/inspector_v2/inspector_data_models.dart'; +import '../../screens/inspector/inspector_data_models.dart'; import '../primitives/utils.dart'; import '../ui/icons.dart'; import 'object_group_api.dart'; diff --git a/packages/devtools_app/lib/src/shared/feature_flags.dart b/packages/devtools_app/lib/src/shared/feature_flags.dart index a5cef0ca5c2..07882781690 100644 --- a/packages/devtools_app/lib/src/shared/feature_flags.dart +++ b/packages/devtools_app/lib/src/shared/feature_flags.dart @@ -69,14 +69,6 @@ extension FeatureFlags on Never { enabled: enableExperiments, ); - /// Flag to enable the new Inspector panel. - /// - /// https://github.com/flutter/devtools/issues/7854 - static final inspectorV2 = BooleanFeatureFlag( - name: 'inspectorV2', - enabled: true, - ); - /// A set of all the boolean feature flags for debugging purposes. /// /// When adding a new boolean flag, you are responsible for adding it to this @@ -85,7 +77,6 @@ extension FeatureFlags on Never { memorySaveLoad, devToolsExtensions, dapDebugging, - inspectorV2, }; /// A set of all the Flutter channel feature flags for debugging purposes. diff --git a/packages/devtools_app/lib/src/shared/managers/error_badge_manager.dart b/packages/devtools_app/lib/src/shared/managers/error_badge_manager.dart index aadfe082177..16950eb15d6 100644 --- a/packages/devtools_app/lib/src/shared/managers/error_badge_manager.dart +++ b/packages/devtools_app/lib/src/shared/managers/error_badge_manager.dart @@ -11,7 +11,7 @@ import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; import 'package:vm_service/vm_service.dart'; -import '../../screens/inspector_v2/inspector_screen.dart'; +import '../../screens/inspector/inspector_screen.dart'; import '../../screens/logging/logging_screen.dart'; import '../../screens/network/network_screen.dart'; import '../../screens/performance/performance_screen.dart'; diff --git a/packages/devtools_app/lib/src/shared/preferences/preferences.dart b/packages/devtools_app/lib/src/shared/preferences/preferences.dart index 06ee38c5f8b..a15d6d47072 100644 --- a/packages/devtools_app/lib/src/shared/preferences/preferences.dart +++ b/packages/devtools_app/lib/src/shared/preferences/preferences.dart @@ -106,8 +106,6 @@ class PreferencesController extends DisposableController ExtensionsPreferencesController get devToolsExtensions => _extensions; final _extensions = ExtensionsPreferencesController(); - // TODO(https://github.com/flutter/devtools/issues/7860): Clean-up after - // Inspector V2 has been released. InspectorPreferencesController get inspector => _inspector; final _inspector = InspectorPreferencesController(); diff --git a/packages/devtools_app/lib/src/shared/ui/icons.dart b/packages/devtools_app/lib/src/shared/ui/icons.dart index 979cf15a989..9feaa28877e 100644 --- a/packages/devtools_app/lib/src/shared/ui/icons.dart +++ b/packages/devtools_app/lib/src/shared/ui/icons.dart @@ -13,7 +13,7 @@ library; import 'package:devtools_app_shared/ui.dart'; import 'package:flutter/material.dart'; -import '../../screens/inspector_v2/layout_explorer/ui/widgets_theme.dart'; +import '../../screens/inspector/layout_explorer/ui/widgets_theme.dart'; import 'colors.dart'; class CustomIcon extends StatelessWidget { diff --git a/packages/devtools_app/test/screens/inspector_v2/diagnostics_test.dart b/packages/devtools_app/test/screens/inspector/diagnostics_test.dart similarity index 100% rename from packages/devtools_app/test/screens/inspector_v2/diagnostics_test.dart rename to packages/devtools_app/test/screens/inspector/diagnostics_test.dart diff --git a/packages/devtools_app/test/screens/inspector_v2/inspector_error_navigator_test.dart b/packages/devtools_app/test/screens/inspector/inspector_error_navigator_test.dart similarity index 100% rename from packages/devtools_app/test/screens/inspector_v2/inspector_error_navigator_test.dart rename to packages/devtools_app/test/screens/inspector/inspector_error_navigator_test.dart diff --git a/packages/devtools_app/test/screens/inspector_v2/inspector_integration_test.dart b/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart similarity index 94% rename from packages/devtools_app/test/screens/inspector_v2/inspector_integration_test.dart rename to packages/devtools_app/test/screens/inspector/inspector_integration_test.dart index 2e5a7faa4f5..65ab143f45e 100644 --- a/packages/devtools_app/test/screens/inspector_v2/inspector_integration_test.dart +++ b/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart @@ -9,8 +9,9 @@ import 'dart:io'; import 'package:collection/collection.dart'; import 'package:devtools_app/devtools_app.dart'; -import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/ui/utils.dart'; -import 'package:devtools_app/src/screens/inspector_v2/widget_properties/properties_view.dart'; +import 'package:devtools_app/src/screens/inspector/layout_explorer/ui/utils.dart'; +import 'package:devtools_app/src/screens/inspector/widget_properties/properties_view.dart'; +import 'package:devtools_app/src/shared/ui/tab.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/helpers.dart'; @@ -80,7 +81,7 @@ void main() { await expectLater( find.byType(InspectorScreenBody), matchesDevToolsGolden( - '../../test_infra/goldens/integration_inspector_v2_initial_load.png', + '../../test_infra/goldens/integration_inspector_initial_load.png', ), ); }); @@ -110,7 +111,7 @@ void main() { await expectLater( find.byType(InspectorScreenBody), matchesDevToolsGolden( - '../../test_infra/goldens/integration_inspector_v2_after_hot_restart.png', + '../../test_infra/goldens/integration_inspector_after_hot_restart.png', ), ); }, @@ -128,7 +129,7 @@ void main() { await expectLater( find.byType(InspectorScreenBody), matchesDevToolsGolden( - '../../test_infra/goldens/integration_inspector_v2_select_center.png', + '../../test_infra/goldens/integration_inspector_select_center.png', ), ); @@ -170,7 +171,7 @@ void main() { await expectLater( find.byType(InspectorScreenBody), matchesDevToolsGolden( - '../../test_infra/goldens/integration_inspector_v2_implementation_widgets_expanded.png', + '../../test_infra/goldens/integration_inspector_implementation_widgets_expanded.png', ), // Implementation widgets from Flutter framework are not guaranteed to // be stable. @@ -184,7 +185,7 @@ void main() { await expectLater( find.byType(InspectorScreenBody), matchesDevToolsGolden( - '../../test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png', + '../../test_infra/goldens/integration_inspector_hideable_widget_selected.png', ), // Implementation widgets from Flutter framework are not guaranteed to // be stable. @@ -202,7 +203,7 @@ void main() { await expectLater( find.byType(InspectorScreenBody), matchesDevToolsGolden( - '../../test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png', + '../../test_infra/goldens/integration_inspector_implementation_widgets_collapsed.png', ), ); }, @@ -238,7 +239,7 @@ void main() { await expectLater( find.byType(InspectorScreenBody), matchesDevToolsGolden( - '../../test_infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png', + '../../test_infra/goldens/integration_inspector_hideable_widget_selected_from_search.png', ), // Implementation widgets from Flutter framework are not guaranteed to // be stable. @@ -267,7 +268,7 @@ void main() { await expectLater( find.byType(InspectorScreenBody), matchesDevToolsGolden( - '../../test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png', + '../../test_infra/goldens/integration_inspector_implementation_widgets_hidden.png', ), ); @@ -525,7 +526,7 @@ void main() { await expectLater( find.byType(InspectorScreenBody), matchesDevToolsGolden( - '../../test_infra/goldens/integration_inspector_v2_errors_1_initial_load.png', + '../../test_infra/goldens/integration_inspector_errors_1_initial_load.png', ), ); @@ -534,10 +535,18 @@ void main() { await tester.tap(find.byIcon(Icons.keyboard_arrow_down)); await tester.pumpAndSettle(inspectorChangeSettleTime); } + + final flexExplorerTab = find.descendant( + of: find.byType(DevToolsTab), + matching: find.text('Flex explorer'), + ); + await tester.tap(flexExplorerTab); + await tester.pumpAndSettle(inspectorChangeSettleTime); + await expectLater( find.byType(InspectorScreenBody), matchesDevToolsGolden( - '../../test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png', + '../../test_infra/goldens/integration_inspector_errors_2_error_selected.png', ), ); }); diff --git a/packages/devtools_app/test/screens/inspector_v2/inspector_screen_test.dart b/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart similarity index 98% rename from packages/devtools_app/test/screens/inspector_v2/inspector_screen_test.dart rename to packages/devtools_app/test/screens/inspector/inspector_screen_test.dart index 2886318376f..32cebaa6212 100644 --- a/packages/devtools_app/test/screens/inspector_v2/inspector_screen_test.dart +++ b/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart @@ -8,9 +8,9 @@ import 'dart:convert'; import 'package:devtools_app/devtools_app.dart'; -import 'package:devtools_app/src/screens/inspector_v2/inspector_settings_dialog.dart'; -import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/flex/flex.dart'; -import 'package:devtools_app/src/screens/inspector_v2/widget_details.dart'; +import 'package:devtools_app/src/screens/inspector/inspector_settings_dialog.dart'; +import 'package:devtools_app/src/screens/inspector/layout_explorer/flex/flex.dart'; +import 'package:devtools_app/src/screens/inspector/widget_details.dart'; import 'package:devtools_app/src/service/service_extensions.dart' as extensions; import 'package:devtools_app/src/shared/feature_flags.dart'; import 'package:devtools_app/src/shared/ui/tab.dart'; diff --git a/packages/devtools_app/test/screens/inspector_v2/inspector_tree_test.dart b/packages/devtools_app/test/screens/inspector/inspector_tree_test.dart similarity index 100% rename from packages/devtools_app/test/screens/inspector_v2/inspector_tree_test.dart rename to packages/devtools_app/test/screens/inspector/inspector_tree_test.dart diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/arrow_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart similarity index 95% rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/arrow_test.dart rename to packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart index 587958b1752..2b5bf8cf887 100644 --- a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/arrow_test.dart +++ b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/ui/arrow.dart'; +import 'package:devtools_app/src/screens/inspector/layout_explorer/ui/arrow.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -11,7 +11,7 @@ import '../../../../test_infra/matchers/matchers.dart'; void main() { const relativeGoldenPath = - '../../../../test_infra/goldens/inspector_v2/layout_explorer/flex'; + '../../../../test_infra/goldens/inspector/layout_explorer/flex'; group('Arrow Golden Tests', () { group('Unidirectional', () { diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/flex_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart similarity index 98% rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/flex_test.dart rename to packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart index 9c64239ce48..a8b5264ff9c 100644 --- a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/flex_test.dart +++ b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart @@ -4,8 +4,8 @@ import 'dart:convert'; -import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/flex/flex.dart'; -import 'package:devtools_app/src/shared/console/eval/inspector_tree_v2.dart'; +import 'package:devtools_app/src/screens/inspector/layout_explorer/flex/flex.dart'; +import 'package:devtools_app/src/shared/console/eval/inspector_tree.dart'; import 'package:devtools_app/src/shared/diagnostics/diagnostics_node.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; @@ -19,7 +19,7 @@ import '../../../../test_infra/matchers/matchers.dart'; void main() { const windowSize = Size(1750, 1750); const relativeGoldenPath = - '../../../../test_infra/goldens/inspector_v2/layout_explorer/flex'; + '../../../../test_infra/goldens/inspector/layout_explorer/flex'; Map buildDiagnosticsNodeJson(Axis axis) => jsonDecode(''' { diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/inspector_data_models_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart similarity index 98% rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/inspector_data_models_test.dart rename to packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart index 6c8302d73df..a8e0cd0d86a 100644 --- a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/inspector_data_models_test.dart +++ b/packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -import 'package:devtools_app/src/screens/inspector_v2/inspector_data_models.dart'; -import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/ui/theme.dart'; +import 'package:devtools_app/src/screens/inspector/inspector_data_models.dart'; +import 'package:devtools_app/src/screens/inspector/layout_explorer/ui/theme.dart'; import 'package:devtools_app/src/shared/primitives/math_utils.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_serialization_delegate.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_serialization_delegate.dart similarity index 100% rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_serialization_delegate.dart rename to packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_serialization_delegate.dart diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_test_utils.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_test_utils.dart similarity index 100% rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_test_utils.dart rename to packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_test_utils.dart diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/widget_theme_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/widget_theme_test.dart similarity index 89% rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/widget_theme_test.dart rename to packages/devtools_app/test/screens/inspector/layout_explorer/widget_theme_test.dart index 7e3bd1a671f..95beb1f9181 100644 --- a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/widget_theme_test.dart +++ b/packages/devtools_app/test/screens/inspector/layout_explorer/widget_theme_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. -import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/ui/widgets_theme.dart'; +import 'package:devtools_app/src/screens/inspector/layout_explorer/ui/widgets_theme.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/packages/devtools_app/test/screens/inspector_v2/utils/inspector_tree.dart b/packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart similarity index 100% rename from packages/devtools_app/test/screens/inspector_v2/utils/inspector_tree.dart rename to packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart diff --git a/packages/devtools_app/test/shared/managers/error_badge_manager_test.dart b/packages/devtools_app/test/shared/managers/error_badge_manager_test.dart index 13ea5195c21..e5f17d19665 100644 --- a/packages/devtools_app/test/shared/managers/error_badge_manager_test.dart +++ b/packages/devtools_app/test/shared/managers/error_badge_manager_test.dart @@ -4,7 +4,7 @@ import 'package:devtools_app/src/screens/app_size/app_size_screen.dart'; import 'package:devtools_app/src/screens/debugger/debugger_screen.dart'; -import 'package:devtools_app/src/screens/inspector_v2/inspector_screen.dart'; +import 'package:devtools_app/src/screens/inspector/inspector_screen.dart'; import 'package:devtools_app/src/screens/logging/logging_screen.dart'; import 'package:devtools_app/src/screens/memory/framework/memory_screen.dart'; import 'package:devtools_app/src/screens/network/network_screen.dart'; diff --git a/packages/devtools_app/test/shared/primitives/feature_flags_test.dart b/packages/devtools_app/test/shared/primitives/feature_flags_test.dart index f1d6665f953..959e78a5cf5 100644 --- a/packages/devtools_app/test/shared/primitives/feature_flags_test.dart +++ b/packages/devtools_app/test/shared/primitives/feature_flags_test.dart @@ -19,7 +19,6 @@ void main() { expect(FeatureFlags.memorySaveLoad.isEnabled, false); expect(FeatureFlags.devToolsExtensions.isEnabled, isExternalBuild); expect(FeatureFlags.dapDebugging.isEnabled, false); - expect(FeatureFlags.inspectorV2.isEnabled, true); }); group('FlutterChannelFeatureFlag', () { diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png index 3c50814ca9c..600a10545b4 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png and b/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png index 80f0bf9c286..b99de910318 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png and b/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_implementation_widgets_collapsed.png similarity index 100% rename from packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_implementation_widgets_collapsed.png diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_implementation_widgets_hidden.png similarity index 99% rename from packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_implementation_widgets_hidden.png index f1347bd6ecc..088c3c2fdae 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png and b/packages/devtools_app/test/test_infra/goldens/integration_inspector_implementation_widgets_hidden.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png index fc7ac52325f..e8c2b4b62f6 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png and b/packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png index 18394b8db9b..250bceeba33 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png and b/packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_after_hot_restart.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_after_hot_restart.png deleted file mode 100644 index 06631268d43..00000000000 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_after_hot_restart.png and /dev/null differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_animated_physical_model_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_animated_physical_model_selected.png deleted file mode 100644 index 8eefb4fced8..00000000000 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_animated_physical_model_selected.png and /dev/null differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_1_initial_load.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_1_initial_load.png deleted file mode 100644 index 5904b379b54..00000000000 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_1_initial_load.png and /dev/null differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png deleted file mode 100644 index d64b611d80f..00000000000 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png and /dev/null differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png deleted file mode 100644 index 58b46a7b7f3..00000000000 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png and /dev/null differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png deleted file mode 100644 index 58b46a7b7f3..00000000000 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png and /dev/null differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_expanded.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_expanded.png deleted file mode 100644 index 1bf929100dd..00000000000 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_expanded.png and /dev/null differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_initial_load.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_initial_load.png deleted file mode 100644 index 26d0044cf97..00000000000 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_initial_load.png and /dev/null differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_revert_to_legacy.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_revert_to_legacy.png deleted file mode 100644 index 60a194d6b46..00000000000 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_revert_to_legacy.png and /dev/null differ diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_select_center.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_select_center.png deleted file mode 100644 index d2d00d92589..00000000000 Binary files a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_select_center.png and /dev/null differ diff --git a/tool/flutter_customer_tests/test.sh b/tool/flutter_customer_tests/test.sh index 3ab28912ab4..b8b1080dcc0 100755 --- a/tool/flutter_customer_tests/test.sh +++ b/tool/flutter_customer_tests/test.sh @@ -22,5 +22,4 @@ cd ../devtools_app flutter pub get flutter test --tags=include-for-flutter-customer-tests test/ flutter test --exclude-tags=skip-for-flutter-customer-tests test/screens/inspector/ -flutter test --exclude-tags=skip-for-flutter-customer-tests test/screens/inspector_v2/ flutter test --exclude-tags=skip-for-flutter-customer-tests test/shared/