Repository navigation
Add a platform override dropdown to the Inspector toolbar #10061
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Aadeesh-01
wants to merge
2
commits into
flutter:master
Choose a base branch
from
Aadeesh-01:inspector-platform-toggle
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,7 @@ import '../shared/globals.dart'; | |
| import '../shared/primitives/message_bus.dart'; | ||
| import '../shared/primitives/utils.dart'; | ||
| import '../shared/ui/common_widgets.dart'; | ||
| import '../shared/ui/drop_down_button.dart'; | ||
| import '../shared/ui/hover.dart'; | ||
| import 'service_extensions.dart'; | ||
| import 'service_registrations.dart'; | ||
|
|
@@ -1215,3 +1216,110 @@ class TogglePlatformSelector extends ServiceExtensionSelector { | |
| } | ||
|
|
||
| */ | ||
|
|
||
| /// Dropdown that overrides the target platform of the connected Flutter app | ||
| /// using the [togglePlatformMode] service extension. | ||
| /// | ||
| /// Hidden when the connected app does not expose the service extension, for | ||
| /// example when it runs in profile or release mode. | ||
| class PlatformOverrideDropdown extends StatelessWidget { | ||
| const PlatformOverrideDropdown({super.key}); | ||
|
|
||
| @visibleForTesting | ||
| static const dropdownKey = Key('PlatformOverrideDropdown DropdownButton'); | ||
|
|
||
| static const _fuchsia = 'fuchsia'; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final extensionManager = | ||
| serviceConnection.serviceManager.serviceExtensionManager; | ||
| final extensionName = togglePlatformMode.extension; | ||
| return ValueListenableBuilder<bool>( | ||
| valueListenable: extensionManager.hasServiceExtension(extensionName), | ||
| builder: (context, available, _) { | ||
| if (!available) return const SizedBox.shrink(); | ||
| return ValueListenableBuilder<ServiceExtensionState>( | ||
| valueListenable: extensionManager.getServiceExtensionState( | ||
| extensionName, | ||
| ), | ||
| builder: (context, state, _) { | ||
| // The value is null until DevTools has read it from the app. | ||
| final current = state.value as String?; | ||
| return AnalyticsDropDownButton<String>( | ||
| key: dropdownKey, | ||
| gaScreen: gac.inspector, | ||
| gaDropDownId: gac.togglePlatform, | ||
| message: togglePlatformMode.tooltip, | ||
| isDense: true, | ||
| value: current, | ||
| items: [ | ||
| for (final platform in _platformsToShow(current)) | ||
| _buildMenuItem(platform), | ||
| ], | ||
| onChanged: _onPlatformChanged, | ||
| ); | ||
| }, | ||
| ); | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| /// The platforms to list in the menu. | ||
| /// | ||
| /// This must include [current], or [DropdownButton] throws. | ||
| List<String> _platformsToShow(String? current) { | ||
| final platforms = togglePlatformMode.values; | ||
| return [ | ||
| // Only list Fuchsia when the app is already using it. | ||
| for (final platform in platforms) | ||
| if (platform != _fuchsia || platform == current) platform, | ||
| // The app can report a platform that DevTools does not list yet, such as | ||
| // one added in a newer version of Flutter. | ||
| if (current != null && !platforms.contains(current)) current, | ||
| ]; | ||
| } | ||
|
|
||
| ({DropdownMenuItem<String> item, String gaId}) _buildMenuItem( | ||
| String platform, | ||
| ) { | ||
| final index = togglePlatformMode.values.indexOf(platform); | ||
| final label = index == -1 | ||
| ? platform | ||
| : togglePlatformMode.displayValues[index]; | ||
| return ( | ||
| item: DropdownMenuItem<String>( | ||
| value: platform, | ||
| child: Row( | ||
| mainAxisSize: MainAxisSize.min, | ||
| children: [ | ||
| Icon(_iconFor(platform), size: defaultIconSize), | ||
| const SizedBox(width: densePadding), | ||
| Text(label), | ||
| ], | ||
| ), | ||
| ), | ||
| gaId: platform, | ||
| ); | ||
| } | ||
|
|
||
| static IconData _iconFor(String platform) => switch (platform) { | ||
| 'android' => Icons.android, | ||
| 'iOS' => Icons.phone_iphone, | ||
| 'macOS' => Icons.laptop_mac, | ||
| 'windows' => Icons.desktop_windows, | ||
| _ => Icons.computer, | ||
| }; | ||
|
|
||
| void _onPlatformChanged(String? platform) { | ||
| if (platform == null) return; | ||
| unawaited( | ||
| serviceConnection.serviceManager.serviceExtensionManager | ||
| .setServiceExtensionState( | ||
| togglePlatformMode.extension, | ||
| enabled: true, | ||
| value: platform, | ||
| ), | ||
| ); | ||
|
Comment on lines
+1316
to
+1323
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [CONCERN] Use safeUnawaited(
serviceConnection.serviceManager.serviceExtensionManager
.setServiceExtensionState(
togglePlatformMode.extension,
enabled: true,
value: platform,
),
);References
|
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[CONCERN] Use the
MultiValueListenableBuilderhelper instead of nestingValueListenableBuilders, as recommended by the DevTools Style Guide.References