Skip to content

Commit a7d414d

Browse files
authored
Use consistent widget inspector icon across Flutter and DevTools (#9163)
1 parent f157394 commit a7d414d

24 files changed

+5
-3
lines changed
Binary file not shown.
Binary file not shown.
-904 Bytes
Binary file not shown.

packages/devtools_app/lib/src/service/service_extension_widgets.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,7 @@ class ServiceExtensionIcon extends StatelessWidget {
10781078
: theme.colorScheme.onSurface;
10791079
final description = extensionState.description;
10801080
if (description.iconData != null) {
1081-
return Icon(description.iconData, color: color);
1081+
return Icon(description.iconData, color: color, size: defaultIconSize);
10821082
}
10831083
return Image(
10841084
image: AssetImage(extensionState.description.iconAsset!),

packages/devtools_app/lib/src/service/service_extensions.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
44

55
import 'package:devtools_app_shared/service_extensions.dart' as extensions;
6+
import 'package:flutter/cupertino.dart' show CupertinoIcons;
67
import 'package:flutter/material.dart';
78

89
import '../shared/analytics/constants.dart' as gac;
@@ -444,7 +445,7 @@ final toggleOnDeviceWidgetInspector =
444445
// toggling widget select mode as it is the only way to toggle that mode.
445446
title: 'Select Widget Mode',
446447
shortTitle: 'Select',
447-
iconAsset: 'icons/widget-select-white.png',
448+
iconData: CupertinoIcons.cursor_rays,
448449
gaScreenName: gac.inspector,
449450
gaItem: gac.showOnDeviceInspector,
450451
tooltip: 'Toggle select widget mode',
@@ -458,7 +459,7 @@ final toggleOnDeviceWidgetInspector =
458459
final toggleSelectWidgetMode = ToggleableServiceExtensionDescription<bool>.from(
459460
extensions.toggleSelectWidgetMode,
460461
title: 'Select widget mode',
461-
iconAsset: 'icons/widget-select-white.png',
462+
iconData: CupertinoIcons.cursor_rays,
462463
gaScreenName: gac.inspector,
463464
gaItem: gac.selectWidgetMode,
464465
tooltip: 'Toggle select widget mode',

packages/devtools_app/pubspec.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ resolution: workspace
2020
dependencies:
2121
async: ^2.0.0
2222
collection: ^1.15.0
23+
cupertino_icons: ^1.0.0
2324
dap: ^1.1.0
2425
dds_service_extensions: ^2.0.0
2526
devtools_app_shared:
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)