Skip to content

Commit 6046c5b

Browse files
ellietteelliette
authored
Rename Inspector V2 --> Inspector (#9796)
1 parent 4141851 commit 6046c5b

66 files changed

Lines changed: 81 additions & 104 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/devtools_app/lib/devtools_app.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ export 'src/screens/deep_link_validation/deep_links_controller.dart';
2424
export 'src/screens/deep_link_validation/deep_links_screen.dart';
2525
export 'src/screens/dtd/dtd_tools_controller.dart';
2626
export 'src/screens/dtd/dtd_tools_screen.dart';
27-
export 'src/screens/inspector_v2/inspector_controller.dart';
28-
export 'src/screens/inspector_v2/inspector_screen.dart';
29-
export 'src/screens/inspector_v2/inspector_screen_body.dart';
30-
export 'src/screens/inspector_v2/inspector_screen_controller.dart';
31-
export 'src/screens/inspector_v2/inspector_tree_controller.dart';
27+
export 'src/screens/inspector/inspector_controller.dart';
28+
export 'src/screens/inspector/inspector_screen.dart';
29+
export 'src/screens/inspector/inspector_screen_body.dart';
30+
export 'src/screens/inspector/inspector_screen_controller.dart';
31+
export 'src/screens/inspector/inspector_tree_controller.dart';
3232
export 'src/screens/logging/log_details_controller.dart';
3333
export 'src/screens/logging/logging_controller.dart';
3434
export 'src/screens/logging/logging_screen.dart';
@@ -76,7 +76,7 @@ export 'src/shared/analytics/analytics_controller.dart';
7676
export 'src/shared/charts/treemap.dart';
7777
export 'src/shared/console/console_service.dart';
7878
export 'src/shared/console/eval/eval_service.dart';
79-
export 'src/shared/console/eval/inspector_tree_v2.dart';
79+
export 'src/shared/console/eval/inspector_tree.dart';
8080
export 'src/shared/console/primitives/simple_items.dart';
8181
export 'src/shared/console/widgets/description.dart';
8282
export 'src/shared/diagnostics/diagnostics_node.dart';

‎packages/devtools_app/lib/src/app.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import 'screens/deep_link_validation/deep_links_controller.dart';
3131
import 'screens/deep_link_validation/deep_links_screen.dart';
3232
import 'screens/dtd/dtd_tools_controller.dart';
3333
import 'screens/dtd/dtd_tools_screen.dart';
34-
import 'screens/inspector_v2/inspector_screen.dart';
35-
import 'screens/inspector_v2/inspector_screen_controller.dart';
34+
import 'screens/inspector/inspector_screen.dart';
35+
import 'screens/inspector/inspector_screen_controller.dart';
3636
import 'screens/logging/logging_controller.dart';
3737
import 'screens/logging/logging_screen.dart';
3838
import 'screens/memory/framework/memory_controller.dart';
@@ -683,8 +683,6 @@ List<DevToolsScreen> defaultScreens({
683683
DevToolsScreen<DevToolsScreenController>(
684684
HomeScreen(sampleData: sampleData),
685685
),
686-
// TODO(https://github.com/flutter/devtools/issues/7860): Clean-up after
687-
// Inspector V2 has been released.
688686
DevToolsScreen<InspectorScreenController>(
689687
InspectorScreen(),
690688
createController: (_) => InspectorScreenController(),

packages/devtools_app/lib/src/screens/inspector_v2/inspector_controller.dart renamed to packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import '../../service/service_extensions.dart' as extensions;
2626
import '../../shared/analytics/analytics.dart' as ga;
2727
import '../../shared/analytics/constants.dart' as gac;
2828
import '../../shared/analytics/metrics.dart';
29-
import '../../shared/console/eval/inspector_tree_v2.dart';
29+
import '../../shared/console/eval/inspector_tree.dart';
3030
import '../../shared/console/primitives/simple_items.dart';
3131
import '../../shared/diagnostics/diagnostics_node.dart';
3232
import '../../shared/diagnostics/inspector_service.dart';
@@ -397,7 +397,7 @@ class InspectorController extends DisposableController
397397
ga.select(
398398
gac.inspector,
399399
gac.refreshEmptyTree,
400-
screenMetricsProvider: () => InspectorScreenMetrics.v2(),
400+
screenMetricsProvider: () => InspectorScreenMetrics(),
401401
);
402402
firstInspectorTreeLoadCompleted = true;
403403
}
@@ -776,7 +776,7 @@ class InspectorController extends DisposableController
776776
ga.select(
777777
gac.inspector,
778778
gac.onDeviceSelection,
779-
screenMetricsProvider: () => InspectorScreenMetrics.v2(),
779+
screenMetricsProvider: () => InspectorScreenMetrics(),
780780
);
781781
} catch (error, st) {
782782
if (selectionGroups.next == group) {

packages/devtools_app/lib/src/screens/inspector_v2/inspector_controls.dart renamed to packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'package:flutter/material.dart';
1010
import '../../service/service_extension_widgets.dart';
1111
import '../../service/service_extensions.dart' as extensions;
1212
import '../../shared/analytics/constants.dart' as gac;
13-
import '../../shared/feature_flags.dart';
1413
import '../../shared/globals.dart';
1514
import '../../shared/ui/common_widgets.dart';
1615
import 'inspector_controller.dart';
@@ -30,8 +29,6 @@ class InspectorControls extends StatelessWidget {
3029
final activeButtonColor = Theme.of(
3130
context,
3231
).colorScheme.activeToggleButtonColor;
33-
final isInspectorV2 =
34-
controller != null && FeatureFlags.inspectorV2.isEnabled;
3532
return Row(
3633
crossAxisAlignment: CrossAxisAlignment.start,
3734
children: [
@@ -49,16 +46,13 @@ class InspectorControls extends StatelessWidget {
4946
: extensions.toggleOnDeviceWidgetInspector,
5047
],
5148
minScreenWidthForText: minScreenWidthForText,
52-
minScreenWidthForTextBeforeTruncating: isInspectorV2
53-
? minScreenWidthForTextBeforeTruncating
54-
: null,
49+
minScreenWidthForTextBeforeTruncating:
50+
minScreenWidthForTextBeforeTruncating,
5551
);
5652
},
5753
),
58-
if (isInspectorV2) ...[
59-
const SizedBox(width: defaultSpacing),
60-
ShowImplementationWidgetsButton(controller: controller!),
61-
],
54+
const SizedBox(width: defaultSpacing),
55+
ShowImplementationWidgetsButton(controller: controller!),
6256
const Spacer(),
6357
const SizedBox(width: defaultSpacing),
6458
const InspectorServiceExtensionButtonGroup(),

packages/devtools_app/lib/src/screens/inspector_v2/inspector_data_models.dart renamed to packages/devtools_app/lib/src/screens/inspector/inspector_data_models.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
44

5-
/// @docImport '../inspector_v2/layout_explorer/ui/overflow_indicator_painter.dart';
5+
/// @docImport '../inspector/layout_explorer/ui/overflow_indicator_painter.dart';
66
library;
77

88
import 'dart:math' as math;

packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen.dart renamed to packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart

File renamed without changes.

packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart renamed to packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'package:flutter/material.dart';
1212
import '../../shared/analytics/analytics.dart' as ga;
1313
import '../../shared/analytics/constants.dart' as gac;
1414
import '../../shared/analytics/metrics.dart';
15-
import '../../shared/console/eval/inspector_tree_v2.dart';
15+
import '../../shared/console/eval/inspector_tree.dart';
1616
import '../../shared/globals.dart';
1717
import '../../shared/managers/error_badge_manager.dart';
1818
import '../../shared/primitives/blocking_action_mixin.dart';
@@ -206,7 +206,7 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
206206
ga.select(
207207
gac.inspector,
208208
gac.refresh,
209-
screenMetricsProvider: () => InspectorScreenMetrics.v2(),
209+
screenMetricsProvider: () => InspectorScreenMetrics(),
210210
);
211211
unawaited(
212212
blockWhileInProgress(() async {

packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_controller.dart renamed to packages/devtools_app/lib/src/screens/inspector/inspector_screen_controller.dart

File renamed without changes.

packages/devtools_app/lib/src/screens/inspector_v2/inspector_settings_dialog.dart renamed to packages/devtools_app/lib/src/screens/inspector/inspector_settings_dialog.dart

File renamed without changes.

packages/devtools_app/lib/src/screens/inspector_v2/inspector_tree_controller.dart renamed to packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import 'package:logging/logging.dart';
1616
import '../../shared/analytics/analytics.dart' as ga;
1717
import '../../shared/analytics/constants.dart' as gac;
1818
import '../../shared/analytics/metrics.dart';
19-
import '../../shared/console/eval/inspector_tree_v2.dart';
19+
import '../../shared/console/eval/inspector_tree.dart';
2020
import '../../shared/console/widgets/description.dart';
2121
import '../../shared/diagnostics/diagnostics_node.dart';
2222
import '../../shared/globals.dart';
@@ -133,7 +133,7 @@ class InspectorTreeController extends DisposableController
133133
gac.inspector,
134134
gac.inspectorTreeControllerInitialized,
135135
nonInteraction: true,
136-
screenMetricsProvider: () => InspectorScreenMetrics.v2(
136+
screenMetricsProvider: () => InspectorScreenMetrics(
137137
inspectorTreeControllerId: gaId,
138138
rootSetCount: _rootSetCount,
139139
rowCount: _rowsInTree.value.length,
@@ -181,7 +181,7 @@ class InspectorTreeController extends DisposableController
181181
gac.inspector,
182182
gac.inspectorTreeControllerRootChange,
183183
nonInteraction: true,
184-
screenMetricsProvider: () => InspectorScreenMetrics.v2(
184+
screenMetricsProvider: () => InspectorScreenMetrics(
185185
inspectorTreeControllerId: gaId,
186186
rootSetCount: ++_rootSetCount,
187187
rowCount: _rowsInTree.value.length,
@@ -567,7 +567,7 @@ class InspectorTreeController extends DisposableController
567567
ga.select(
568568
gac.inspector,
569569
gac.treeNodeSelection,
570-
screenMetricsProvider: () => InspectorScreenMetrics.v2(),
570+
screenMetricsProvider: () => InspectorScreenMetrics(),
571571
);
572572
final diagnostic = node?.diagnostic;
573573
if (diagnostic != null && diagnostic.groupIsHidden) {
@@ -1156,7 +1156,7 @@ class _InspectorTreeState extends State<InspectorTree>
11561156
screenId,
11571157
gac.pageReady,
11581158
screenMetricsProvider: () =>
1159-
InspectorScreenMetrics.v2(rowCount: rows.length),
1159+
InspectorScreenMetrics(rowCount: rows.length),
11601160
);
11611161
unawaited(
11621162
serviceConnection.sendDwdsEvent(
@@ -1467,7 +1467,6 @@ class InspectorRowContent extends StatelessWidget {
14671467
isSelected: row.isSelected,
14681468
searchValue: searchValue,
14691469
errorText: error?.errorMessage,
1470-
emphasizeNodesFromLocalProject: true,
14711470
nodeDescriptionHighlightStyle:
14721471
searchValue.isEmpty || !row.isSearchMatch
14731472
? DiagnosticsTextStyles.regular(

0 commit comments

Comments
 (0)