Delete Provider placeholder screen. (#10046) * Delete Provider placeholder screen. * More cleanup * Add release notes
diff --git a/packages/devtools_app/lib/devtools_app.dart b/packages/devtools_app/lib/devtools_app.dart index a2e566a..ca45ced 100644 --- a/packages/devtools_app/lib/devtools_app.dart +++ b/packages/devtools_app/lib/devtools_app.dart
@@ -58,7 +58,6 @@ export 'src/screens/profiler/profiler_screen.dart'; export 'src/screens/profiler/profiler_screen_controller.dart'; export 'src/screens/profiler/sampling_rate.dart'; -export 'src/screens/provider/provider_screen.dart'; export 'src/screens/vm_developer/object_inspector/class_hierarchy_explorer.dart'; export 'src/screens/vm_developer/object_inspector/class_hierarchy_explorer_controller.dart'; export 'src/screens/vm_developer/object_inspector/object_inspector_view_controller.dart';
diff --git a/packages/devtools_app/lib/src/app.dart b/packages/devtools_app/lib/src/app.dart index f1acdf5..73797dd 100644 --- a/packages/devtools_app/lib/src/app.dart +++ b/packages/devtools_app/lib/src/app.dart
@@ -45,7 +45,6 @@ import 'screens/performance/performance_screen.dart'; import 'screens/profiler/profiler_screen.dart'; import 'screens/profiler/profiler_screen_controller.dart'; -import 'screens/provider/provider_screen.dart'; import 'screens/vm_developer/vm_developer_tools_controller.dart'; import 'screens/vm_developer/vm_developer_tools_screen.dart'; import 'service/service_extension_widgets.dart'; @@ -89,20 +88,7 @@ class DevToolsAppState extends State<DevToolsApp> with AutoDisposeMixin { List<Screen> get _screens { if (FeatureFlags.devToolsExtensions.isEnabled) { - // TODO(https://github.com/flutter/devtools/issues/6273): stop special - // casing the package:provider extension. - final containsProviderExtension = extensionService - .currentExtensions - .value - .visibleExtensions - .where((e) => e.name == 'provider') - .isNotEmpty; - final devToolsScreens = containsProviderExtension - ? _originalScreens - .where((s) => s.screenId != ScreenMetaData.provider.id) - .toList() - : _originalScreens; - return [...devToolsScreens, ..._extensionScreens]; + return [..._originalScreens, ..._extensionScreens]; } return _originalScreens; } @@ -726,7 +712,6 @@ AccessibilityScreen(), createController: (_) => AccessibilityController(), ), - DevToolsScreen<DevToolsScreenController>(ProviderScreen()), DevToolsScreen<AppSizeController>( AppSizeScreen(), createController: (_) => AppSizeController(),
diff --git a/packages/devtools_app/lib/src/screens/provider/provider_screen.dart b/packages/devtools_app/lib/src/screens/provider/provider_screen.dart deleted file mode 100644 index 4aa9703..0000000 --- a/packages/devtools_app/lib/src/screens/provider/provider_screen.dart +++ /dev/null
@@ -1,33 +0,0 @@ -// Copyright 2021 The Flutter Authors -// 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_shared/ui.dart'; -import 'package:material_ui/material_ui.dart'; - -import '../../shared/framework/screen.dart'; -import '../../shared/ui/common_widgets.dart'; - -class ProviderScreen extends Screen { - ProviderScreen() : super.fromMetaData(ScreenMetaData.provider); - - @override - Widget buildScreenBody(BuildContext context) { - return CenteredMessage( - richMessage: [ - const TextSpan( - text: - 'The Provider screen is now shipped as a DevTools extension.\n' - 'If you want to use this tool, please upgrade your ', - ), - TextSpan( - text: 'package:provider', - style: Theme.of(context).fixedFontStyle, - ), - const TextSpan( - text: ' dependency to the latest version, and then re-open DevTools.', - ), - ], - ); - } -}
diff --git a/packages/devtools_app/lib/src/shared/framework/screen.dart b/packages/devtools_app/lib/src/shared/framework/screen.dart index eacb7d9..c00f88b 100644 --- a/packages/devtools_app/lib/src/shared/framework/screen.dart +++ b/packages/devtools_app/lib/src/shared/framework/screen.dart
@@ -104,13 +104,6 @@ icon: Icons.accessibility, requiresFlutter: true, ), - provider( - 'provider', - title: 'Provider', - icon: Icons.attach_file, - requiresLibrary: 'package:provider/', - requiresDebugBuild: true, - ), appSize( 'app-size', title: 'App Size', @@ -155,6 +148,7 @@ this.requiresAdvancedDeveloperMode = false, this.supportsWebServerDevice = false, this.worksWithOfflineData = false, + // ignore: unused_element_parameter, this is used in internally. this.requiresLibrary, this.tutorialVideoTimestamp, this.tutorialVideoUrl,
diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart index 55bba25..6b9b230 100644 --- a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart +++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart
@@ -172,10 +172,6 @@ ScreenMetaData.home || ScreenMetaData.debugger || ScreenMetaData.vmTools || - // This screen will be removed from the first party DevTools screens soon. - // If the user depends on package:provider, the provider extension should - // show up in the DevTools extensions list instead. - ScreenMetaData.provider || ScreenMetaData.simple => false, _ => true, };
diff --git a/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md b/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md index e2ef07b..7d47c6b 100644 --- a/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md +++ b/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
@@ -15,7 +15,8 @@ ## General updates -TODO: Remove this section if there are not any updates. +* Remove the legacy Provider screen, which was a placeholder to point users to +the `package:provider` DevTools extension. [#10046](https://github.com/flutter/devtools/pull/10046) ## Inspector updates