Google Git Google Git
Sign in
dart/external/github.com/flutter/devtools/405689bc49f9c7ae0d7ca77b3d9b0f698745989b^!/.
commit
405689bc49f9c7ae0d7ca77b3d9b0f698745989b
[log]
author
John Ryan <ryjohn@google.com>
Thu Sep 24 17:39:01 2026 +0000
committer
GitHub <noreply@github.com>
Thu Sep 24 10:39:01 2026 -0700
tree
b6bb0dcf360a2a93ebf443c4684603abda3edca1
parent
bd2f846ff0c86beb325259b7b0ff97c1b61ff58e [diff] 
Migrate from `flutter/material.dart` to `material_ui/material_ui.dart` (#10016)

* Apply dart fix "migrate_design_widgets" for decoupling migration.

This applies the migration using dart fix:

```
dart fix --apply --code=migrate_design_widgets
```

* Update pubspec.lock

* Specify material_ui and cupertino_ui package versions

* Update devtools_app_shared

* Pin package versions, update all packages

* Pin material_ui to ^1.4.0

* Add cupertino_ui to devtools_test

* Remove cupertino_ui from devtools_test

* Add DCM ignore for Flutter SDK import in Flutter apps

* Run dart fix --apply on devtools_test

* Update widget_icons package to material_ui

* Sort imports using dart fix --apply

* Specify material_ui version in example

* Add cupertino_ui to devtools_test with ignore: dependencies

* Fix SidePanel Markdown styling for dark theme and update goldens

Explicitly apply theme text styles to MarkdownStyleSheet in SidePanel
to fix dark theme contrast after migrating to package:material_ui.
Also update the memory diff goldens to match the rendered upload icon.

* Use MaterialUiCompatibilityBridge for markdown side panel

* Add description to ignore

* Increase bundle size benchmark for material_ui
diff --git a/packages/devtools_app/benchmark/test_infra/automators/_cpu_profiler_automator.dart b/packages/devtools_app/benchmark/test_infra/automators/_cpu_profiler_automator.dart
index 565d51b..64d26fc 100644
--- a/packages/devtools_app/benchmark/test_infra/automators/_cpu_profiler_automator.dart
+++ b/packages/devtools_app/benchmark/test_infra/automators/_cpu_profiler_automator.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app/src/screens/profiler/panes/method_table/method_table.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:devtools_test/test_data.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 class CpuProfilerScreenAutomator {
   const CpuProfilerScreenAutomator(this.controller);

diff --git a/packages/devtools_app/benchmark/test_infra/automators/_performance_automator.dart b/packages/devtools_app/benchmark/test_infra/automators/_performance_automator.dart
index fee360f..d334c15 100644
--- a/packages/devtools_app/benchmark/test_infra/automators/_performance_automator.dart
+++ b/packages/devtools_app/benchmark/test_infra/automators/_performance_automator.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:devtools_test/test_data.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 class PerformanceScreenAutomator {
   const PerformanceScreenAutomator(this.controller);

diff --git a/packages/devtools_app/benchmark/test_infra/automators/devtools_automator.dart b/packages/devtools_app/benchmark/test_infra/automators/devtools_automator.dart
index 2dfd7e9..cb9133b 100644
--- a/packages/devtools_app/benchmark/test_infra/automators/devtools_automator.dart
+++ b/packages/devtools_app/benchmark/test_infra/automators/devtools_automator.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_test/helpers.dart';
 import 'package:devtools_test/test_data.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:web_benchmarks/client.dart';
 
 import '../common.dart';

diff --git a/packages/devtools_app/benchmark/test_infra/devtools_recorder.dart b/packages/devtools_app/benchmark/test_infra/devtools_recorder.dart
index f28a871..568cae4 100644
--- a/packages/devtools_app/benchmark/test_infra/devtools_recorder.dart
+++ b/packages/devtools_app/benchmark/test_infra/devtools_recorder.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app/initialization.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:web_benchmarks/client.dart';
 
 import 'automators/devtools_automator.dart';

diff --git a/packages/devtools_app/benchmark/web_bundle_size_test.dart b/packages/devtools_app/benchmark/web_bundle_size_test.dart
index 20f7a7f..f9fa08f 100644
--- a/packages/devtools_app/benchmark/web_bundle_size_test.dart
+++ b/packages/devtools_app/benchmark/web_bundle_size_test.dart

@@ -11,8 +11,8 @@
 import 'package:test/test.dart';
 
 // Benchmark size in kB.
-const bundleSizeBenchmark = 5800;
-const gzipBundleSizeBenchmark = 1700;
+const bundleSizeBenchmark = 6000;
+const gzipBundleSizeBenchmark = 1750;
 
 void main() {
   group('Web Compile', () {

diff --git a/packages/devtools_app/integration_test/test/live_connection/debugger_panel_test.dart b/packages/devtools_app/integration_test/test/live_connection/debugger_panel_test.dart
index 5321b55..7f6a7a5 100644
--- a/packages/devtools_app/integration_test/test/live_connection/debugger_panel_test.dart
+++ b/packages/devtools_app/integration_test/test/live_connection/debugger_panel_test.dart

@@ -9,9 +9,9 @@
 import 'package:devtools_app/src/service/service_extension_widgets.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:devtools_test/integration_test.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 // To run the test while connected to a flutter-tester device:
 // dart run integration_test/run_tests.dart --target=integration_test/test/live_connection/debugger_panel_test.dart

diff --git a/packages/devtools_app/integration_test/test/live_connection/devtools_extensions_test.dart b/packages/devtools_app/integration_test/test/live_connection/devtools_extensions_test.dart
index 2792f16..7003f05 100644
--- a/packages/devtools_app/integration_test/test/live_connection/devtools_extensions_test.dart
+++ b/packages/devtools_app/integration_test/test/live_connection/devtools_extensions_test.dart

@@ -19,9 +19,9 @@
 import 'package:devtools_shared/devtools_extensions.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:devtools_test/integration_test.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 // To run:
 // dart run integration_test/run_tests.dart --target=integration_test/test/live_connection/devtools_extensions_test.dart

diff --git a/packages/devtools_app/integration_test/test/live_connection/memory_screen_helpers.dart b/packages/devtools_app/integration_test/test/live_connection/memory_screen_helpers.dart
index 2753d97..8699bf3 100644
--- a/packages/devtools_app/integration_test/test/live_connection/memory_screen_helpers.dart
+++ b/packages/devtools_app/integration_test/test/live_connection/memory_screen_helpers.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app/src/screens/memory/panes/control/widgets/primary_controls.dart';
 import 'package:devtools_app/src/screens/memory/panes/diff/widgets/snapshot_list.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// Prepares the UI of the memory screen for an integration test.
 Future<void> prepareMemoryUI(

diff --git a/packages/devtools_app/integration_test/test/live_connection/performance_screen_event_recording_test.dart b/packages/devtools_app/integration_test/test/live_connection/performance_screen_event_recording_test.dart
index dd34a1c..f311f43 100644
--- a/packages/devtools_app/integration_test/test/live_connection/performance_screen_event_recording_test.dart
+++ b/packages/devtools_app/integration_test/test/live_connection/performance_screen_event_recording_test.dart

@@ -6,9 +6,9 @@
 import 'package:devtools_app/src/screens/performance/panes/timeline_events/timeline_events_view.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:devtools_test/integration_test.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service_protos/vm_service_protos.dart';
 
 // To run:

diff --git a/packages/devtools_app/integration_test/test/offline/perfetto_test.dart b/packages/devtools_app/integration_test/test/offline/perfetto_test.dart
index f2fb3c3..185b266 100644
--- a/packages/devtools_app/integration_test/test/offline/perfetto_test.dart
+++ b/packages/devtools_app/integration_test/test/offline/perfetto_test.dart

@@ -7,9 +7,9 @@
 import 'package:devtools_test/helpers.dart';
 import 'package:devtools_test/integration_test.dart';
 import 'package:devtools_test/test_data.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 // To run:
 // dart run integration_test/run_tests.dart --target=integration_test/test/offline/perfetto_test.dart

diff --git a/packages/devtools_app/lib/initialization.dart b/packages/devtools_app/lib/initialization.dart
index 1696215..d721615 100644
--- a/packages/devtools_app/lib/initialization.dart
+++ b/packages/devtools_app/lib/initialization.dart

@@ -5,8 +5,8 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'src/app.dart';
 import 'src/framework/framework_core.dart';

diff --git a/packages/devtools_app/lib/src/app.dart b/packages/devtools_app/lib/src/app.dart
index b948d84..f1acdf5 100644
--- a/packages/devtools_app/lib/src/app.dart
+++ b/packages/devtools_app/lib/src/app.dart

@@ -12,7 +12,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 
 import 'extensions/extension_screen.dart';
@@ -475,22 +475,27 @@
             message: 'Uh-oh, something went wrong. Please refresh the page.',
           );
         }
-        return MultiProvider(
-          providers: [
-            Provider<AnalyticsController>.value(
-              value: widget.analyticsController,
-            ),
-            Provider<HoverCardController>.value(value: hoverCardController),
-            Provider<ReleaseNotesController>.value(
-              value: releaseNotesController,
-            ),
-          ],
-          child: NotificationsView(
-            child: ReleaseNotesViewer(
-              controller: releaseNotesController,
-              child: DisconnectObserver(
-                routerDelegate: routerDelegate,
-                child: child,
+        // TODO(ryjohn): Upgrade to package:flutter_markdown_plus and stop using
+        // MaterialUiCompatibilityBridge when it switches to package:material_ui.
+        // ignore: deprecated_member_use
+        return MaterialUiCompatibilityBridge(
+          child: MultiProvider(
+            providers: [
+              Provider<AnalyticsController>.value(
+                value: widget.analyticsController,
+              ),
+              Provider<HoverCardController>.value(value: hoverCardController),
+              Provider<ReleaseNotesController>.value(
+                value: releaseNotesController,
+              ),
+            ],
+            child: NotificationsView(
+              child: ReleaseNotesViewer(
+                controller: releaseNotesController,
+                child: DisconnectObserver(
+                  routerDelegate: routerDelegate,
+                  child: child,
+                ),
               ),
             ),
           ),

diff --git a/packages/devtools_app/lib/src/extensions/embedded/_view_desktop.dart b/packages/devtools_app/lib/src/extensions/embedded/_view_desktop.dart
index 051461b..bdada54 100644
--- a/packages/devtools_app/lib/src/extensions/embedded/_view_desktop.dart
+++ b/packages/devtools_app/lib/src/extensions/embedded/_view_desktop.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'controller.dart';
 

diff --git a/packages/devtools_app/lib/src/extensions/embedded/_view_web.dart b/packages/devtools_app/lib/src/extensions/embedded/_view_web.dart
index 7901753..fd7ffde 100644
--- a/packages/devtools_app/lib/src/extensions/embedded/_view_web.dart
+++ b/packages/devtools_app/lib/src/extensions/embedded/_view_web.dart

@@ -10,7 +10,7 @@
 import 'package:devtools_extensions/api.dart';
 import 'package:devtools_extensions/utils.dart';
 import 'package:devtools_shared/devtools_shared.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:web/web.dart';
 
 import '../../shared/config_specific/copy_to_clipboard/copy_to_clipboard.dart';

diff --git a/packages/devtools_app/lib/src/extensions/embedded/view.dart b/packages/devtools_app/lib/src/extensions/embedded/view.dart
index f8563f4..6fa5e13 100644
--- a/packages/devtools_app/lib/src/extensions/embedded/view.dart
+++ b/packages/devtools_app/lib/src/extensions/embedded/view.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/extensions/extension_screen.dart b/packages/devtools_app/lib/src/extensions/extension_screen.dart
index 3d0bb61..b899197 100644
--- a/packages/devtools_app/lib/src/extensions/extension_screen.dart
+++ b/packages/devtools_app/lib/src/extensions/extension_screen.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_extensions/api.dart';
 import 'package:devtools_shared/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../shared/analytics/analytics.dart' as ga;
 import '../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/extensions/extension_screen_controls.dart b/packages/devtools_app/lib/src/extensions/extension_screen_controls.dart
index 813e183..a235f91 100644
--- a/packages/devtools_app/lib/src/extensions/extension_screen_controls.dart
+++ b/packages/devtools_app/lib/src/extensions/extension_screen_controls.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_shared/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:pointer_interceptor/pointer_interceptor.dart';
 
 import '../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/extensions/extension_settings.dart b/packages/devtools_app/lib/src/extensions/extension_settings.dart
index fa2dd8a..6bd82fd 100644
--- a/packages/devtools_app/lib/src/extensions/extension_settings.dart
+++ b/packages/devtools_app/lib/src/extensions/extension_settings.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_shared/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../shared/analytics/analytics.dart' as ga;
 import '../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/framework/home_screen.dart b/packages/devtools_app/lib/src/framework/home_screen.dart
index 6da52cb..08b99ab 100644
--- a/packages/devtools_app/lib/src/framework/home_screen.dart
+++ b/packages/devtools_app/lib/src/framework/home_screen.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_shared/devtools_shared.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 
 import '../service/connected_app/connection_info.dart';

diff --git a/packages/devtools_app/lib/src/framework/initializer.dart b/packages/devtools_app/lib/src/framework/initializer.dart
index 8bc2760..817efc6 100644
--- a/packages/devtools_app/lib/src/framework/initializer.dart
+++ b/packages/devtools_app/lib/src/framework/initializer.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../service/connected_app/connection_info.dart';
 import '../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/framework/notifications_view.dart b/packages/devtools_app/lib/src/framework/notifications_view.dart
index e3c2331..23e8a14 100644
--- a/packages/devtools_app/lib/src/framework/notifications_view.dart
+++ b/packages/devtools_app/lib/src/framework/notifications_view.dart

@@ -6,8 +6,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../shared/globals.dart';
 import '../shared/managers/notifications.dart';

diff --git a/packages/devtools_app/lib/src/framework/observer/disconnect_observer.dart b/packages/devtools_app/lib/src/framework/observer/disconnect_observer.dart
index 8a46105..bef72ff 100644
--- a/packages/devtools_app/lib/src/framework/observer/disconnect_observer.dart
+++ b/packages/devtools_app/lib/src/framework/observer/disconnect_observer.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../service/connected_app/connection_info.dart';
 import '../../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/framework/observer/memory_observer.dart b/packages/devtools_app/lib/src/framework/observer/memory_observer.dart
index 9618a6d..b1e2d26 100644
--- a/packages/devtools_app/lib/src/framework/observer/memory_observer.dart
+++ b/packages/devtools_app/lib/src/framework/observer/memory_observer.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/framework/release_notes.dart b/packages/devtools_app/lib/src/framework/release_notes.dart
index f7632c6..a4d6a8d 100644
--- a/packages/devtools_app/lib/src/framework/release_notes.dart
+++ b/packages/devtools_app/lib/src/framework/release_notes.dart

@@ -8,9 +8,9 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_shared/devtools_shared.dart';
-import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../shared/primitives/url_utils.dart';
 import '../shared/server/server.dart' as server;

diff --git a/packages/devtools_app/lib/src/framework/scaffold/about_dialog.dart b/packages/devtools_app/lib/src/framework/scaffold/about_dialog.dart
index 2a31c09..b86833d 100644
--- a/packages/devtools_app/lib/src/framework/scaffold/about_dialog.dart
+++ b/packages/devtools_app/lib/src/framework/scaffold/about_dialog.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/framework/scaffold/app_bar.dart b/packages/devtools_app/lib/src/framework/scaffold/app_bar.dart
index 55ba391..72baad3 100644
--- a/packages/devtools_app/lib/src/framework/scaffold/app_bar.dart
+++ b/packages/devtools_app/lib/src/framework/scaffold/app_bar.dart

@@ -5,7 +5,7 @@
 import 'dart:math' as math;
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:pointer_interceptor/pointer_interceptor.dart';
 
 import '../../shared/framework/screen.dart';

diff --git a/packages/devtools_app/lib/src/framework/scaffold/bottom_pane.dart b/packages/devtools_app/lib/src/framework/scaffold/bottom_pane.dart
index bba85e2..8b1e5bb 100644
--- a/packages/devtools_app/lib/src/framework/scaffold/bottom_pane.dart
+++ b/packages/devtools_app/lib/src/framework/scaffold/bottom_pane.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/ui/tab.dart';
 

diff --git a/packages/devtools_app/lib/src/framework/scaffold/report_feedback_button.dart b/packages/devtools_app/lib/src/framework/scaffold/report_feedback_button.dart
index 447fc32..252c62c 100644
--- a/packages/devtools_app/lib/src/framework/scaffold/report_feedback_button.dart
+++ b/packages/devtools_app/lib/src/framework/scaffold/report_feedback_button.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/framework/scaffold/scaffold.dart b/packages/devtools_app/lib/src/framework/scaffold/scaffold.dart
index 0b09230..90b3e88 100644
--- a/packages/devtools_app/lib/src/framework/scaffold/scaffold.dart
+++ b/packages/devtools_app/lib/src/framework/scaffold/scaffold.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/shared.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 
 import '../../app.dart';

diff --git a/packages/devtools_app/lib/src/framework/scaffold/settings_dialog.dart b/packages/devtools_app/lib/src/framework/scaffold/settings_dialog.dart
index 6bef59f..b957df2 100644
--- a/packages/devtools_app/lib/src/framework/scaffold/settings_dialog.dart
+++ b/packages/devtools_app/lib/src/framework/scaffold/settings_dialog.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 
 import '../../shared/analytics/analytics_controller.dart';

diff --git a/packages/devtools_app/lib/src/framework/scaffold/status_line.dart b/packages/devtools_app/lib/src/framework/scaffold/status_line.dart
index 114444d..a292d6e 100644
--- a/packages/devtools_app/lib/src/framework/scaffold/status_line.dart
+++ b/packages/devtools_app/lib/src/framework/scaffold/status_line.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/accessibility/accessibility_screen.dart b/packages/devtools_app/lib/src/screens/accessibility/accessibility_screen.dart
index 2134b20..f32e71e 100644
--- a/packages/devtools_app/lib/src/screens/accessibility/accessibility_screen.dart
+++ b/packages/devtools_app/lib/src/screens/accessibility/accessibility_screen.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/framework/screen.dart';
 import '../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/accessibility/overrides_pane.dart b/packages/devtools_app/lib/src/screens/accessibility/overrides_pane.dart
index f50ee3a..9e2555a 100644
--- a/packages/devtools_app/lib/src/screens/accessibility/overrides_pane.dart
+++ b/packages/devtools_app/lib/src/screens/accessibility/overrides_pane.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/globals.dart';
 import '../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/accessibility/semantics_tree_pane.dart b/packages/devtools_app/lib/src/screens/accessibility/semantics_tree_pane.dart
index 9b97007..4e58065 100644
--- a/packages/devtools_app/lib/src/screens/accessibility/semantics_tree_pane.dart
+++ b/packages/devtools_app/lib/src/screens/accessibility/semantics_tree_pane.dart

@@ -5,7 +5,7 @@
 import 'dart:ui' show SemanticsFlag;
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart b/packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart
index f328979..68bce8a 100644
--- a/packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart
+++ b/packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_snapshot_analysis/precompiler_trace.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/screens/app_size/app_size_table.dart b/packages/devtools_app/lib/src/screens/app_size/app_size_table.dart
index 9e06c28..3386b17 100644
--- a/packages/devtools_app/lib/src/screens/app_size/app_size_table.dart
+++ b/packages/devtools_app/lib/src/screens/app_size/app_size_table.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/charts/treemap.dart';
 import '../../shared/primitives/byte_utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/app_size/code_size_attribution.dart b/packages/devtools_app/lib/src/screens/app_size/code_size_attribution.dart
index 739905b..913e46a 100644
--- a/packages/devtools_app/lib/src/screens/app_size/code_size_attribution.dart
+++ b/packages/devtools_app/lib/src/screens/app_size/code_size_attribution.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_snapshot_analysis/precompiler_trace.dart';
 import 'package:vm_snapshot_analysis/program_info.dart';
 

diff --git a/packages/devtools_app/lib/src/screens/debugger/breakpoints.dart b/packages/devtools_app/lib/src/screens/debugger/breakpoints.dart
index b54f602..7dab8a2 100644
--- a/packages/devtools_app/lib/src/screens/debugger/breakpoints.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/breakpoints.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart' hide Badge;
+import 'package:material_ui/material_ui.dart' hide Badge;
 
 import '../../shared/globals.dart';
 import '../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/debugger/call_stack.dart b/packages/devtools_app/lib/src/screens/debugger/call_stack.dart
index eaa2d23..0aafe12 100644
--- a/packages/devtools_app/lib/src/screens/debugger/call_stack.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/call_stack.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart' hide Stack;
+import 'package:material_ui/material_ui.dart' hide Stack;
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/debugger/codeview.dart b/packages/devtools_app/lib/src/screens/debugger/codeview.dart
index d5f1ebd..53c83c8 100644
--- a/packages/devtools_app/lib/src/screens/debugger/codeview.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/codeview.dart

@@ -8,10 +8,10 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart' hide Stack;
 
 import '../../shared/console/widgets/expandable_variable.dart';

diff --git a/packages/devtools_app/lib/src/screens/debugger/common.dart b/packages/devtools_app/lib/src/screens/debugger/common.dart
index 8ef93fb..fab3c2b 100644
--- a/packages/devtools_app/lib/src/screens/debugger/common.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/common.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// Create a header area for a debugger component.
 ///

diff --git a/packages/devtools_app/lib/src/screens/debugger/controls.dart b/packages/devtools_app/lib/src/screens/debugger/controls.dart
index 44e211c..206ce4b 100644
--- a/packages/devtools_app/lib/src/screens/debugger/controls.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/controls.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart' hide Stack;
+import 'package:material_ui/material_ui.dart' hide Stack;
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart b/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart
index 8074517..7972a8e 100644
--- a/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart' hide Stack;
 import 'package:flutter/scheduler.dart';
+import 'package:material_ui/material_ui.dart' hide Stack;
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/screens/debugger/file_search.dart b/packages/devtools_app/lib/src/screens/debugger/file_search.dart
index f32f6e5..dd944a1 100644
--- a/packages/devtools_app/lib/src/screens/debugger/file_search.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/file_search.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/debugger/key_sets.dart b/packages/devtools_app/lib/src/screens/debugger/key_sets.dart
index 9efc9bd..d77a4a7 100644
--- a/packages/devtools_app/lib/src/screens/debugger/key_sets.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/key_sets.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:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/config_specific/host_platform/host_platform.dart';
 import '../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/debugger/program_explorer.dart b/packages/devtools_app/lib/src/screens/debugger/program_explorer.dart
index dc602fa..71e6d96 100644
--- a/packages/devtools_app/lib/src/screens/debugger/program_explorer.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/program_explorer.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart' hide Stack;
 
 import '../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/debugger/syntax_highlighter.dart b/packages/devtools_app/lib/src/screens/debugger/syntax_highlighter.dart
index 80db5b5..c76af32 100644
--- a/packages/devtools_app/lib/src/screens/debugger/syntax_highlighter.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/syntax_highlighter.dart

@@ -5,9 +5,9 @@
 import 'dart:collection';
 import 'dart:convert';
 
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show rootBundle;
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/primitives/utils.dart';
 import '../../shared/ui/colors.dart';

diff --git a/packages/devtools_app/lib/src/screens/debugger/variables.dart b/packages/devtools_app/lib/src/screens/debugger/variables.dart
index 6eda6ad..4f346c1 100644
--- a/packages/devtools_app/lib/src/screens/debugger/variables.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/variables.dart

@@ -7,7 +7,7 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart' hide Stack;
+import 'package:material_ui/material_ui.dart' hide Stack;
 
 import '../../shared/console/widgets/display_provider.dart';
 import '../../shared/diagnostics/dap_object_node.dart';

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_link_list_view.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_link_list_view.dart
index 30ef0e5..a6130c8 100644
--- a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_link_list_view.dart
+++ b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_link_list_view.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/globals.dart';
 import '../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart
index 4464b8c..992798d 100644
--- a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart
+++ b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_shared/devtools_deeplink.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_model.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_model.dart
index 7d035f1..2eae88e 100644
--- a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_model.dart
+++ b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_model.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_shared/devtools_deeplink.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/primitives/utils.dart';
 import '../../shared/table/table.dart';

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_screen.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_screen.dart
index a541109..d8556a8 100644
--- a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_screen.dart
+++ b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_screen.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/root_selector.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/root_selector.dart
index 891ebc1..33085ce 100644
--- a/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/root_selector.dart
+++ b/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/root_selector.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/primitives/utils.dart';
 import '../../../shared/ui/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/select_project_view.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/select_project_view.dart
index d022c47..da49086 100644
--- a/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/select_project_view.dart
+++ b/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/select_project_view.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_shared/devtools_deeplink.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/analytics/analytics.dart' as ga;
 import '../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/validation_details_view.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/validation_details_view.dart
index cd5c3d9..1fb5fd1 100644
--- a/packages/devtools_app/lib/src/screens/deep_link_validation/validation_details_view.dart
+++ b/packages/devtools_app/lib/src/screens/deep_link_validation/validation_details_view.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/ui/colors.dart';
 import '../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/dtd/dtd_tools_screen.dart b/packages/devtools_app/lib/src/screens/dtd/dtd_tools_screen.dart
index 46779d2..cf74e65 100644
--- a/packages/devtools_app/lib/src/screens/dtd/dtd_tools_screen.dart
+++ b/packages/devtools_app/lib/src/screens/dtd/dtd_tools_screen.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:dtd/dtd.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/development_helpers.dart';
 import '../../shared/framework/screen.dart';

diff --git a/packages/devtools_app/lib/src/screens/dtd/events.dart b/packages/devtools_app/lib/src/screens/dtd/events.dart
index e00539f..ac34dcb 100644
--- a/packages/devtools_app/lib/src/screens/dtd/events.dart
+++ b/packages/devtools_app/lib/src/screens/dtd/events.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:dtd/dtd.dart' show DartToolingDaemon, DTDEvent;
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'dtd_tools_model.dart';
 import 'shared.dart';

diff --git a/packages/devtools_app/lib/src/screens/dtd/services.dart b/packages/devtools_app/lib/src/screens/dtd/services.dart
index 8ff13fa..76c98ba 100644
--- a/packages/devtools_app/lib/src/screens/dtd/services.dart
+++ b/packages/devtools_app/lib/src/screens/dtd/services.dart

@@ -3,7 +3,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:dtd/dtd.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/globals.dart';
 import '../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart
index bf772c4..a5a6783 100644
--- a/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart

@@ -18,8 +18,8 @@
 
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../service/service_extensions.dart' as extensions;

diff --git a/packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart
index cdb8cec..951a93f 100644
--- a/packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../service/service_extension_widgets.dart';
 import '../../service/service_extensions.dart' as extensions;

diff --git a/packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart
index 9db58fa..799abb0 100644
--- a/packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/shared.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/framework/screen.dart';
 import '../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart
index 67403c5..855e57a 100644
--- a/packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart

@@ -7,7 +7,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/inspector/inspector_settings_dialog.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_settings_dialog.dart
index a185822..8401ec5 100644
--- a/packages/devtools_app/lib/src/screens/inspector/inspector_settings_dialog.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_settings_dialog.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart' hide Stack;
 
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart
index fee0b94..f8d785a 100644
--- a/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart

@@ -9,9 +9,9 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/box/box.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/box/box.dart
index b11a6ff..fbd2d02 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/box/box.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/box/box.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/diagnostics/diagnostics_node.dart';
 import '../../../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/flex.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/flex.dart
index dd16fde..964f30f 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/flex.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/flex.dart

@@ -6,7 +6,7 @@
 import 'dart:math' as math;
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/diagnostics/diagnostics_node.dart';
 import '../../../../shared/diagnostics/inspector_service.dart';

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/utils.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/utils.dart
index 5e67d1e..a6dcd6e 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/utils.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/utils.dart

@@ -4,8 +4,8 @@
 
 import 'dart:ui';
 
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../inspector_data_models.dart';
 import '../ui/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart
index 6035809..786a96e 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart

@@ -5,7 +5,7 @@
 import 'dart:math';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 const defaultArrowColor = Colors.white;
 const defaultArrowStrokeWidth = 2.0;

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/dimension.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/dimension.dart
index 7dfb1b8..fec202b 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/dimension.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/dimension.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'theme.dart';
 

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/free_space.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/free_space.dart
index aeb3766..7801196 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/free_space.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/free_space.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/primitives/utils.dart';
 import '../../inspector_data_models.dart';

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/layout_explorer_widget.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/layout_explorer_widget.dart
index 9c8bf18..d1392f2 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/layout_explorer_widget.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/layout_explorer_widget.dart

@@ -5,8 +5,8 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/diagnostics/diagnostics_node.dart';
 import '../../../../shared/diagnostics/inspector_service.dart';

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/theme.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/theme.dart
index 4a1b947..80626ff 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/theme.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/theme.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 const margin = 6.0;
 

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/utils.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/utils.dart
index 859b650..40ca5f4 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/utils.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/utils.dart

@@ -5,7 +5,7 @@
 import 'dart:ui';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/diagnostics/diagnostics_node.dart';
 import '../../../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widget_constraints.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widget_constraints.dart
index 465a2cb..87e8e5c 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widget_constraints.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widget_constraints.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/primitives/math_utils.dart';
 import '../../../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widgets_theme.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widgets_theme.dart
index c0a7688..c78d205 100644
--- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widgets_theme.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widgets_theme.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 class WidgetTheme {
   const WidgetTheme({this.iconAsset, this.color = otherWidgetColor});

diff --git a/packages/devtools_app/lib/src/screens/inspector/widget_properties/properties_view.dart b/packages/devtools_app/lib/src/screens/inspector/widget_properties/properties_view.dart
index 9a339db..49b0bce 100644
--- a/packages/devtools_app/lib/src/screens/inspector/widget_properties/properties_view.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/widget_properties/properties_view.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/analytics/constants.dart' as gac;
 import '../../../shared/console/widgets/description.dart';

diff --git a/packages/devtools_app/lib/src/screens/logging/_log_details.dart b/packages/devtools_app/lib/src/screens/logging/_log_details.dart
index 19cba66..452293c 100644
--- a/packages/devtools_app/lib/src/screens/logging/_log_details.dart
+++ b/packages/devtools_app/lib/src/screens/logging/_log_details.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/globals.dart';
 import '../../shared/preferences/preferences.dart';

diff --git a/packages/devtools_app/lib/src/screens/logging/_logs_table.dart b/packages/devtools_app/lib/src/screens/logging/_logs_table.dart
index 2643f2f..2895215 100644
--- a/packages/devtools_app/lib/src/screens/logging/_logs_table.dart
+++ b/packages/devtools_app/lib/src/screens/logging/_logs_table.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/primitives/utils.dart';
 import '../../shared/table/table.dart';

diff --git a/packages/devtools_app/lib/src/screens/logging/_message_column.dart b/packages/devtools_app/lib/src/screens/logging/_message_column.dart
index 96a6c91..ead7f9f 100644
--- a/packages/devtools_app/lib/src/screens/logging/_message_column.dart
+++ b/packages/devtools_app/lib/src/screens/logging/_message_column.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/primitives/utils.dart';
 import '../../shared/table/table.dart';

diff --git a/packages/devtools_app/lib/src/screens/logging/logging_controls.dart b/packages/devtools_app/lib/src/screens/logging/logging_controls.dart
index ff52b5c..4b34c82 100644
--- a/packages/devtools_app/lib/src/screens/logging/logging_controls.dart
+++ b/packages/devtools_app/lib/src/screens/logging/logging_controls.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../service/service_extension_widgets.dart';
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/logging/logging_screen.dart b/packages/devtools_app/lib/src/screens/logging/logging_screen.dart
index 87adeca..cc4901a 100644
--- a/packages/devtools_app/lib/src/screens/logging/logging_screen.dart
+++ b/packages/devtools_app/lib/src/screens/logging/logging_screen.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/logging/metadata.dart b/packages/devtools_app/lib/src/screens/logging/metadata.dart
index 081762c..7e07b94 100644
--- a/packages/devtools_app/lib/src/screens/logging/metadata.dart
+++ b/packages/devtools_app/lib/src/screens/logging/metadata.dart

@@ -6,8 +6,8 @@
 
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart' show EventKind;
 
 import '../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/framework/memory_screen.dart b/packages/devtools_app/lib/src/screens/memory/framework/memory_screen.dart
index cd6dccf..e215fb2 100644
--- a/packages/devtools_app/lib/src/screens/memory/framework/memory_screen.dart
+++ b/packages/devtools_app/lib/src/screens/memory/framework/memory_screen.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/shared.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/analytics/analytics.dart' as ga;
 import '../../../shared/framework/screen.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/framework/memory_tabs.dart b/packages/devtools_app/lib/src/screens/memory/framework/memory_tabs.dart
index ccce88c..2a647ab 100644
--- a/packages/devtools_app/lib/src/screens/memory/framework/memory_tabs.dart
+++ b/packages/devtools_app/lib/src/screens/memory/framework/memory_tabs.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/analytics/constants.dart' as gac;
 import '../../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/framework/screen_body.dart b/packages/devtools_app/lib/src/screens/memory/framework/screen_body.dart
index d2389f1..470c731 100644
--- a/packages/devtools_app/lib/src/screens/memory/framework/screen_body.dart
+++ b/packages/devtools_app/lib/src/screens/memory/framework/screen_body.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/framework/screen.dart';
 import '../../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart
index 247615b..4702fe7 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_shared/devtools_shared.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../../shared/charts/chart_controller.dart';
 import '../../../../../../shared/charts/chart_trace.dart' as chart_trace;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/event_chart_controller.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/event_chart_controller.dart
index 29bbf2e..9e35f66 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/event_chart_controller.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/event_chart_controller.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_shared/devtools_shared.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../../shared/charts/chart_controller.dart';
 import '../../../../../../shared/charts/chart_trace.dart' as chart_trace;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart
index a84a8dc..2573560 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_shared/devtools_shared.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../../shared/charts/chart_controller.dart';
 import '../../../../../../shared/charts/chart_trace.dart' as chart_trace;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/data/charts.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/data/charts.dart
index 08273b6..0ea8e17 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/data/charts.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/data/charts.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/service.dart' show FlutterEvent;
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_shared/devtools_shared.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/charts/chart_trace.dart';
 import '../../../../../shared/primitives/byte_utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/chart_control_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/chart_control_pane.dart
index de7fe0f..d19f6e5 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/chart_control_pane.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/chart_control_pane.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/chart_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/chart_pane.dart
index 1a5f0e2..41b9e1f 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/chart_pane.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/chart_pane.dart

@@ -4,8 +4,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/charts/chart_controller.dart';
 import '../../../../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/interval_dropdown.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/interval_dropdown.dart
index 9773fcc..f601170 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/interval_dropdown.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/interval_dropdown.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/legend.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/legend.dart
index 5c43dd6..1318941 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/legend.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/legend.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/primitives/painting.dart';
 import '../controller/chart_pane_controller.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/memory_chart.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/memory_chart.dart
index ec4dc81..348a0cc 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/memory_chart.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/memory_chart.dart

@@ -6,7 +6,7 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_shared/devtools_shared.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/charts/chart.dart';
 import '../../../../../shared/charts/chart_controller.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/control_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/control_pane.dart
index 334d9c3..3ebac1c 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/control_pane.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/control_pane.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/framework/screen.dart';
 import '../../../../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/primary_controls.dart b/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/primary_controls.dart
index 4b70279..dd5a5ef 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/primary_controls.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/primary_controls.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/secondary_controls.dart b/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/secondary_controls.dart
index af539bd..2951c8a 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/secondary_controls.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/secondary_controls.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../shared/feature_flags.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/settings_dialog.dart b/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/settings_dialog.dart
index 196fd1c..adf3e34 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/settings_dialog.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/control/widgets/settings_dialog.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/globals.dart';
 import '../../../../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/diff_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/diff_pane.dart
index 2342b95..cf946cb 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/diff/diff_pane.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/diff/diff_pane.dart

@@ -6,8 +6,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/analytics/constants.dart' as gac;
 import '../../../../shared/primitives/simple_items.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/class_details/path.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/class_details/path.dart
index 7821f0c..e43e502 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/class_details/path.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/class_details/path.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_diff.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_diff.dart
index a40c9eb..cfc008b 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_diff.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_diff.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_single.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_single.dart
index 24b9ceb..460ebf9 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_single.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_single.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/instances.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/instances.dart
index eb2b1b6..d33a600 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/instances.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/instances.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/analytics/constants.dart';
 import '../../../../../shared/memory/class_name.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_control_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_control_pane.dart
index a1da1ad..5c457c1 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_control_pane.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_control_pane.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_list.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_list.dart
index 63f7554..524e495 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_list.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_list.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_view.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_view.dart
index 090d100..283cc5c 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_view.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_view.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/memory/classes.dart';
 import '../../../../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/profile/instances.dart b/packages/devtools_app/lib/src/screens/memory/panes/profile/instances.dart
index 9aa1894..0d49fc3 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/profile/instances.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/profile/instances.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/analytics/constants.dart';
 import '../../../../shared/memory/class_name.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/profile/profile_view.dart b/packages/devtools_app/lib/src/screens/memory/panes/profile/profile_view.dart
index ed4637b..0465b9f 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/profile/profile_view.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/profile/profile_view.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../../../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/tracing/class_table.dart b/packages/devtools_app/lib/src/screens/memory/panes/tracing/class_table.dart
index 2d342d1..3295000 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/tracing/class_table.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/tracing/class_table.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/tracing/tracing_tree.dart b/packages/devtools_app/lib/src/screens/memory/panes/tracing/tracing_tree.dart
index 981ebf0..6e6029f 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/tracing/tracing_tree.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/tracing/tracing_tree.dart

@@ -3,8 +3,8 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/analytics/constants.dart' as gac;
 import '../../../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/tracing/tracing_view.dart b/packages/devtools_app/lib/src/screens/memory/panes/tracing/tracing_view.dart
index e923d9c..9b0ebab 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/tracing/tracing_view.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/tracing/tracing_view.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/analytics/constants.dart' as gac;
 import '../../../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/shared/primitives/instance_context_menu.dart b/packages/devtools_app/lib/src/screens/memory/shared/primitives/instance_context_menu.dart
index 5c3fa7d..af3fee8 100644
--- a/packages/devtools_app/lib/src/screens/memory/shared/primitives/instance_context_menu.dart
+++ b/packages/devtools_app/lib/src/screens/memory/shared/primitives/instance_context_menu.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/primitives/utils.dart';
 import '../../../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/memory/shared/primitives/painting.dart b/packages/devtools_app/lib/src/screens/memory/shared/primitives/painting.dart
index 91b9c2b..0e9c0d7 100644
--- a/packages/devtools_app/lib/src/screens/memory/shared/primitives/painting.dart
+++ b/packages/devtools_app/lib/src/screens/memory/shared/primitives/painting.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 // TODO(polina-c): use the same constants as for dash in the chart.
 const _dashHeight = 2.0;

diff --git a/packages/devtools_app/lib/src/screens/memory/shared/widgets/class_filter.dart b/packages/devtools_app/lib/src/screens/memory/shared/widgets/class_filter.dart
index 3374785..586d503 100644
--- a/packages/devtools_app/lib/src/screens/memory/shared/widgets/class_filter.dart
+++ b/packages/devtools_app/lib/src/screens/memory/shared/widgets/class_filter.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/network/network_model.dart b/packages/devtools_app/lib/src/screens/network/network_model.dart
index c5a918c..1f17516 100644
--- a/packages/devtools_app/lib/src/screens/network/network_model.dart
+++ b/packages/devtools_app/lib/src/screens/network/network_model.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_shared/devtools_shared.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/network/network_request_inspector.dart b/packages/devtools_app/lib/src/screens/network/network_request_inspector.dart
index 5297d7b..da3bf20 100644
--- a/packages/devtools_app/lib/src/screens/network/network_request_inspector.dart
+++ b/packages/devtools_app/lib/src/screens/network/network_request_inspector.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/network/network_request_inspector_views.dart b/packages/devtools_app/lib/src/screens/network/network_request_inspector_views.dart
index 1567b4f..46d35a9 100644
--- a/packages/devtools_app/lib/src/screens/network/network_request_inspector_views.dart
+++ b/packages/devtools_app/lib/src/screens/network/network_request_inspector_views.dart

@@ -6,8 +6,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:image/image.dart' as image;
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/http/http.dart';
 import '../../shared/http/http_request_data.dart';

diff --git a/packages/devtools_app/lib/src/screens/network/network_screen.dart b/packages/devtools_app/lib/src/screens/network/network_screen.dart
index 5006eee..9721eaa 100644
--- a/packages/devtools_app/lib/src/screens/network/network_screen.dart
+++ b/packages/devtools_app/lib/src/screens/network/network_screen.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/controls/enhance_tracing/enhance_tracing.dart b/packages/devtools_app/lib/src/screens/performance/panes/controls/enhance_tracing/enhance_tracing.dart
index 1e708a3..eebec44 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/controls/enhance_tracing/enhance_tracing.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/controls/enhance_tracing/enhance_tracing.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../service/service_extension_widgets.dart';
 import '../../../../../service/service_extensions.dart' as extensions;

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/controls/more_debugging_options.dart b/packages/devtools_app/lib/src/screens/performance/panes/controls/more_debugging_options.dart
index fe865ae..1f36790 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/controls/more_debugging_options.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/controls/more_debugging_options.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../service/service_extension_widgets.dart';
 import '../../../../service/service_extensions.dart' as extensions;

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/controls/performance_controls.dart b/packages/devtools_app/lib/src/screens/performance/panes/controls/performance_controls.dart
index 66953bd..d1d5ba8 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/controls/performance_controls.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/controls/performance_controls.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../service/service_extension_widgets.dart';
 import '../../../../service/service_extensions.dart' as extensions;

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/controls/performance_settings.dart b/packages/devtools_app/lib/src/screens/performance/panes/controls/performance_settings.dart
index f6db514..fe1a735 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/controls/performance_settings.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/controls/performance_settings.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/globals.dart';
 import '../../../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/flutter_frames/flutter_frames_chart.dart b/packages/devtools_app/lib/src/screens/performance/panes/flutter_frames/flutter_frames_chart.dart
index 27e5cce..ce015a0 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/flutter_frames/flutter_frames_chart.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/flutter_frames/flutter_frames_chart.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis.dart b/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis.dart
index 4ebc689..e9b5131 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../service/service_extension_widgets.dart';
 import '../../../../service/service_extensions.dart' as extensions;

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_hints.dart b/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_hints.dart
index 1bb06dd..f77a19f 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_hints.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_hints.dart

@@ -7,7 +7,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../service/connected_app/connected_app.dart';
 import '../../../../service/service_extensions.dart' as extensions;

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_time_visualizer.dart b/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_time_visualizer.dart
index b0c09e8..d9e8c61 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_time_visualizer.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_time_visualizer.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/primitives/utils.dart';
 import '../../../../shared/ui/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/rebuild_stats/rebuild_stats.dart b/packages/devtools_app/lib/src/screens/performance/panes/rebuild_stats/rebuild_stats.dart
index 6b7ec33..6b2b12f 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/rebuild_stats/rebuild_stats.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/rebuild_stats/rebuild_stats.dart

@@ -6,7 +6,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../service/service_extension_widgets.dart';
 import '../../../../service/service_extensions.dart' as extensions;

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_desktop.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_desktop.dart
index 7f0881a..de792cf 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_desktop.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_desktop.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'perfetto_controller.dart';
 

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_web.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_web.dart
index 2284217..39db928 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_web.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_web.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_app_shared/web_utils.dart';
 import 'package:devtools_shared/devtools_shared.dart';
-import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:web/web.dart';
 
 import '../../../../../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto.dart
index fff957c..0e7d03d 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_view.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_view.dart
index 682b370..0b75ef2 100644
--- a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_view.dart
+++ b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_view.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/analytics/constants.dart' as gac;
 import '../../../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/performance/performance_screen.dart b/packages/devtools_app/lib/src/screens/performance/performance_screen.dart
index ac10baf..f78ab1d 100644
--- a/packages/devtools_app/lib/src/screens/performance/performance_screen.dart
+++ b/packages/devtools_app/lib/src/screens/performance/performance_screen.dart

@@ -6,8 +6,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/screens/performance/tabbed_performance_view.dart b/packages/devtools_app/lib/src/screens/performance/tabbed_performance_view.dart
index a6fd988..793daa3 100644
--- a/packages/devtools_app/lib/src/screens/performance/tabbed_performance_view.dart
+++ b/packages/devtools_app/lib/src/screens/performance/tabbed_performance_view.dart

@@ -6,7 +6,7 @@
 
 import 'package:collection/collection.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/profiler/cpu_profiler.dart b/packages/devtools_app/lib/src/screens/profiler/cpu_profiler.dart
index cf2b32f..969f5dc 100644
--- a/packages/devtools_app/lib/src/screens/profiler/cpu_profiler.dart
+++ b/packages/devtools_app/lib/src/screens/profiler/cpu_profiler.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/charts/flame_chart.dart';

diff --git a/packages/devtools_app/lib/src/screens/profiler/panes/bottom_up.dart b/packages/devtools_app/lib/src/screens/profiler/panes/bottom_up.dart
index d240dfe..615ed41 100644
--- a/packages/devtools_app/lib/src/screens/profiler/panes/bottom_up.dart
+++ b/packages/devtools_app/lib/src/screens/profiler/panes/bottom_up.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/primitives/utils.dart';
 import '../../../shared/table/table.dart';

diff --git a/packages/devtools_app/lib/src/screens/profiler/panes/call_tree.dart b/packages/devtools_app/lib/src/screens/profiler/panes/call_tree.dart
index 1169427..1c63746 100644
--- a/packages/devtools_app/lib/src/screens/profiler/panes/call_tree.dart
+++ b/packages/devtools_app/lib/src/screens/profiler/panes/call_tree.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/primitives/utils.dart';
 import '../../../shared/table/table.dart';

diff --git a/packages/devtools_app/lib/src/screens/profiler/panes/controls/cpu_profiler_controls.dart b/packages/devtools_app/lib/src/screens/profiler/panes/controls/cpu_profiler_controls.dart
index 642b4e9..db6894b 100644
--- a/packages/devtools_app/lib/src/screens/profiler/panes/controls/cpu_profiler_controls.dart
+++ b/packages/devtools_app/lib/src/screens/profiler/panes/controls/cpu_profiler_controls.dart

@@ -5,7 +5,7 @@
 import 'dart:developer';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/globals.dart';
 import '../../cpu_profiler_controller.dart';

diff --git a/packages/devtools_app/lib/src/screens/profiler/panes/controls/profiler_screen_controls.dart b/packages/devtools_app/lib/src/screens/profiler/panes/controls/profiler_screen_controls.dart
index c1c5b24..8a0082c 100644
--- a/packages/devtools_app/lib/src/screens/profiler/panes/controls/profiler_screen_controls.dart
+++ b/packages/devtools_app/lib/src/screens/profiler/panes/controls/profiler_screen_controls.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/analytics/constants.dart' as gac;
 import '../../../../shared/framework/screen.dart';

diff --git a/packages/devtools_app/lib/src/screens/profiler/panes/cpu_flame_chart.dart b/packages/devtools_app/lib/src/screens/profiler/panes/cpu_flame_chart.dart
index f0fc0d0..d3b72c3 100644
--- a/packages/devtools_app/lib/src/screens/profiler/panes/cpu_flame_chart.dart
+++ b/packages/devtools_app/lib/src/screens/profiler/panes/cpu_flame_chart.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/charts/flame_chart.dart';
 import '../../../shared/ui/colors.dart';

diff --git a/packages/devtools_app/lib/src/screens/profiler/panes/cpu_profile_columns.dart b/packages/devtools_app/lib/src/screens/profiler/panes/cpu_profile_columns.dart
index b2a9720..77b4da4 100644
--- a/packages/devtools_app/lib/src/screens/profiler/panes/cpu_profile_columns.dart
+++ b/packages/devtools_app/lib/src/screens/profiler/panes/cpu_profile_columns.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/table/table.dart';
 import '../../../shared/table/table_data.dart';

diff --git a/packages/devtools_app/lib/src/screens/profiler/panes/method_table/method_table.dart b/packages/devtools_app/lib/src/screens/profiler/panes/method_table/method_table.dart
index 589e36d..e2b018b 100644
--- a/packages/devtools_app/lib/src/screens/profiler/panes/method_table/method_table.dart
+++ b/packages/devtools_app/lib/src/screens/profiler/panes/method_table/method_table.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../shared/primitives/utils.dart';
 import '../../../../shared/table/table.dart';

diff --git a/packages/devtools_app/lib/src/screens/profiler/profiler_screen.dart b/packages/devtools_app/lib/src/screens/profiler/profiler_screen.dart
index ae60c9a..df33371 100644
--- a/packages/devtools_app/lib/src/screens/profiler/profiler_screen.dart
+++ b/packages/devtools_app/lib/src/screens/profiler/profiler_screen.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 import 'package:vm_service/vm_service.dart' hide Stack;
 

diff --git a/packages/devtools_app/lib/src/screens/profiler/profiler_status.dart b/packages/devtools_app/lib/src/screens/profiler/profiler_status.dart
index f4fd5ae..3bf5028 100644
--- a/packages/devtools_app/lib/src/screens/profiler/profiler_status.dart
+++ b/packages/devtools_app/lib/src/screens/profiler/profiler_status.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/ui/common_widgets.dart';
 import 'cpu_profiler_controller.dart';

diff --git a/packages/devtools_app/lib/src/screens/provider/provider_screen.dart b/packages/devtools_app/lib/src/screens/provider/provider_screen.dart
index 027ee4e..4aa9703 100644
--- a/packages/devtools_app/lib/src/screens/provider/provider_screen.dart
+++ b/packages/devtools_app/lib/src/screens/provider/provider_screen.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/framework/screen.dart';
 import '../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/isolate_statistics/isolate_statistics_view.dart b/packages/devtools_app/lib/src/screens/vm_developer/isolate_statistics/isolate_statistics_view.dart
index 5c25fed..dd59a5f 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/isolate_statistics/isolate_statistics_view.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/isolate_statistics/isolate_statistics_view.dart

@@ -4,8 +4,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/class_hierarchy_explorer.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/class_hierarchy_explorer.dart
index 08cd597..8465be2 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/class_hierarchy_explorer.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/class_hierarchy_explorer.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/ui/common_widgets.dart';
 import '../../../shared/ui/tree_view.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/object_inspector_view.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/object_inspector_view.dart
index 277e7dd..b4711b5 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/object_inspector_view.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/object_inspector_view.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/analytics/constants.dart' as gac;
 import '../../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/object_viewport.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/object_viewport.dart
index 37084d1..67a4512 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/object_viewport.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/object_viewport.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../../shared/primitives/history_manager.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_class_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_class_display.dart
index cf01742..4ea3e77 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_class_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_class_display.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../vm_developer_common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_code_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_code_display.dart
index 0e24710..095ca1c 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_code_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_code_display.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:string_scanner/string_scanner.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_field_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_field_display.dart
index c30182d..3e88cd3 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_field_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_field_display.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../vm_developer_common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_function_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_function_display.dart
index dfbbb8e..fbc28cd 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_function_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_function_display.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../vm_developer_common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_ic_data_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_ic_data_display.dart
index c718d53..8270b42 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_ic_data_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_ic_data_display.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_instance_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_instance_display.dart
index 8bd7e66..7c2f36b 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_instance_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_instance_display.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../../shared/console/widgets/expandable_variable.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_library_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_library_display.dart
index faa3d3e..4d1a335 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_library_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_library_display.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../vm_developer_common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_object_pool_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_object_pool_display.dart
index 0f10967..c2d763b 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_object_pool_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_object_pool_display.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../../shared/primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_script_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_script_display.dart
index 5063de4..ad008b4 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_script_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_script_display.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../vm_developer_common_widgets.dart';
 import 'object_inspector_view_controller.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_simple_list_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_simple_list_display.dart
index bde64b1..74b9a5f 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_simple_list_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_simple_list_display.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../../shared/globals.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_unknown_object_display.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_unknown_object_display.dart
index 9ed7fdf..b3bfcef 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_unknown_object_display.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/vm_unknown_object_display.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../vm_developer_common_widgets.dart';
 import 'object_inspector_view_controller.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/process_memory/process_memory_view.dart b/packages/devtools_app/lib/src/screens/vm_developer/process_memory/process_memory_view.dart
index 2fb5ad7..d970490 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/process_memory/process_memory_view.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/process_memory/process_memory_view.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/analytics/constants.dart' as gac;
 import '../../../shared/charts/treemap.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/queued_microtasks/queued_microtasks_view.dart b/packages/devtools_app/lib/src/screens/vm_developer/queued_microtasks/queued_microtasks_view.dart
index 692c48e..516b349 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/queued_microtasks/queued_microtasks_view.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/queued_microtasks/queued_microtasks_view.dart

@@ -4,8 +4,8 @@
 
 import 'package:collection/collection.dart' show ListExtensions;
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
 import 'package:intl/intl.dart' show DateFormat;
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart
index 06f7f6c..88d6288 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:stack_trace/stack_trace.dart' as stack_trace;
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_tools_screen.dart b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_tools_screen.dart
index e544efd..ded2471 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_tools_screen.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_tools_screen.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../service/vm_flags.dart' as vm_flags;
 import '../../shared/framework/screen.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/vm_statistics/vm_statistics_view.dart b/packages/devtools_app/lib/src/screens/vm_developer/vm_statistics/vm_statistics_view.dart
index a2b9d49..c25fd1c 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/vm_statistics/vm_statistics_view.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/vm_statistics/vm_statistics_view.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/service/connected_app/connection_info.dart b/packages/devtools_app/lib/src/service/connected_app/connection_info.dart
index c651fe0..f38abae 100644
--- a/packages/devtools_app/lib/src/service/connected_app/connection_info.dart
+++ b/packages/devtools_app/lib/src/service/connected_app/connection_info.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/framework/routing.dart';

diff --git a/packages/devtools_app/lib/src/service/service_extension_widgets.dart b/packages/devtools_app/lib/src/service/service_extension_widgets.dart
index 10fab33..07d8fd3 100644
--- a/packages/devtools_app/lib/src/service/service_extension_widgets.dart
+++ b/packages/devtools_app/lib/src/service/service_extension_widgets.dart

@@ -13,8 +13,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:pointer_interceptor/pointer_interceptor.dart';
 
 import '../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/service/service_extensions.dart b/packages/devtools_app/lib/src/service/service_extensions.dart
index c4fd56a..4057d94 100644
--- a/packages/devtools_app/lib/src/service/service_extensions.dart
+++ b/packages/devtools_app/lib/src/service/service_extensions.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/service_extensions.dart' as extensions;
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../shared/analytics/constants.dart' as gac;
 

diff --git a/packages/devtools_app/lib/src/service/service_registrations.dart b/packages/devtools_app/lib/src/service/service_registrations.dart
index 958e071..188cd54 100644
--- a/packages/devtools_app/lib/src/service/service_registrations.dart
+++ b/packages/devtools_app/lib/src/service/service_registrations.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/service_extensions.dart' as extensions;
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_shared/devtools_shared.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../shared/analytics/constants.dart' as gac;
 import '../shared/constants.dart';

diff --git a/packages/devtools_app/lib/src/shared/analytics/prompt.dart b/packages/devtools_app/lib/src/shared/analytics/prompt.dart
index 9b4aca2..af89a28 100644
--- a/packages/devtools_app/lib/src/shared/analytics/prompt.dart
+++ b/packages/devtools_app/lib/src/shared/analytics/prompt.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 
 import '../ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/shared/charts/chart.dart b/packages/devtools_app/lib/src/shared/charts/chart.dart
index 6c93000..652675f 100644
--- a/packages/devtools_app/lib/src/shared/charts/chart.dart
+++ b/packages/devtools_app/lib/src/shared/charts/chart.dart

@@ -7,8 +7,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/utils.dart';
 import 'chart_controller.dart';

diff --git a/packages/devtools_app/lib/src/shared/charts/chart_controller.dart b/packages/devtools_app/lib/src/shared/charts/chart_controller.dart
index 923ac1b..7f8fa37 100644
--- a/packages/devtools_app/lib/src/shared/charts/chart_controller.dart
+++ b/packages/devtools_app/lib/src/shared/charts/chart_controller.dart

@@ -4,7 +4,7 @@
 
 import 'package:collection/collection.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/utils.dart';
 import 'chart_trace.dart';

diff --git a/packages/devtools_app/lib/src/shared/charts/chart_trace.dart b/packages/devtools_app/lib/src/shared/charts/chart_trace.dart
index 5e1ab49..c13d679 100644
--- a/packages/devtools_app/lib/src/shared/charts/chart_trace.dart
+++ b/packages/devtools_app/lib/src/shared/charts/chart_trace.dart

@@ -4,7 +4,7 @@
 
 import 'dart:math';
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'chart_controller.dart';
 

diff --git a/packages/devtools_app/lib/src/shared/charts/flame_chart.dart b/packages/devtools_app/lib/src/shared/charts/flame_chart.dart
index 26aa5d8..a3210fb 100644
--- a/packages/devtools_app/lib/src/shared/charts/flame_chart.dart
+++ b/packages/devtools_app/lib/src/shared/charts/flame_chart.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/extent_delegate_list.dart';
 import '../primitives/flutter_widgets/linked_scroll_controller.dart';

diff --git a/packages/devtools_app/lib/src/shared/charts/treemap.dart b/packages/devtools_app/lib/src/shared/charts/treemap.dart
index f6a77d5..dae9c34 100644
--- a/packages/devtools_app/lib/src/shared/charts/treemap.dart
+++ b/packages/devtools_app/lib/src/shared/charts/treemap.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/byte_utils.dart';
 import '../primitives/trees.dart';

diff --git a/packages/devtools_app/lib/src/shared/config_specific/drag_and_drop/drag_and_drop.dart b/packages/devtools_app/lib/src/shared/config_specific/drag_and_drop/drag_and_drop.dart
index 9ba1f8f..b195a21 100644
--- a/packages/devtools_app/lib/src/shared/config_specific/drag_and_drop/drag_and_drop.dart
+++ b/packages/devtools_app/lib/src/shared/config_specific/drag_and_drop/drag_and_drop.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:flutter/material.dart';
 import 'package:flutter/rendering.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../primitives/utils.dart';
 import '_drag_and_drop_desktop.dart'

diff --git a/packages/devtools_app/lib/src/shared/console/console.dart b/packages/devtools_app/lib/src/shared/console/console.dart
index 30e9913..53a8adc 100644
--- a/packages/devtools_app/lib/src/shared/console/console.dart
+++ b/packages/devtools_app/lib/src/shared/console/console.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/utils.dart';
 import '../ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/shared/console/widgets/console_pane.dart b/packages/devtools_app/lib/src/shared/console/widgets/console_pane.dart
index 4d661cc..a8ffe08 100644
--- a/packages/devtools_app/lib/src/shared/console/widgets/console_pane.dart
+++ b/packages/devtools_app/lib/src/shared/console/widgets/console_pane.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../framework/scaffold/bottom_pane.dart';
 import '../../globals.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 2344aed..92472a2 100644
--- a/packages/devtools_app/lib/src/shared/console/widgets/description.dart
+++ b/packages/devtools_app/lib/src/shared/console/widgets/description.dart

@@ -6,7 +6,7 @@
 library;
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../diagnostics/dart_object_node.dart';
 import '../../diagnostics/diagnostics_node.dart';

diff --git a/packages/devtools_app/lib/src/shared/console/widgets/display_provider.dart b/packages/devtools_app/lib/src/shared/console/widgets/display_provider.dart
index 91fd7ac..b8d398b 100644
--- a/packages/devtools_app/lib/src/shared/console/widgets/display_provider.dart
+++ b/packages/devtools_app/lib/src/shared/console/widgets/display_provider.dart

@@ -6,8 +6,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart' hide Stack;
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart' hide Stack;
 import 'package:vm_service/vm_service.dart';
 
 import '../../diagnostics/dap_object_node.dart';

diff --git a/packages/devtools_app/lib/src/shared/console/widgets/evaluate.dart b/packages/devtools_app/lib/src/shared/console/widgets/evaluate.dart
index ea24373..44e4a7e 100644
--- a/packages/devtools_app/lib/src/shared/console/widgets/evaluate.dart
+++ b/packages/devtools_app/lib/src/shared/console/widgets/evaluate.dart

@@ -7,8 +7,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/shared/console/widgets/expandable_variable.dart b/packages/devtools_app/lib/src/shared/console/widgets/expandable_variable.dart
index 58f1dcb..9004fe1 100644
--- a/packages/devtools_app/lib/src/shared/console/widgets/expandable_variable.dart
+++ b/packages/devtools_app/lib/src/shared/console/widgets/expandable_variable.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart' hide Stack;
+import 'package:material_ui/material_ui.dart' hide Stack;
 
 import '../../../shared/primitives/listenable.dart';
 import '../../diagnostics/dart_object_node.dart';

diff --git a/packages/devtools_app/lib/src/shared/console/widgets/help_dialog.dart b/packages/devtools_app/lib/src/shared/console/widgets/help_dialog.dart
index 96d35b1..ce6c843 100644
--- a/packages/devtools_app/lib/src/shared/console/widgets/help_dialog.dart
+++ b/packages/devtools_app/lib/src/shared/console/widgets/help_dialog.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../analytics/constants.dart' as gac;
 import '../../ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/shared/constants.dart b/packages/devtools_app/lib/src/shared/constants.dart
index 36c5546..03679c2 100644
--- a/packages/devtools_app/lib/src/shared/constants.dart
+++ b/packages/devtools_app/lib/src/shared/constants.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:flutter/material.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 
 const verboseLoggingLevel = Level.FINEST;
 

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 032080a..1942742 100644
--- a/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart
+++ b/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart

@@ -11,8 +11,8 @@
 
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../screens/inspector/inspector_data_models.dart';

diff --git a/packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart b/packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart
index 6081c5d..23d4d02 100644
--- a/packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart
+++ b/packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart

@@ -14,11 +14,11 @@
 import 'dart:convert';
 import 'dart:developer';
 
+import 'package:cupertino_ui/cupertino_ui.dart';
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/service_extensions.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_base.dart b/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_base.dart
index e960fa1..ed2a4c2 100644
--- a/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_base.dart
+++ b/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_base.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../screens/debugger/codeview.dart';
 import '../diagnostics/inspector_service.dart';

diff --git a/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_external.dart b/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_external.dart
index d46afca..a8f551c 100644
--- a/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_external.dart
+++ b/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_external.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../screens/debugger/codeview.dart';
 import '../analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/shared/framework/routing.dart b/packages/devtools_app/lib/src/shared/framework/routing.dart
index 5de3eab..e992972 100644
--- a/packages/devtools_app/lib/src/shared/framework/routing.dart
+++ b/packages/devtools_app/lib/src/shared/framework/routing.dart

@@ -7,8 +7,8 @@
 
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../framework/framework_core.dart';
 import '../globals.dart';

diff --git a/packages/devtools_app/lib/src/shared/framework/screen.dart b/packages/devtools_app/lib/src/shared/framework/screen.dart
index 32f3d21..eacb7d9 100644
--- a/packages/devtools_app/lib/src/shared/framework/screen.dart
+++ b/packages/devtools_app/lib/src/shared/framework/screen.dart

@@ -12,8 +12,8 @@
 import 'package:devtools_app_shared/shared.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../globals.dart';
 import '../primitives/listenable.dart';

diff --git a/packages/devtools_app/lib/src/shared/managers/banner_messages.dart b/packages/devtools_app/lib/src/shared/managers/banner_messages.dart
index d9c3215..28c4109 100644
--- a/packages/devtools_app/lib/src/shared/managers/banner_messages.dart
+++ b/packages/devtools_app/lib/src/shared/managers/banner_messages.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../screens/performance/performance_utils.dart';
 import '../../service/connected_app/connected_app.dart';

diff --git a/packages/devtools_app/lib/src/shared/managers/notifications.dart b/packages/devtools_app/lib/src/shared/managers/notifications.dart
index 8c15ceb..ff1edf4 100644
--- a/packages/devtools_app/lib/src/shared/managers/notifications.dart
+++ b/packages/devtools_app/lib/src/shared/managers/notifications.dart

@@ -6,7 +6,7 @@
 import 'dart:collection';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../globals.dart';
 import '../utils/utils.dart';

diff --git a/packages/devtools_app/lib/src/shared/memory/class_name.dart b/packages/devtools_app/lib/src/shared/memory/class_name.dart
index c966b4c..2942d6e 100644
--- a/packages/devtools_app/lib/src/shared/memory/class_name.dart
+++ b/packages/devtools_app/lib/src/shared/memory/class_name.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_shared/devtools_shared.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../primitives/simple_items.dart';

diff --git a/packages/devtools_app/lib/src/shared/offline/offline_screen.dart b/packages/devtools_app/lib/src/shared/offline/offline_screen.dart
index cca7d0f..ae0896b 100644
--- a/packages/devtools_app/lib/src/shared/offline/offline_screen.dart
+++ b/packages/devtools_app/lib/src/shared/offline/offline_screen.dart

@@ -5,7 +5,7 @@
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../analytics/constants.dart' as gac;
 import '../framework/screen.dart';

diff --git a/packages/devtools_app/lib/src/shared/primitives/collapsible_mixin.dart b/packages/devtools_app/lib/src/shared/primitives/collapsible_mixin.dart
index 1bdf7c9..f00216a 100644
--- a/packages/devtools_app/lib/src/shared/primitives/collapsible_mixin.dart
+++ b/packages/devtools_app/lib/src/shared/primitives/collapsible_mixin.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// Provides `animations` triggered by toggling the expanded and visible state
 /// of a widget.

diff --git a/packages/devtools_app/lib/src/shared/primitives/diagnostics_text_styles.dart b/packages/devtools_app/lib/src/shared/primitives/diagnostics_text_styles.dart
index 5773f02..44c15bb 100644
--- a/packages/devtools_app/lib/src/shared/primitives/diagnostics_text_styles.dart
+++ b/packages/devtools_app/lib/src/shared/primitives/diagnostics_text_styles.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// A namespace for diagnostic text styles and utilities.
 extension DiagnosticsTextStyles on Never {

diff --git a/packages/devtools_app/lib/src/shared/primitives/flutter_widgets/linked_scroll_controller.dart b/packages/devtools_app/lib/src/shared/primitives/flutter_widgets/linked_scroll_controller.dart
index 391d7cf..8c64a6a 100644
--- a/packages/devtools_app/lib/src/shared/primitives/flutter_widgets/linked_scroll_controller.dart
+++ b/packages/devtools_app/lib/src/shared/primitives/flutter_widgets/linked_scroll_controller.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:flutter/material.dart';
 import 'package:flutter/rendering.dart';
+import 'package:material_ui/material_ui.dart';
 
 // ignore_for_file: unused-code, this is forked file, leave untouched.
 

diff --git a/packages/devtools_app/lib/src/shared/primitives/utils.dart b/packages/devtools_app/lib/src/shared/primitives/utils.dart
index d09c45a..e40cf69 100644
--- a/packages/devtools_app/lib/src/shared/primitives/utils.dart
+++ b/packages/devtools_app/lib/src/shared/primitives/utils.dart

@@ -11,11 +11,11 @@
 
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:intl/intl.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'ansi_utils.dart';
 import 'byte_utils.dart';

diff --git a/packages/devtools_app/lib/src/shared/table/table.dart b/packages/devtools_app/lib/src/shared/table/table.dart
index 19da2a1..c4cb624 100644
--- a/packages/devtools_app/lib/src/shared/table/table.dart
+++ b/packages/devtools_app/lib/src/shared/table/table.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart' hide TableRow;
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart' hide TableRow;
 
 import '../primitives/collapsible_mixin.dart';
 import '../primitives/extent_delegate_list.dart';

diff --git a/packages/devtools_app/lib/src/shared/table/table_data.dart b/packages/devtools_app/lib/src/shared/table/table_data.dart
index 93baa7a..be4b891 100644
--- a/packages/devtools_app/lib/src/shared/table/table_data.dart
+++ b/packages/devtools_app/lib/src/shared/table/table_data.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/byte_utils.dart';
 import '../primitives/trees.dart';

diff --git a/packages/devtools_app/lib/src/shared/ui/colors.dart b/packages/devtools_app/lib/src/shared/ui/colors.dart
index a330946..adb1829 100644
--- a/packages/devtools_app/lib/src/shared/ui/colors.dart
+++ b/packages/devtools_app/lib/src/shared/ui/colors.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'utils.dart';
 

diff --git a/packages/devtools_app/lib/src/shared/ui/common_widgets.dart b/packages/devtools_app/lib/src/shared/ui/common_widgets.dart
index d26a6cb..2d34c95 100644
--- a/packages/devtools_app/lib/src/shared/ui/common_widgets.dart
+++ b/packages/devtools_app/lib/src/shared/ui/common_widgets.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/shared/ui/dialogs.dart b/packages/devtools_app/lib/src/shared/ui/dialogs.dart
index d87c7ff..c14ab48 100644
--- a/packages/devtools_app/lib/src/shared/ui/dialogs.dart
+++ b/packages/devtools_app/lib/src/shared/ui/dialogs.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../config_specific/copy_to_clipboard/copy_to_clipboard.dart';
 import '../globals.dart';

diff --git a/packages/devtools_app/lib/src/shared/ui/drop_down_button.dart b/packages/devtools_app/lib/src/shared/ui/drop_down_button.dart
index 1fcfd0b..ececdc4 100644
--- a/packages/devtools_app/lib/src/shared/ui/drop_down_button.dart
+++ b/packages/devtools_app/lib/src/shared/ui/drop_down_button.dart

@@ -4,7 +4,7 @@
 
 import 'package:collection/collection.dart';
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../analytics/analytics.dart' as ga;
 

diff --git a/packages/devtools_app/lib/src/shared/ui/editable_list.dart b/packages/devtools_app/lib/src/shared/ui/editable_list.dart
index 392950b..324b6ff 100644
--- a/packages/devtools_app/lib/src/shared/ui/editable_list.dart
+++ b/packages/devtools_app/lib/src/shared/ui/editable_list.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../config_specific/copy_to_clipboard/copy_to_clipboard.dart';
 import 'common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/shared/ui/file_import.dart b/packages/devtools_app/lib/src/shared/ui/file_import.dart
index 3a425f6..a0b9135 100644
--- a/packages/devtools_app/lib/src/shared/ui/file_import.dart
+++ b/packages/devtools_app/lib/src/shared/ui/file_import.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:file_selector/file_selector.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 
 import '../analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/shared/ui/filter.dart b/packages/devtools_app/lib/src/shared/ui/filter.dart
index 7ec4eac..8ac8d2f 100644
--- a/packages/devtools_app/lib/src/shared/ui/filter.dart
+++ b/packages/devtools_app/lib/src/shared/ui/filter.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/utils.dart';
 import 'common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/shared/ui/history_viewport.dart b/packages/devtools_app/lib/src/shared/ui/history_viewport.dart
index aad6cf4..1caf1db 100644
--- a/packages/devtools_app/lib/src/shared/ui/history_viewport.dart
+++ b/packages/devtools_app/lib/src/shared/ui/history_viewport.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../screens/debugger/common.dart';
 import '../primitives/history_manager.dart';

diff --git a/packages/devtools_app/lib/src/shared/ui/hover.dart b/packages/devtools_app/lib/src/shared/ui/hover.dart
index 47e0048..a77536c 100644
--- a/packages/devtools_app/lib/src/shared/ui/hover.dart
+++ b/packages/devtools_app/lib/src/shared/ui/hover.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 
 import 'common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/shared/ui/icons.dart b/packages/devtools_app/lib/src/shared/ui/icons.dart
index 543b0cb..18e58cc 100644
--- a/packages/devtools_app/lib/src/shared/ui/icons.dart
+++ b/packages/devtools_app/lib/src/shared/ui/icons.dart

@@ -11,7 +11,7 @@
 library;
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../screens/inspector/layout_explorer/ui/widgets_theme.dart';
 import 'colors.dart';

diff --git a/packages/devtools_app/lib/src/shared/ui/search.dart b/packages/devtools_app/lib/src/shared/ui/search.dart
index 573d0e0..7ea0467 100644
--- a/packages/devtools_app/lib/src/shared/ui/search.dart
+++ b/packages/devtools_app/lib/src/shared/ui/search.dart

@@ -9,9 +9,9 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/trees.dart';
 import '../primitives/utils.dart';

diff --git a/packages/devtools_app/lib/src/shared/ui/search_highlighter.dart b/packages/devtools_app/lib/src/shared/ui/search_highlighter.dart
index 6c93155..23d0911 100644
--- a/packages/devtools_app/lib/src/shared/ui/search_highlighter.dart
+++ b/packages/devtools_app/lib/src/shared/ui/search_highlighter.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/utils.dart';
 

diff --git a/packages/devtools_app/lib/src/shared/ui/side_panel.dart b/packages/devtools_app/lib/src/shared/ui/side_panel.dart
index 9174f92..e45574e 100644
--- a/packages/devtools_app/lib/src/shared/ui/side_panel.dart
+++ b/packages/devtools_app/lib/src/shared/ui/side_panel.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/utils.dart';
 import '../utils/utils.dart';

diff --git a/packages/devtools_app/lib/src/shared/ui/tab.dart b/packages/devtools_app/lib/src/shared/ui/tab.dart
index 07cb85a..cf140cc 100644
--- a/packages/devtools_app/lib/src/shared/ui/tab.dart
+++ b/packages/devtools_app/lib/src/shared/ui/tab.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../analytics/analytics.dart' as ga;
 

diff --git a/packages/devtools_app/lib/src/shared/ui/tree_view.dart b/packages/devtools_app/lib/src/shared/ui/tree_view.dart
index 222ad38..603ae3d 100644
--- a/packages/devtools_app/lib/src/shared/ui/tree_view.dart
+++ b/packages/devtools_app/lib/src/shared/ui/tree_view.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart' hide Stack;
+import 'package:material_ui/material_ui.dart' hide Stack;
 
 import '../primitives/collapsible_mixin.dart';
 import '../primitives/trees.dart';

diff --git a/packages/devtools_app/lib/src/shared/ui/utils.dart b/packages/devtools_app/lib/src/shared/ui/utils.dart
index 56f428f..1857d5b 100644
--- a/packages/devtools_app/lib/src/shared/ui/utils.dart
+++ b/packages/devtools_app/lib/src/shared/ui/utils.dart

@@ -7,8 +7,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../primitives/utils.dart';
 

diff --git a/packages/devtools_app/lib/src/shared/ui/vm_flag_widgets.dart b/packages/devtools_app/lib/src/shared/ui/vm_flag_widgets.dart
index 8ddbce4..3cb9e09 100644
--- a/packages/devtools_app/lib/src/shared/ui/vm_flag_widgets.dart
+++ b/packages/devtools_app/lib/src/shared/ui/vm_flag_widgets.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../screens/profiler/cpu_profile_service.dart';

diff --git a/packages/devtools_app/lib/src/shared/utils/profiler_utils.dart b/packages/devtools_app/lib/src/shared/utils/profiler_utils.dart
index da45765..329de58 100644
--- a/packages/devtools_app/lib/src/shared/utils/profiler_utils.dart
+++ b/packages/devtools_app/lib/src/shared/utils/profiler_utils.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../screens/debugger/codeview_controller.dart';
 import '../../screens/debugger/debugger_screen.dart';

diff --git a/packages/devtools_app/lib/src/shared/utils/utils.dart b/packages/devtools_app/lib/src/shared/utils/utils.dart
index 2d79767..eae789f 100644
--- a/packages/devtools_app/lib/src/shared/utils/utils.dart
+++ b/packages/devtools_app/lib/src/shared/utils/utils.dart

@@ -13,10 +13,10 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 // ignore: avoid-importing-entrypoint-exports, required to access version.

diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/not_connected_overlay.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/not_connected_overlay.dart
index 0a67722..8ac63da 100644
--- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/not_connected_overlay.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/not_connected_overlay.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/globals.dart';
 import '../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_inputs.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_inputs.dart
index 9d01365..7ca89f5 100644
--- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_inputs.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_inputs.dart

@@ -6,8 +6,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/analytics/analytics.dart' as ga;
 import '../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_messages.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_messages.dart
index e3cf453..102e746 100644
--- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_messages.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_messages.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/ui/colors.dart';
 

diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_panel.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_panel.dart
index bde7dd0..da6dda6 100644
--- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_panel.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_panel.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../framework/scaffold/report_feedback_button.dart';
 import '../../../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_refactors.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_refactors.dart
index 9fa2ff7..0ac5202 100644
--- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_refactors.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_refactors.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/analytics/analytics.dart' as ga;
 import '../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_view.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_view.dart
index ed46149..10e5ae6 100644
--- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_view.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_view.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/primitives/utils.dart';
 import '../../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/standalone_ui/standalone_screen.dart b/packages/devtools_app/lib/src/standalone_ui/standalone_screen.dart
index 7cb0792..e228367 100644
--- a/packages/devtools_app/lib/src/standalone_ui/standalone_screen.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/standalone_screen.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/service.dart';
 import 'package:dtd/dtd.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../shared/globals.dart';
 import '../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/debug_sessions.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/debug_sessions.dart
index 79ec991..7ec71d8 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/debug_sessions.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/debug_sessions.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devices.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devices.dart
index 6718b5a..645d30e 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/devices.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/devices.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;

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 9d01c67..55bba25 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

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/analytics/analytics.dart' as ga;
 import '../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/extensions_view.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/extensions_view.dart
index b6b4b73..27598a6 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/extensions_view.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/extensions_view.dart

@@ -6,7 +6,7 @@
 
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_shared/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../extensions/extension_screen.dart';
 import '../../../shared/analytics/analytics.dart' as ga;

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/shared.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/shared.dart
index e64162a..c97ec15 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/shared.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/shared.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../shared/analytics/analytics.dart' as ga;
 import '../../../shared/analytics/constants.dart' as gac;

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/flutter_panel.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/flutter_panel.dart
index c6704ed..ddac871 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/flutter_panel.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/flutter_panel.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/editor/api_classes.dart';

diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml
index a95b396..a12291a 100644
--- a/packages/devtools_app/pubspec.yaml
+++ b/packages/devtools_app/pubspec.yaml

@@ -20,6 +20,7 @@
 dependencies:
   async: ^2.0.0
   collection: ^1.15.0
+  cupertino_ui: ^1.1.1
   dap: ^1.1.0
   dds_service_extensions: ^2.0.2
   devtools_app_shared:
@@ -36,9 +37,10 @@
     sdk: flutter
   http: ^1.1.0
   image: ^4.7.2
-  intl: ^0.19.0
+  intl: ^0.20.0
   json_rpc_2: ^3.0.2
   logging: ^1.1.1
+  material_ui: ^1.4.0
   meta: ^1.9.1
   mime: ^2.0.0
   path: ^1.8.0

diff --git a/packages/devtools_app/test/extensions/extension_screen_test.dart b/packages/devtools_app/test/extensions/extension_screen_test.dart
index f0f9cc0..036c598 100644
--- a/packages/devtools_app/test/extensions/extension_screen_test.dart
+++ b/packages/devtools_app/test/extensions/extension_screen_test.dart

@@ -12,8 +12,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_shared/devtools_extensions.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   const windowSize = Size(2000.0, 2000.0);

diff --git a/packages/devtools_app/test/extensions/extension_settings_test.dart b/packages/devtools_app/test/extensions/extension_settings_test.dart
index 9c5ac53..9e17218 100644
--- a/packages/devtools_app/test/extensions/extension_settings_test.dart
+++ b/packages/devtools_app/test/extensions/extension_settings_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_shared/devtools_extensions.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../test_infra/matchers/matchers.dart';

diff --git a/packages/devtools_app/test/framework/home_screen_test.dart b/packages/devtools_app/test/framework/home_screen_test.dart
index 0036d28..3e8ff44 100644
--- a/packages/devtools_app/test/framework/home_screen_test.dart
+++ b/packages/devtools_app/test/framework/home_screen_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../test_infra/flutter_test_storage.dart';

diff --git a/packages/devtools_app/test/framework/initializer_test.dart b/packages/devtools_app/test/framework/initializer_test.dart
index e45135e..0d71e6e 100644
--- a/packages/devtools_app/test/framework/initializer_test.dart
+++ b/packages/devtools_app/test/framework/initializer_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/framework/notifications_test.dart b/packages/devtools_app/test/framework/notifications_test.dart
index 89b6847..39881b5 100644
--- a/packages/devtools_app/test/framework/notifications_test.dart
+++ b/packages/devtools_app/test/framework/notifications_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app/src/shared/managers/notifications.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   group('Notifications', () {

diff --git a/packages/devtools_app/test/framework/observer/disconnect_observer_test.dart b/packages/devtools_app/test/framework/observer/disconnect_observer_test.dart
index 1c186ad..4d85084 100644
--- a/packages/devtools_app/test/framework/observer/disconnect_observer_test.dart
+++ b/packages/devtools_app/test/framework/observer/disconnect_observer_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../test_infra/matchers/matchers.dart';
 

diff --git a/packages/devtools_app/test/framework/scaffold/scaffold_debugger_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_debugger_test.dart
index f6ae6d7..55aa4ce 100644
--- a/packages/devtools_app/test/framework/scaffold/scaffold_debugger_test.dart
+++ b/packages/devtools_app/test/framework/scaffold/scaffold_debugger_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/framework/scaffold/scaffold_debugging_controls_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_debugging_controls_test.dart
index a6489ed..e6d3f5f 100644
--- a/packages/devtools_app/test/framework/scaffold/scaffold_debugging_controls_test.dart
+++ b/packages/devtools_app/test/framework/scaffold/scaffold_debugging_controls_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/framework/scaffold/scaffold_no_app_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_no_app_test.dart
index a686d5a..4e0c0b2 100644
--- a/packages/devtools_app/test/framework/scaffold/scaffold_no_app_test.dart
+++ b/packages/devtools_app/test/framework/scaffold/scaffold_no_app_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/framework/scaffold/scaffold_profile_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_profile_test.dart
index 2722d8d..f5a1a20 100644
--- a/packages/devtools_app/test/framework/scaffold/scaffold_profile_test.dart
+++ b/packages/devtools_app/test/framework/scaffold/scaffold_profile_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/framework/scaffold/scaffold_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_test.dart
index 434ec2a..34dc608 100644
--- a/packages/devtools_app/test/framework/scaffold/scaffold_test.dart
+++ b/packages/devtools_app/test/framework/scaffold/scaffold_test.dart

@@ -16,8 +16,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/accessibility/accessibility_screen_test.dart b/packages/devtools_app/test/screens/accessibility/accessibility_screen_test.dart
index 337d24e..37ecbb3 100644
--- a/packages/devtools_app/test/screens/accessibility/accessibility_screen_test.dart
+++ b/packages/devtools_app/test/screens/accessibility/accessibility_screen_test.dart

@@ -12,8 +12,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/app_size/app_size_screen_test.dart b/packages/devtools_app/test/screens/app_size/app_size_screen_test.dart
index 1351278..c2af781 100644
--- a/packages/devtools_app/test/screens/app_size/app_size_screen_test.dart
+++ b/packages/devtools_app/test/screens/app_size/app_size_screen_test.dart

@@ -12,8 +12,8 @@
 import 'package:devtools_shared/devtools_test_utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/test_data/app_size/deferred_app.dart';

diff --git a/packages/devtools_app/test/screens/app_size/code_size_attribution_test.dart b/packages/devtools_app/test/screens/app_size/code_size_attribution_test.dart
index 575251f..e087538 100644
--- a/packages/devtools_app/test/screens/app_size/code_size_attribution_test.dart
+++ b/packages/devtools_app/test/screens/app_size/code_size_attribution_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_snapshot_analysis/precompiler_trace.dart';
 import 'package:vm_snapshot_analysis/program_info.dart';
 

diff --git a/packages/devtools_app/test/screens/cpu_profiler/cpu_profiler_test.dart b/packages/devtools_app/test/screens/cpu_profiler/cpu_profiler_test.dart
index 65ef96b..6778b3e 100644
--- a/packages/devtools_app/test/screens/cpu_profiler/cpu_profiler_test.dart
+++ b/packages/devtools_app/test/screens/cpu_profiler/cpu_profiler_test.dart

@@ -18,8 +18,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_test.dart b/packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_test.dart
index d347b76..f2ab3d6 100644
--- a/packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_test.dart
+++ b/packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_test.dart

@@ -12,8 +12,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/cpu_profiler/profiler_screen_test.dart b/packages/devtools_app/test/screens/cpu_profiler/profiler_screen_test.dart
index 01d9115..f37e6e7 100644
--- a/packages/devtools_app/test/screens/cpu_profiler/profiler_screen_test.dart
+++ b/packages/devtools_app/test/screens/cpu_profiler/profiler_screen_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app/src/shared/ui/vm_flag_widgets.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../test_infra/scenes/cpu_profiler/default.dart';
 import '../../test_infra/scenes/scene_test_extensions.dart';

diff --git a/packages/devtools_app/test/screens/debugger/debugger_codeview_statistics_test.dart b/packages/devtools_app/test/screens/debugger/debugger_codeview_statistics_test.dart
index 56e199f..188e171 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_codeview_statistics_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_codeview_statistics_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/debugger/debugger_codeview_test.dart b/packages/devtools_app/test/screens/debugger/debugger_codeview_test.dart
index db88c2f..b516b42 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_codeview_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_codeview_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/debugger/debugger_console_test.dart b/packages/devtools_app/test/screens/debugger/debugger_console_test.dart
index 392bc0d..4e9b187 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_console_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_console_test.dart

@@ -9,9 +9,9 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/utils/ansi.dart';

diff --git a/packages/devtools_app/test/screens/debugger/debugger_controls_overflow_test.dart b/packages/devtools_app/test/screens/debugger/debugger_controls_overflow_test.dart
index 729f550..8692075 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_controls_overflow_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_controls_overflow_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/debugger/debugger_floating_test.dart b/packages/devtools_app/test/screens/debugger/debugger_floating_test.dart
index 0618500..226e08a 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_floating_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_floating_test.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/debugger/debugger_screen_breakpoints_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_breakpoints_test.dart
index 90594f9..98e7f6f 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_screen_breakpoints_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_screen_breakpoints_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/debugger/debugger_screen_call_stack_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_call_stack_test.dart
index 9d697fe..1b26cac 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_screen_call_stack_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_screen_call_stack_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/debugger/debugger_screen_dap_variables_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_dap_variables_test.dart
index f227f29..18aff35 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_screen_dap_variables_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_screen_dap_variables_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/debugger/debugger_screen_explorer_visibility_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_explorer_visibility_test.dart
index 29d92c2..2432b55 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_screen_explorer_visibility_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_screen_explorer_visibility_test.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/debugger/debugger_screen_paused_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_paused_test.dart
index 8507c46..5620111 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_screen_paused_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_screen_paused_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/debugger/debugger_screen_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_test.dart
index daa2f64..72ee823 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_screen_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_screen_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/debugger/debugger_screen_variables_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_variables_test.dart
index 2146435..4c3688f 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_screen_variables_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_screen_variables_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/utils/variable_utils.dart';

diff --git a/packages/devtools_app/test/screens/debugger/debugger_scripts_test.dart b/packages/devtools_app/test/screens/debugger/debugger_scripts_test.dart
index 213c80f..67d1238 100644
--- a/packages/devtools_app/test/screens/debugger/debugger_scripts_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_scripts_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/debugger/eval_field_test.dart b/packages/devtools_app/test/screens/debugger/eval_field_test.dart
index 959cb92..221a2ab 100644
--- a/packages/devtools_app/test/screens/debugger/eval_field_test.dart
+++ b/packages/devtools_app/test/screens/debugger/eval_field_test.dart

@@ -10,9 +10,9 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   group('ExpressionEvalField', () {

diff --git a/packages/devtools_app/test/screens/debugger/file_search_test.dart b/packages/devtools_app/test/screens/debugger/file_search_test.dart
index 7693fde..ac06a62 100644
--- a/packages/devtools_app/test/screens/debugger/file_search_test.dart
+++ b/packages/devtools_app/test/screens/debugger/file_search_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/debugger/program_explorer_test.dart b/packages/devtools_app/test/screens/debugger/program_explorer_test.dart
index 189a7f5..afde87f 100644
--- a/packages/devtools_app/test/screens/debugger/program_explorer_test.dart
+++ b/packages/devtools_app/test/screens/debugger/program_explorer_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/debugger/syntax_highlighter_test.dart b/packages/devtools_app/test/screens/debugger/syntax_highlighter_test.dart
index b8b8fc1..2588d53 100644
--- a/packages/devtools_app/test/screens/debugger/syntax_highlighter_test.dart
+++ b/packages/devtools_app/test/screens/debugger/syntax_highlighter_test.dart

@@ -8,6 +8,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:cupertino_ui/cupertino_ui.dart';
 import 'package:devtools_app/src/screens/debugger/span_parser.dart';
 import 'package:devtools_app/src/screens/debugger/syntax_highlighter.dart';
 import 'package:devtools_app/src/shared/framework/routing.dart';
@@ -15,9 +16,8 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 const modifierSpans = [
   // Start multi-capture spans

diff --git a/packages/devtools_app/test/screens/deep_link_validation/deep_links_screen_test.dart b/packages/devtools_app/test/screens/deep_link_validation/deep_links_screen_test.dart
index e94daac..aa503ec 100644
--- a/packages/devtools_app/test/screens/deep_link_validation/deep_links_screen_test.dart
+++ b/packages/devtools_app/test/screens/deep_link_validation/deep_links_screen_test.dart

@@ -17,8 +17,8 @@
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:dtd/dtd.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/test_data/deep_link/fake_responses.dart';

diff --git a/packages/devtools_app/test/screens/deep_link_validation/select_project_view_test.dart b/packages/devtools_app/test/screens/deep_link_validation/select_project_view_test.dart
index 7602c18..4a847b0 100644
--- a/packages/devtools_app/test/screens/deep_link_validation/select_project_view_test.dart
+++ b/packages/devtools_app/test/screens/deep_link_validation/select_project_view_test.dart

@@ -12,8 +12,8 @@
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:dtd/dtd.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/utils/deep_links_utils.dart';

diff --git a/packages/devtools_app/test/screens/dtd/dtd_tools_screen_test.dart b/packages/devtools_app/test/screens/dtd/dtd_tools_screen_test.dart
index b705321..407f882 100644
--- a/packages/devtools_app/test/screens/dtd/dtd_tools_screen_test.dart
+++ b/packages/devtools_app/test/screens/dtd/dtd_tools_screen_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:dtd/dtd.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/dtd/events_test.dart b/packages/devtools_app/test/screens/dtd/events_test.dart
index 1bae605..afc43f2 100644
--- a/packages/devtools_app/test/screens/dtd/events_test.dart
+++ b/packages/devtools_app/test/screens/dtd/events_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:dtd/dtd.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/dtd/services_test.dart b/packages/devtools_app/test/screens/dtd/services_test.dart
index ab30f56..c1768bd 100644
--- a/packages/devtools_app/test/screens/dtd/services_test.dart
+++ b/packages/devtools_app/test/screens/dtd/services_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:dtd/dtd.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/inspector/diagnostics_test.dart b/packages/devtools_app/test/screens/inspector/diagnostics_test.dart
index 97f24b6..3bff21c 100644
--- a/packages/devtools_app/test/screens/inspector/diagnostics_test.dart
+++ b/packages/devtools_app/test/screens/inspector/diagnostics_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   group('DiagnosticsNodeDescription', () {

diff --git a/packages/devtools_app/test/screens/inspector/inspector_error_navigator_test.dart b/packages/devtools_app/test/screens/inspector/inspector_error_navigator_test.dart
index 0d339af..00cb66c 100644
--- a/packages/devtools_app/test/screens/inspector/inspector_error_navigator_test.dart
+++ b/packages/devtools_app/test/screens/inspector/inspector_error_navigator_test.dart

@@ -5,14 +5,13 @@
 import 'dart:collection';
 
 import 'package:devtools_app/devtools_app.dart';
-
 import 'package:devtools_app/src/shared/feature_flags.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   setUp(() {

diff --git a/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart b/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart
index 3f09b29..e29a6f2 100644
--- a/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart
+++ b/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart

@@ -15,8 +15,8 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:path/path.dart' as p;
 
 import '../../test_infra/flutter_test_driver.dart' show FlutterRunConfiguration;

diff --git a/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart b/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart
index 32cebaa..a33a076 100644
--- a/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart
+++ b/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart

@@ -18,8 +18,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart' hide Fake;
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/flutter_test_storage.dart';

diff --git a/packages/devtools_app/test/screens/inspector/inspector_tree_test.dart b/packages/devtools_app/test/screens/inspector/inspector_tree_test.dart
index c6ae0e9..e067c5a 100644
--- a/packages/devtools_app/test/screens/inspector/inspector_tree_test.dart
+++ b/packages/devtools_app/test/screens/inspector/inspector_tree_test.dart

@@ -7,9 +7,9 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart' hide Fake;
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import 'utils/inspector_tree.dart';

diff --git a/packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart
index 2b5bf8c..05e7ba8 100644
--- a/packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart
+++ b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart

@@ -4,8 +4,8 @@
 
 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';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../test_infra/matchers/matchers.dart';
 

diff --git a/packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart
index a8b5264..f912a31 100644
--- a/packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart
+++ b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app/src/shared/diagnostics/diagnostics_node.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../test_infra/matchers/matchers.dart';
 

diff --git a/packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart
index a8e0cd0..42645dd 100644
--- a/packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart
+++ b/packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart

@@ -7,9 +7,9 @@
 import 'package:devtools_app/src/shared/primitives/math_utils.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'layout_explorer_test_utils.dart';
 

diff --git a/packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_test_utils.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_test_utils.dart
index c2b1f44..8ab7203 100644
--- a/packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_test_utils.dart
+++ b/packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_test_utils.dart

@@ -4,8 +4,8 @@
 
 import 'package:devtools_app/src/shared/diagnostics/diagnostics_node.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'layout_explorer_serialization_delegate.dart';
 

diff --git a/packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart b/packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart
index 8896361..9546ab0 100644
--- a/packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart
+++ b/packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart

@@ -4,9 +4,9 @@
 
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// Create an `InspectorTreeControllerFlutter` from a single `RemoteDiagnosticsNode`
 InspectorTreeController inspectorTreeControllerFromNode(

diff --git a/packages/devtools_app/test/screens/inspector/widget_creation_location_trailing_test.dart b/packages/devtools_app/test/screens/inspector/widget_creation_location_trailing_test.dart
index 7a93514..694cf72 100644
--- a/packages/devtools_app/test/screens/inspector/widget_creation_location_trailing_test.dart
+++ b/packages/devtools_app/test/screens/inspector/widget_creation_location_trailing_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart' hide Fake;
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/logging/logging_screen_data_test.dart b/packages/devtools_app/test/screens/logging/logging_screen_data_test.dart
index ab38883..d90889c 100644
--- a/packages/devtools_app/test/screens/logging/logging_screen_data_test.dart
+++ b/packages/devtools_app/test/screens/logging/logging_screen_data_test.dart

@@ -12,8 +12,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/utils/ansi.dart';

diff --git a/packages/devtools_app/test/screens/logging/logging_screen_test.dart b/packages/devtools_app/test/screens/logging/logging_screen_test.dart
index 26eb88b..f63dde4 100644
--- a/packages/devtools_app/test/screens/logging/logging_screen_test.dart
+++ b/packages/devtools_app/test/screens/logging/logging_screen_test.dart

@@ -16,8 +16,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/utils/test_utils.dart';

diff --git a/packages/devtools_app/test/screens/logging/metadata_test.dart b/packages/devtools_app/test/screens/logging/metadata_test.dart
index 7844d0a..2a5c093 100644
--- a/packages/devtools_app/test/screens/logging/metadata_test.dart
+++ b/packages/devtools_app/test/screens/logging/metadata_test.dart

@@ -7,9 +7,9 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../test_infra/matchers/matchers.dart';

diff --git a/packages/devtools_app/test/screens/memory/chart/chart_test.dart b/packages/devtools_app/test/screens/memory/chart/chart_test.dart
index 620180e..219dcc2 100644
--- a/packages/devtools_app/test/screens/memory/chart/chart_test.dart
+++ b/packages/devtools_app/test/screens/memory/chart/chart_test.dart

@@ -13,8 +13,8 @@
 import 'package:devtools_shared/devtools_shared.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../test_infra/matchers/matchers.dart';
 import '../../../test_infra/test_data/memory.dart';

diff --git a/packages/devtools_app/test/screens/memory/control/settings_dialog_test.dart b/packages/devtools_app/test/screens/memory/control/settings_dialog_test.dart
index c287d9f..6a2b768 100644
--- a/packages/devtools_app/test/screens/memory/control/settings_dialog_test.dart
+++ b/packages/devtools_app/test/screens/memory/control/settings_dialog_test.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app/src/shared/ui/common_widgets.dart';
 import 'package:devtools_app_shared/src/ui/dialogs.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../test_infra/matchers/matchers.dart';
 import '../../../test_infra/scenes/memory/default.dart';

diff --git a/packages/devtools_app/test/screens/memory/diff/controller/diff_pane_controller_test.dart b/packages/devtools_app/test/screens/memory/diff/controller/diff_pane_controller_test.dart
index 8531dde..1087e26 100644
--- a/packages/devtools_app/test/screens/memory/diff/controller/diff_pane_controller_test.dart
+++ b/packages/devtools_app/test/screens/memory/diff/controller/diff_pane_controller_test.dart

@@ -3,14 +3,14 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app/src/screens/memory/framework/memory_tabs.dart';
-import 'package:devtools_app/src/screens/memory/panes/diff/controller/diff_pane_controller.dart';
 import 'package:devtools_app/src/screens/memory/panes/diff/controller/diff_pane_controller.dart'
     as diff_pane_controller
     show Json;
+import 'package:devtools_app/src/screens/memory/panes/diff/controller/diff_pane_controller.dart';
 import 'package:devtools_app/src/screens/memory/panes/diff/controller/snapshot_item.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../test_infra/scenes/memory/default.dart';
 

diff --git a/packages/devtools_app/test/screens/memory/diff/widgets/class_filter_test.dart b/packages/devtools_app/test/screens/memory/diff/widgets/class_filter_test.dart
index 72d18a5..751fde7 100644
--- a/packages/devtools_app/test/screens/memory/diff/widgets/class_filter_test.dart
+++ b/packages/devtools_app/test/screens/memory/diff/widgets/class_filter_test.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app/src/screens/memory/shared/heap/class_filter.dart';
 import 'package:devtools_app/src/screens/memory/shared/widgets/class_filter.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../test_infra/matchers/matchers.dart';
 import '../../../../test_infra/scenes/memory/diff_snapshot.dart';

diff --git a/packages/devtools_app/test/screens/memory/diff/widgets/diff_pane_test.dart b/packages/devtools_app/test/screens/memory/diff/widgets/diff_pane_test.dart
index ce11537..7c8a7df 100644
--- a/packages/devtools_app/test/screens/memory/diff/widgets/diff_pane_test.dart
+++ b/packages/devtools_app/test/screens/memory/diff/widgets/diff_pane_test.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app/src/screens/memory/panes/diff/diff_pane.dart';
 import 'package:devtools_app/src/screens/memory/panes/diff/widgets/snapshot_list.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../../test_infra/matchers/matchers.dart';
 import '../../../../test_infra/scenes/memory/default.dart';

diff --git a/packages/devtools_app/test/screens/memory/framework/memory_controller_test.dart b/packages/devtools_app/test/screens/memory/framework/memory_controller_test.dart
index 01e8302..e0282d6 100644
--- a/packages/devtools_app/test/screens/memory/framework/memory_controller_test.dart
+++ b/packages/devtools_app/test/screens/memory/framework/memory_controller_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/memory/framework/memory_screen_test.dart b/packages/devtools_app/test/screens/memory/framework/memory_screen_test.dart
index 79befb2..7d11df4 100644
--- a/packages/devtools_app/test/screens/memory/framework/memory_screen_test.dart
+++ b/packages/devtools_app/test/screens/memory/framework/memory_screen_test.dart

@@ -15,8 +15,8 @@
 import 'package:devtools_shared/devtools_shared.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../../test_infra/matchers/matchers.dart';

diff --git a/packages/devtools_app/test/screens/memory/profile/allocation_profile_table_view_test.dart b/packages/devtools_app/test/screens/memory/profile/allocation_profile_table_view_test.dart
index 72c0f19..098a05f 100644
--- a/packages/devtools_app/test/screens/memory/profile/allocation_profile_table_view_test.dart
+++ b/packages/devtools_app/test/screens/memory/profile/allocation_profile_table_view_test.dart

@@ -14,8 +14,8 @@
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../test_infra/scenes/memory/default.dart';
 

diff --git a/packages/devtools_app/test/screens/memory/tracing/tracing_view_test.dart b/packages/devtools_app/test/screens/memory/tracing/tracing_view_test.dart
index d7e8d8e..487460c 100644
--- a/packages/devtools_app/test/screens/memory/tracing/tracing_view_test.dart
+++ b/packages/devtools_app/test/screens/memory/tracing/tracing_view_test.dart

@@ -13,8 +13,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/network/network_profiler_test.dart b/packages/devtools_app/test/screens/network/network_profiler_test.dart
index d955650..9175ccb 100644
--- a/packages/devtools_app/test/screens/network/network_profiler_test.dart
+++ b/packages/devtools_app/test/screens/network/network_profiler_test.dart

@@ -14,8 +14,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../test_infra/test_data/network.dart';

diff --git a/packages/devtools_app/test/screens/network/network_request_inspector_test.dart b/packages/devtools_app/test/screens/network/network_request_inspector_test.dart
index 469ec8e..2373bb6 100644
--- a/packages/devtools_app/test/screens/network/network_request_inspector_test.dart
+++ b/packages/devtools_app/test/screens/network/network_request_inspector_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../test_infra/test_data/network.dart';

diff --git a/packages/devtools_app/test/screens/network/network_screen_test.dart b/packages/devtools_app/test/screens/network/network_screen_test.dart
index 1879f9c..bea09dd 100644
--- a/packages/devtools_app/test/screens/network/network_screen_test.dart
+++ b/packages/devtools_app/test/screens/network/network_screen_test.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/performance/controls/enhance_tracing_test.dart b/packages/devtools_app/test/screens/performance/controls/enhance_tracing_test.dart
index e81e0c9..34caaac 100644
--- a/packages/devtools_app/test/screens/performance/controls/enhance_tracing_test.dart
+++ b/packages/devtools_app/test/screens/performance/controls/enhance_tracing_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/performance/controls/performance_controls_test.dart b/packages/devtools_app/test/screens/performance/controls/performance_controls_test.dart
index b31e015..7a28172 100644
--- a/packages/devtools_app/test/screens/performance/controls/performance_controls_test.dart
+++ b/packages/devtools_app/test/screens/performance/controls/performance_controls_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/screens/performance/flutter_frames/flutter_frames_chart_test.dart b/packages/devtools_app/test/screens/performance/flutter_frames/flutter_frames_chart_test.dart
index 10679f0..920463b 100644
--- a/packages/devtools_app/test/screens/performance/flutter_frames/flutter_frames_chart_test.dart
+++ b/packages/devtools_app/test/screens/performance/flutter_frames/flutter_frames_chart_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../test_infra/test_data/performance/sample_performance_data.dart';
 

diff --git a/packages/devtools_app/test/screens/performance/frame_analysis/frame_analysis_test.dart b/packages/devtools_app/test/screens/performance/frame_analysis/frame_analysis_test.dart
index 085b5ca..257bfa2 100644
--- a/packages/devtools_app/test/screens/performance/frame_analysis/frame_analysis_test.dart
+++ b/packages/devtools_app/test/screens/performance/frame_analysis/frame_analysis_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../../test_infra/matchers/matchers.dart';
 import '../../../test_infra/test_data/performance/sample_performance_data.dart';

diff --git a/packages/devtools_app/test/screens/performance/frame_analysis/frame_hints_test.dart b/packages/devtools_app/test/screens/performance/frame_analysis/frame_hints_test.dart
index b8a3a40..89cc1ea 100644
--- a/packages/devtools_app/test/screens/performance/frame_analysis/frame_hints_test.dart
+++ b/packages/devtools_app/test/screens/performance/frame_analysis/frame_hints_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../../test_infra/test_data/performance/sample_performance_data.dart';

diff --git a/packages/devtools_app/test/screens/performance/performance_screen_test.dart b/packages/devtools_app/test/screens/performance/performance_screen_test.dart
index 8d24ef2..0cae2d4 100644
--- a/packages/devtools_app/test/screens/performance/performance_screen_test.dart
+++ b/packages/devtools_app/test/screens/performance/performance_screen_test.dart

@@ -19,9 +19,9 @@
 import 'package:devtools_shared/devtools_test_utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/test_data/performance/sample_performance_data.dart';

diff --git a/packages/devtools_app/test/screens/performance/tabbed_performance_view_test.dart b/packages/devtools_app/test/screens/performance/tabbed_performance_view_test.dart
index 559e0b1..76543e1 100644
--- a/packages/devtools_app/test/screens/performance/tabbed_performance_view_test.dart
+++ b/packages/devtools_app/test/screens/performance/tabbed_performance_view_test.dart

@@ -14,8 +14,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/test_data/performance/sample_performance_data.dart';

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/object_inspector_view_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/object_inspector_view_test.dart
index 81734b0..addff7f 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/object_inspector_view_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/object_inspector_view_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_class_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_class_display_test.dart
index 429f040..bc45650 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_class_display_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_class_display_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_code_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_code_display_test.dart
index 7fdf14a..cf7139c 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_code_display_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_code_display_test.dart

@@ -12,8 +12,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_developer_common_widgets_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_developer_common_widgets_test.dart
index f2fe081..c874fc7 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_developer_common_widgets_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_developer_common_widgets_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_field_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_field_display_test.dart
index 200f79a..63a14e0 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_field_display_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_field_display_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_function_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_function_display_test.dart
index b0782e9..b684900 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_function_display_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_function_display_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_ic_data_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_ic_data_display_test.dart
index 6bec829..b8bd8d5 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_ic_data_display_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_ic_data_display_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_library_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_library_display_test.dart
index 21cc476..247bde8 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_library_display_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_library_display_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_object_pool_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_object_pool_display_test.dart
index 01f73ee..7bbffc8 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_object_pool_display_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_object_pool_display_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_script_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_script_display_test.dart
index f23afd8..a8c14e1 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_script_display_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_script_display_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_simple_list_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_simple_list_display_test.dart
index 0ce285e..f6d6b9c 100644
--- a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_simple_list_display_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_simple_list_display_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/screens/vm_developer/queued_microtasks/queued_microtasks_view_test.dart b/packages/devtools_app/test/screens/vm_developer/queued_microtasks/queued_microtasks_view_test.dart
index f024b87..6744736 100644
--- a/packages/devtools_app/test/screens/vm_developer/queued_microtasks/queued_microtasks_view_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/queued_microtasks/queued_microtasks_view_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../vm_developer_test_utils.dart';
 

diff --git a/packages/devtools_app/test/service/connection_info_test.dart b/packages/devtools_app/test/service/connection_info_test.dart
index 19c8a33..3eb00d4 100644
--- a/packages/devtools_app/test/service/connection_info_test.dart
+++ b/packages/devtools_app/test/service/connection_info_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/service/service_extension_widgets_test.dart b/packages/devtools_app/test/service/service_extension_widgets_test.dart
index 109ca9a..236a5ca 100644
--- a/packages/devtools_app/test/service/service_extension_widgets_test.dart
+++ b/packages/devtools_app/test/service/service_extension_widgets_test.dart

@@ -17,8 +17,8 @@
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/shared/analytics/analytics_prompt_test.dart b/packages/devtools_app/test/shared/analytics/analytics_prompt_test.dart
index 255738e..3a1f0ed 100644
--- a/packages/devtools_app/test/shared/analytics/analytics_prompt_test.dart
+++ b/packages/devtools_app/test/shared/analytics/analytics_prompt_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:provider/provider.dart';
 import 'package:unified_analytics/src/constants.dart' as ua;
 

diff --git a/packages/devtools_app/test/shared/ansi_output_test.dart b/packages/devtools_app/test/shared/ansi_output_test.dart
index f8f4110..1903fa0 100644
--- a/packages/devtools_app/test/shared/ansi_output_test.dart
+++ b/packages/devtools_app/test/shared/ansi_output_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../test_infra/utils/ansi.dart';

diff --git a/packages/devtools_app/test/shared/charts/flame_chart_test.dart b/packages/devtools_app/test/shared/charts/flame_chart_test.dart
index 228484c..3915664 100644
--- a/packages/devtools_app/test/shared/charts/flame_chart_test.dart
+++ b/packages/devtools_app/test/shared/charts/flame_chart_test.dart

@@ -12,9 +12,9 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/test_data/cpu_profiler/cpu_profile.dart';

diff --git a/packages/devtools_app/test/shared/charts/treemap_test.dart b/packages/devtools_app/test/shared/charts/treemap_test.dart
index 65805f8..f5d24be 100644
--- a/packages/devtools_app/test/shared/charts/treemap_test.dart
+++ b/packages/devtools_app/test/shared/charts/treemap_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_snapshot_analysis/treemap.dart';
 
 import '../../test_infra/matchers/matchers.dart';

diff --git a/packages/devtools_app/test/shared/framework/routing_test.dart b/packages/devtools_app/test/shared/framework/routing_test.dart
index 5e74c37..29085ef 100644
--- a/packages/devtools_app/test/shared/framework/routing_test.dart
+++ b/packages/devtools_app/test/shared/framework/routing_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 class TestController extends DisposableController with RouteStateHandlerMixin {
   int count = 0;

diff --git a/packages/devtools_app/test/shared/framework/screens_test.dart b/packages/devtools_app/test/shared/framework/screens_test.dart
index 14bf1d3..d1483bb 100644
--- a/packages/devtools_app/test/shared/framework/screens_test.dart
+++ b/packages/devtools_app/test/shared/framework/screens_test.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/shared.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   setUp(() {

diff --git a/packages/devtools_app/test/shared/managers/banner_messages_test.dart b/packages/devtools_app/test/shared/managers/banner_messages_test.dart
index dedf7e2..6f74671 100644
--- a/packages/devtools_app/test/shared/managers/banner_messages_test.dart
+++ b/packages/devtools_app/test/shared/managers/banner_messages_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   late FakeServiceConnectionManager fakeServiceConnection;

diff --git a/packages/devtools_app/test/shared/primitives/linked_scroll_controller_test.dart b/packages/devtools_app/test/shared/primitives/linked_scroll_controller_test.dart
index 2ec8be6..aa182b2 100644
--- a/packages/devtools_app/test/shared/primitives/linked_scroll_controller_test.dart
+++ b/packages/devtools_app/test/shared/primitives/linked_scroll_controller_test.dart

@@ -5,8 +5,8 @@
 import 'dart:async';
 
 import 'package:devtools_app/src/shared/primitives/flutter_widgets/linked_scroll_controller.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 // This file was originally forked from package:flutter_widgets. Note that the
 // source may diverge over time.

diff --git a/packages/devtools_app/test/shared/primitives/utils_test.dart b/packages/devtools_app/test/shared/primitives/utils_test.dart
index f71c0ca..98581e5 100644
--- a/packages/devtools_app/test/shared/primitives/utils_test.dart
+++ b/packages/devtools_app/test/shared/primitives/utils_test.dart

@@ -5,9 +5,9 @@
 import 'package:collection/collection.dart';
 import 'package:devtools_app/src/shared/primitives/utils.dart';
 import 'package:devtools_shared/devtools_test_utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   group('utils', () {

diff --git a/packages/devtools_app/test/shared/table/table_test.dart b/packages/devtools_app/test/shared/table/table_test.dart
index f977bb6..a2ab62f 100644
--- a/packages/devtools_app/test/shared/table/table_test.dart
+++ b/packages/devtools_app/test/shared/table/table_test.dart

@@ -11,9 +11,9 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart' hide TableRow, Table;
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart' hide TableRow, Table;
 
 class _NonSortableFlatNameColumn extends ColumnData<TestData> {
   _NonSortableFlatNameColumn.wide(super.title) : super.wide();

diff --git a/packages/devtools_app/test/shared/ui/auto_complete_test.dart b/packages/devtools_app/test/shared/ui/auto_complete_test.dart
index 47d70a1..2f1dfc2 100644
--- a/packages/devtools_app/test/shared/ui/auto_complete_test.dart
+++ b/packages/devtools_app/test/shared/ui/auto_complete_test.dart

@@ -5,8 +5,8 @@
 // ignore_for_file: avoid_print
 
 import 'package:devtools_app/src/shared/ui/search.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 // Set debug to true displays editing parts.
 bool debug = false;

diff --git a/packages/devtools_app/test/shared/ui/common_widgets_test.dart b/packages/devtools_app/test/shared/ui/common_widgets_test.dart
index c882092..8f02c37 100644
--- a/packages/devtools_app/test/shared/ui/common_widgets_test.dart
+++ b/packages/devtools_app/test/shared/ui/common_widgets_test.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 // TODO(kenz): add tests for other widgets in common_widgets.dart
 

diff --git a/packages/devtools_app/test/shared/ui/editable_list_test.dart b/packages/devtools_app/test/shared/ui/editable_list_test.dart
index 64d7e0b..4fb28d4 100644
--- a/packages/devtools_app/test/shared/ui/editable_list_test.dart
+++ b/packages/devtools_app/test/shared/ui/editable_list_test.dart

@@ -7,8 +7,8 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../test_infra/utils/test_utils.dart';
 

diff --git a/packages/devtools_app/test/shared/ui/hover_positioning_test.dart b/packages/devtools_app/test/shared/ui/hover_positioning_test.dart
index 4a5d968..29025dd 100644
--- a/packages/devtools_app/test/shared/ui/hover_positioning_test.dart
+++ b/packages/devtools_app/test/shared/ui/hover_positioning_test.dart

@@ -5,8 +5,8 @@
 import 'package:devtools_app/src/shared/ui/hover.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 const _windowWidth = 800.0;
 const _windowHeight = 600.0;

diff --git a/packages/devtools_app/test/shared/ui/search_highlighter_test.dart b/packages/devtools_app/test/shared/ui/search_highlighter_test.dart
index 00b172d..c65860e 100644
--- a/packages/devtools_app/test/shared/ui/search_highlighter_test.dart
+++ b/packages/devtools_app/test/shared/ui/search_highlighter_test.dart

@@ -5,8 +5,8 @@
 import 'package:devtools_app/src/shared/primitives/utils.dart';
 import 'package:devtools_app/src/shared/ui/search_highlighter.dart';
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   const style = TextStyle(fontSize: 12.0);

diff --git a/packages/devtools_app/test/shared/ui/search_test.dart b/packages/devtools_app/test/shared/ui/search_test.dart
index e98e83e..5bef4c1 100644
--- a/packages/devtools_app/test/shared/ui/search_test.dart
+++ b/packages/devtools_app/test/shared/ui/search_test.dart

@@ -5,8 +5,8 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:fake_async/fake_async.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   late TestSearchController searchController;

diff --git a/packages/devtools_app/test/shared/ui/side_panel_test.dart b/packages/devtools_app/test/shared/ui/side_panel_test.dart
index 8d003a0..73a4700 100644
--- a/packages/devtools_app/test/shared/ui/side_panel_test.dart
+++ b/packages/devtools_app/test/shared/ui/side_panel_test.dart

@@ -5,8 +5,8 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// The smallest contrast ratio WCAG 2.1 accepts for body text at level AA.
 ///
@@ -41,6 +41,9 @@
                 colorScheme: useDarkTheme ? darkColorScheme : lightColorScheme,
               ),
             ),
+            builder: (context, child) =>
+                // ignore: deprecated_member_use, needed for markdown package
+                MaterialUiCompatibilityBridge(child: child!),
             home: SidePanelViewer(controller: controller),
           ),
         );

diff --git a/packages/devtools_app/test/shared/ui/ui_utils_test.dart b/packages/devtools_app/test/shared/ui/ui_utils_test.dart
index 16982a0..5b00688 100644
--- a/packages/devtools_app/test/shared/ui/ui_utils_test.dart
+++ b/packages/devtools_app/test/shared/ui/ui_utils_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../../test_infra/matchers/matchers.dart';
 

diff --git a/packages/devtools_app/test/shared/ui/vm_flag_widgets_test.dart b/packages/devtools_app/test/shared/ui/vm_flag_widgets_test.dart
index 65ad73d..1c38d4a 100644
--- a/packages/devtools_app/test/shared/ui/vm_flag_widgets_test.dart
+++ b/packages/devtools_app/test/shared/ui/vm_flag_widgets_test.dart

@@ -11,8 +11,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 

diff --git a/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/property_editor_test.dart b/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/property_editor_test.dart
index 1145e40..a14c937 100644
--- a/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/property_editor_test.dart
+++ b/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/property_editor_test.dart

@@ -17,9 +17,9 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 typedef Location = ({TextDocument document, CursorPosition position});

diff --git a/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/utils_test.dart b/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/utils_test.dart
index eec1e4c..4b9080a 100644
--- a/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/utils_test.dart
+++ b/packages/devtools_app/test/standalone_ui/ide_shared/property_editor/utils_test.dart

@@ -4,8 +4,8 @@
 
 import 'package:devtools_app/src/shared/primitives/utils.dart';
 import 'package:devtools_app/src/standalone_ui/ide_shared/property_editor/utils/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   const regularFontStyle = TextStyle(color: Colors.black);

diff --git a/packages/devtools_app/test/standalone_ui/vs_code/debug_sessions_test.dart b/packages/devtools_app/test/standalone_ui/vs_code/debug_sessions_test.dart
index a6aa785..90933f1 100644
--- a/packages/devtools_app/test/standalone_ui/vs_code/debug_sessions_test.dart
+++ b/packages/devtools_app/test/standalone_ui/vs_code/debug_sessions_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/utils/sidebar_utils.dart';

diff --git a/packages/devtools_app/test/standalone_ui/vs_code/devtools_test.dart b/packages/devtools_app/test/standalone_ui/vs_code/devtools_test.dart
index 2eb7207..2c0a342 100644
--- a/packages/devtools_app/test/standalone_ui/vs_code/devtools_test.dart
+++ b/packages/devtools_app/test/standalone_ui/vs_code/devtools_test.dart

@@ -13,8 +13,8 @@
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:dtd/dtd.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 
 import '../../test_infra/utils/sidebar_utils.dart';

diff --git a/packages/devtools_app/test/test_infra/fixtures/custom_widgets/lib/src/widgets.dart b/packages/devtools_app/test/test_infra/fixtures/custom_widgets/lib/src/widgets.dart
index 4084be2..2203b46 100644
--- a/packages/devtools_app/test/test_infra/fixtures/custom_widgets/lib/src/widgets.dart
+++ b/packages/devtools_app/test/test_infra/fixtures/custom_widgets/lib/src/widgets.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:flutter/material.dart';
 import 'package:flutter/widgets.dart';
+import 'package:material_ui/material_ui.dart';
 
 class CustomApp extends StatelessWidget {
   const CustomApp({

diff --git a/packages/devtools_app/test/test_infra/fixtures/custom_widgets/pubspec.yaml b/packages/devtools_app/test/test_infra/fixtures/custom_widgets/pubspec.yaml
index ffe19a4..6905089 100644
--- a/packages/devtools_app/test/test_infra/fixtures/custom_widgets/pubspec.yaml
+++ b/packages/devtools_app/test/test_infra/fixtures/custom_widgets/pubspec.yaml

@@ -8,3 +8,4 @@
 dependencies:
   flutter:
     sdk: flutter
+  material_ui: ^1.4.0

diff --git a/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/main.dart b/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/main.dart
index cd77468..a1b1a85 100644
--- a/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/main.dart
+++ b/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/main.dart

@@ -8,7 +8,7 @@
 // debugger panel integration test will need to be updated with new line numbers
 // (the test verifies that breakpoints are hit at specific lines).
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'src/autocomplete.dart';
 import 'src/other_classes.dart';
 

diff --git a/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/src/other_classes.dart b/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/src/other_classes.dart
index 1cd9568..6eee692 100644
--- a/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/src/other_classes.dart
+++ b/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/src/other_classes.dart

@@ -8,7 +8,7 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 // Unused class in the sample application that is a widget.
 //

diff --git a/packages/devtools_app/test/test_infra/fixtures/flutter_app/pubspec.yaml b/packages/devtools_app/test/test_infra/fixtures/flutter_app/pubspec.yaml
index 98e13e7..3b331f4 100644
--- a/packages/devtools_app/test/test_infra/fixtures/flutter_app/pubspec.yaml
+++ b/packages/devtools_app/test/test_infra/fixtures/flutter_app/pubspec.yaml

@@ -11,8 +11,10 @@
   flutter: '>=3.0.0'
 
 dependencies:
+  # ignore: dependencies, required for Flutter SDK.
   flutter:
     sdk: flutter
+  material_ui: ^1.4.0
 
 dev_dependencies:
   flutter_lints: ^6.0.0

diff --git a/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/lib/main.dart b/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/lib/main.dart
index 0ca4430..da90771 100644
--- a/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/lib/main.dart
+++ b/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/lib/main.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'missing_material_error.dart';
 

diff --git a/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/lib/missing_material_error.dart b/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/lib/missing_material_error.dart
index 04110b1..f84eb7a 100644
--- a/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/lib/missing_material_error.dart
+++ b/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/lib/missing_material_error.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 class MissingMaterialError extends StatelessWidget {
   const MissingMaterialError({super.key});

diff --git a/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/pubspec.yaml b/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/pubspec.yaml
index b123fbe..ec25520 100644
--- a/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/pubspec.yaml
+++ b/packages/devtools_app/test/test_infra/fixtures/flutter_error_app/pubspec.yaml

@@ -17,8 +17,10 @@
   flutter: '>=3.0.0'
 
 dependencies:
+  # ignore: dependencies, required for Flutter SDK.
   flutter:
     sdk: flutter
+  material_ui: ^1.4.0
 
 dev_dependencies:
   flutter_lints: ^6.0.0

diff --git a/packages/devtools_app/test/test_infra/fixtures/inspector_app/lib/main.dart b/packages/devtools_app/test/test_infra/fixtures/inspector_app/lib/main.dart
index 8387b9d..356c799 100644
--- a/packages/devtools_app/test/test_infra/fixtures/inspector_app/lib/main.dart
+++ b/packages/devtools_app/test/test_infra/fixtures/inspector_app/lib/main.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:custom_widgets/custom_widgets.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   runApp(

diff --git a/packages/devtools_app/test/test_infra/fixtures/inspector_app/lib/overflow_errors.dart b/packages/devtools_app/test/test_infra/fixtures/inspector_app/lib/overflow_errors.dart
index 09cd1f1..b0e7f60 100644
--- a/packages/devtools_app/test/test_infra/fixtures/inspector_app/lib/overflow_errors.dart
+++ b/packages/devtools_app/test/test_infra/fixtures/inspector_app/lib/overflow_errors.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() => runApp(const OverflowingApp());
 

diff --git a/packages/devtools_app/test/test_infra/fixtures/inspector_app/pubspec.yaml b/packages/devtools_app/test/test_infra/fixtures/inspector_app/pubspec.yaml
index bdc06f5..9c4e76d 100644
--- a/packages/devtools_app/test/test_infra/fixtures/inspector_app/pubspec.yaml
+++ b/packages/devtools_app/test/test_infra/fixtures/inspector_app/pubspec.yaml

@@ -11,10 +11,12 @@
   flutter: '>=3.0.0'
 
 dependencies:
+  # ignore: dependencies, required for Flutter SDK.
   flutter:
     sdk: flutter
   custom_widgets:
     path: ../custom_widgets
+  material_ui: ^1.4.0
 
 dev_dependencies:
   flutter_lints: ^6.0.0

diff --git a/packages/devtools_app/test/test_infra/fixtures/memory_app/lib/main.dart b/packages/devtools_app/test/test_infra/fixtures/memory_app/lib/main.dart
index 34c6757..a74e7cd 100644
--- a/packages/devtools_app/test/test_infra/fixtures/memory_app/lib/main.dart
+++ b/packages/devtools_app/test/test_infra/fixtures/memory_app/lib/main.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   runApp(const MyApp());

diff --git a/packages/devtools_app/test/test_infra/fixtures/memory_app/pubspec.yaml b/packages/devtools_app/test/test_infra/fixtures/memory_app/pubspec.yaml
index c4c76cf..8d6a6f7 100644
--- a/packages/devtools_app/test/test_infra/fixtures/memory_app/pubspec.yaml
+++ b/packages/devtools_app/test/test_infra/fixtures/memory_app/pubspec.yaml

@@ -11,8 +11,10 @@
   flutter: '>=3.0.0'
 
 dependencies:
+  # ignore: dependencies, required for Flutter SDK.
   flutter:
     sdk: flutter
+  material_ui: ^1.4.0
 
 dev_dependencies:
   flutter_lints: ^6.0.0

diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png
index a4790c8..e8811c3 100644
--- a/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png
+++ b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png
Binary files differ

diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png
index a4790c8..e8811c3 100644
--- a/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png
+++ b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png
Binary files differ

diff --git a/packages/devtools_app/test/test_infra/scenes/cpu_profiler/default.dart b/packages/devtools_app/test/test_infra/scenes/cpu_profiler/default.dart
index a4ff98d..a014a6f 100644
--- a/packages/devtools_app/test/test_infra/scenes/cpu_profiler/default.dart
+++ b/packages/devtools_app/test/test_infra/scenes/cpu_profiler/default.dart

@@ -9,7 +9,7 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:stager/stager.dart';
 import 'package:vm_service/vm_service.dart';

diff --git a/packages/devtools_app/test/test_infra/scenes/hello.dart b/packages/devtools_app/test/test_infra/scenes/hello.dart
index c459ecb..a5a4b44 100644
--- a/packages/devtools_app/test/test_infra/scenes/hello.dart
+++ b/packages/devtools_app/test/test_infra/scenes/hello.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:stager/stager.dart';
 
 /// To run:

diff --git a/packages/devtools_app/test/test_infra/scenes/memory/default.dart b/packages/devtools_app/test/test_infra/scenes/memory/default.dart
index 1827a0f..58cf958 100644
--- a/packages/devtools_app/test/test_infra/scenes/memory/default.dart
+++ b/packages/devtools_app/test/test_infra/scenes/memory/default.dart

@@ -12,8 +12,8 @@
 import 'package:devtools_shared/devtools_shared.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:stager/stager.dart';
 import 'package:vm_service/vm_service.dart';

diff --git a/packages/devtools_app/test/test_infra/scenes/memory/diff_snapshot.dart b/packages/devtools_app/test/test_infra/scenes/memory/diff_snapshot.dart
index ce34c5f..a5b4eb6 100644
--- a/packages/devtools_app/test/test_infra/scenes/memory/diff_snapshot.dart
+++ b/packages/devtools_app/test/test_infra/scenes/memory/diff_snapshot.dart

@@ -10,8 +10,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:devtools_test/helpers.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:stager/stager.dart';
 
 import '../../test_data/memory/heap/heap_data.dart';

diff --git a/packages/devtools_app/test/test_infra/scenes/performance/default.dart b/packages/devtools_app/test/test_infra/scenes/performance/default.dart
index aec9c04..40db77d 100644
--- a/packages/devtools_app/test/test_infra/scenes/performance/default.dart
+++ b/packages/devtools_app/test/test_infra/scenes/performance/default.dart

@@ -10,7 +10,7 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:devtools_test/test_data.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:stager/stager.dart';
 
 /// To run:

diff --git a/packages/devtools_app/test/test_infra/scenes/scene_test_extensions.dart b/packages/devtools_app/test/test_infra/scenes/scene_test_extensions.dart
index 7e64857..ddd5440 100644
--- a/packages/devtools_app/test/test_infra/scenes/scene_test_extensions.dart
+++ b/packages/devtools_app/test/test_infra/scenes/scene_test_extensions.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:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:stager/stager.dart';
 
 extension StagerTestExtensions on WidgetTester {

diff --git a/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_sidebar.dart b/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_sidebar.dart
index bdf9512..2e0bb46 100644
--- a/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_sidebar.dart
+++ b/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_sidebar.dart

@@ -9,7 +9,7 @@
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:stager/stager.dart';
 
 import 'editor_service/simulated_editor.dart';

diff --git a/packages/devtools_app/test/test_infra/scenes/standalone_ui/mock_editor_widget.dart b/packages/devtools_app/test/test_infra/scenes/standalone_ui/mock_editor_widget.dart
index d13c090..f058e3a 100644
--- a/packages/devtools_app/test/test_infra/scenes/standalone_ui/mock_editor_widget.dart
+++ b/packages/devtools_app/test/test_infra/scenes/standalone_ui/mock_editor_widget.dart

@@ -10,7 +10,7 @@
 import 'package:devtools_app/src/shared/primitives/list_queue_value_notifier.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'editor_service/simulated_editor.dart';
 import 'shared/common_ui.dart';

diff --git a/packages/devtools_app/test/test_infra/scenes/standalone_ui/property_editor_sidebar.dart b/packages/devtools_app/test/test_infra/scenes/standalone_ui/property_editor_sidebar.dart
index 7f67925..6fffa69 100644
--- a/packages/devtools_app/test/test_infra/scenes/standalone_ui/property_editor_sidebar.dart
+++ b/packages/devtools_app/test/test_infra/scenes/standalone_ui/property_editor_sidebar.dart

@@ -9,7 +9,7 @@
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:stager/stager.dart';
 
 import 'editor_service/simulated_editor.dart';

diff --git a/packages/devtools_app/test/test_infra/scenes/standalone_ui/shared/common_ui.dart b/packages/devtools_app/test/test_infra/scenes/standalone_ui/shared/common_ui.dart
index 7a089a8..28b3a1f 100644
--- a/packages/devtools_app/test/test_infra/scenes/standalone_ui/shared/common_ui.dart
+++ b/packages/devtools_app/test/test_infra/scenes/standalone_ui/shared/common_ui.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/shared.dart';
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 class IdeThemedMaterialApp extends StatelessWidget {
   const IdeThemedMaterialApp({super.key, required this.home});

diff --git a/packages/devtools_app/test/test_infra/utils/debugger_utils.dart b/packages/devtools_app/test/test_infra/utils/debugger_utils.dart
index 8a8e75e..4f9b74e 100644
--- a/packages/devtools_app/test/test_infra/utils/debugger_utils.dart
+++ b/packages/devtools_app/test/test_infra/utils/debugger_utils.dart

@@ -3,8 +3,8 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 Finder findDebuggerButtonWithIcon(IconData icon) => find.ancestor(
   of: find.byWidgetPredicate(

diff --git a/packages/devtools_app_shared/example/ui/common_example.dart b/packages/devtools_app_shared/example/ui/common_example.dart
index e047dc2..90935ea 100644
--- a/packages/devtools_app_shared/example/ui/common_example.dart
+++ b/packages/devtools_app_shared/example/ui/common_example.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart' as devtools_shared_ui;
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 class ExampleWidget extends StatelessWidget {
   const ExampleWidget({super.key});

diff --git a/packages/devtools_app_shared/example/ui/dialog_example.dart b/packages/devtools_app_shared/example/ui/dialog_example.dart
index 3100916..3cffa0a 100644
--- a/packages/devtools_app_shared/example/ui/dialog_example.dart
+++ b/packages/devtools_app_shared/example/ui/dialog_example.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart' as devtools_shared_ui;
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// Example of using a [devtools_shared_ui.DevToolsDialog] widget from
 /// 'package:devtools_app_shared/ui.dart'.

diff --git a/packages/devtools_app_shared/example/ui/split_example.dart b/packages/devtools_app_shared/example/ui/split_example.dart
index 71ff8cd..01d5f43 100644
--- a/packages/devtools_app_shared/example/ui/split_example.dart
+++ b/packages/devtools_app_shared/example/ui/split_example.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart' as devtools_shared_ui;
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// Example of using the [devtools_shared_ui.SplitPane] widget from
 /// 'package:devtools_app_shared/ui.dart' with two children laid across a

diff --git a/packages/devtools_app_shared/lib/src/service/service_extensions.dart b/packages/devtools_app_shared/lib/src/service/service_extensions.dart
index 608c7c8..89d75f1 100644
--- a/packages/devtools_app_shared/lib/src/service/service_extensions.dart
+++ b/packages/devtools_app_shared/lib/src/service/service_extensions.dart

@@ -3,10 +3,10 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 
 class ServiceExtension<T> {
   ServiceExtension({

diff --git a/packages/devtools_app_shared/lib/src/ui/buttons.dart b/packages/devtools_app_shared/lib/src/ui/buttons.dart
index c726cac..7665669 100644
--- a/packages/devtools_app_shared/lib/src/ui/buttons.dart
+++ b/packages/devtools_app_shared/lib/src/ui/buttons.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'common.dart';
 import 'theme/theme.dart';

diff --git a/packages/devtools_app_shared/lib/src/ui/common.dart b/packages/devtools_app_shared/lib/src/ui/common.dart
index f27a29c..322ebcb 100644
--- a/packages/devtools_app_shared/lib/src/ui/common.dart
+++ b/packages/devtools_app_shared/lib/src/ui/common.dart

@@ -5,7 +5,7 @@
 import 'dart:convert';
 
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../utils/url/url.dart';
 import '../utils/utils.dart';

diff --git a/packages/devtools_app_shared/lib/src/ui/dialogs.dart b/packages/devtools_app_shared/lib/src/ui/dialogs.dart
index 8eb9162..bb20d79 100644
--- a/packages/devtools_app_shared/lib/src/ui/dialogs.dart
+++ b/packages/devtools_app_shared/lib/src/ui/dialogs.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:pointer_interceptor/pointer_interceptor.dart';
 
 import 'common.dart';

diff --git a/packages/devtools_app_shared/lib/src/ui/flex_split_column.dart b/packages/devtools_app_shared/lib/src/ui/flex_split_column.dart
index ee7cc76..08f5ea4 100644
--- a/packages/devtools_app_shared/lib/src/ui/flex_split_column.dart
+++ b/packages/devtools_app_shared/lib/src/ui/flex_split_column.dart

@@ -5,7 +5,7 @@
 /// @docImport 'package:devtools_app_shared/src/ui/common.dart';
 library;
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'split_pane.dart';
 

diff --git a/packages/devtools_app_shared/lib/src/ui/icons.dart b/packages/devtools_app_shared/lib/src/ui/icons.dart
index 4661641..89be41c 100644
--- a/packages/devtools_app_shared/lib/src/ui/icons.dart
+++ b/packages/devtools_app_shared/lib/src/ui/icons.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'theme/theme.dart';
 

diff --git a/packages/devtools_app_shared/lib/src/ui/split_pane.dart b/packages/devtools_app_shared/lib/src/ui/split_pane.dart
index d68a2e6..5f0fdc9 100644
--- a/packages/devtools_app_shared/lib/src/ui/split_pane.dart
+++ b/packages/devtools_app_shared/lib/src/ui/split_pane.dart

@@ -5,7 +5,7 @@
 import 'dart:math' as math;
 
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../utils/utils.dart';
 

diff --git a/packages/devtools_app_shared/lib/src/ui/text_field.dart b/packages/devtools_app_shared/lib/src/ui/text_field.dart
index 918963a..2ba1676 100644
--- a/packages/devtools_app_shared/lib/src/ui/text_field.dart
+++ b/packages/devtools_app_shared/lib/src/ui/text_field.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'common.dart';
 import 'theme/theme.dart';

diff --git a/packages/devtools_app_shared/lib/src/ui/theme/theme.dart b/packages/devtools_app_shared/lib/src/ui/theme/theme.dart
index cc3f080..ab3a100 100644
--- a/packages/devtools_app_shared/lib/src/ui/theme/theme.dart
+++ b/packages/devtools_app_shared/lib/src/ui/theme/theme.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../ui_utils.dart';
 import 'ide_theme.dart';

diff --git a/packages/devtools_app_shared/lib/src/utils/utils.dart b/packages/devtools_app_shared/lib/src/utils/utils.dart
index df6db61..53f84f9 100644
--- a/packages/devtools_app_shared/lib/src/utils/utils.dart
+++ b/packages/devtools_app_shared/lib/src/utils/utils.dart

@@ -6,7 +6,7 @@
 import 'dart:math';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 // Method to convert degrees to radians
 double degToRad(num deg) => deg * (pi / 180.0);

diff --git a/packages/devtools_app_shared/pubspec.yaml b/packages/devtools_app_shared/pubspec.yaml
index 9f41284..786defe 100644
--- a/packages/devtools_app_shared/pubspec.yaml
+++ b/packages/devtools_app_shared/pubspec.yaml

@@ -20,6 +20,7 @@
   flutter:
     sdk: flutter
   logging: ^1.1.1
+  material_ui: ^1.4.0
   meta: ^1.9.1
   path: ^1.8.0
   pointer_interceptor: ^0.10.1+1

diff --git a/packages/devtools_app_shared/test/test_utils.dart b/packages/devtools_app_shared/test/test_utils.dart
index 5a36b4e..29f61e0 100644
--- a/packages/devtools_app_shared/test/test_utils.dart
+++ b/packages/devtools_app_shared/test/test_utils.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 // NOTE: these helpers are duplicated from `package:devtools_test`. We copied
 // them instead of importing `devtools_test`, because `devtools_test` is not

diff --git a/packages/devtools_app_shared/test/ui/common_test.dart b/packages/devtools_app_shared/test/ui/common_test.dart
index 21f96b9..3898a73 100644
--- a/packages/devtools_app_shared/test/ui/common_test.dart
+++ b/packages/devtools_app_shared/test/ui/common_test.dart

@@ -4,8 +4,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../test_utils.dart';
 

diff --git a/packages/devtools_app_shared/test/ui/flex_split_column_test.dart b/packages/devtools_app_shared/test/ui/flex_split_column_test.dart
index 44d48a1..0ca388a 100644
--- a/packages/devtools_app_shared/test/ui/flex_split_column_test.dart
+++ b/packages/devtools_app_shared/test/ui/flex_split_column_test.dart

@@ -4,8 +4,8 @@
 
 import 'package:collection/collection.dart';
 import 'package:devtools_app_shared/src/ui/flex_split_column.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   group('FlexSplitColumn', () {

diff --git a/packages/devtools_app_shared/test/ui/split_pane_test.dart b/packages/devtools_app_shared/test/ui/split_pane_test.dart
index 2082752..567d3fe 100644
--- a/packages/devtools_app_shared/test/ui/split_pane_test.dart
+++ b/packages/devtools_app_shared/test/ui/split_pane_test.dart

@@ -6,8 +6,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../test_utils.dart';
 

diff --git a/packages/devtools_app_shared/test/ui/theme_test.dart b/packages/devtools_app_shared/test/ui/theme_test.dart
index c5ffa4d..07660ed 100644
--- a/packages/devtools_app_shared/test/ui/theme_test.dart
+++ b/packages/devtools_app_shared/test/ui/theme_test.dart

@@ -4,8 +4,8 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   setUpAll(() {

diff --git a/packages/devtools_app_shared/test/utils/utils_test.dart b/packages/devtools_app_shared/test/utils/utils_test.dart
index f342052..339077e 100644
--- a/packages/devtools_app_shared/test/utils/utils_test.dart
+++ b/packages/devtools_app_shared/test/utils/utils_test.dart

@@ -3,8 +3,8 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   group('pluralize', () {

diff --git a/packages/devtools_extensions/example/app_that_uses_foo/lib/main.dart b/packages/devtools_extensions/example/app_that_uses_foo/lib/main.dart
index 26fa27c..ebc165b 100644
--- a/packages/devtools_extensions/example/app_that_uses_foo/lib/main.dart
+++ b/packages/devtools_extensions/example/app_that_uses_foo/lib/main.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:dart_foo/dart_foo.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:foo/foo.dart';
 
 void main() {

diff --git a/packages/devtools_extensions/example/app_that_uses_foo/pubspec.yaml b/packages/devtools_extensions/example/app_that_uses_foo/pubspec.yaml
index cda6e2e..722e925 100644
--- a/packages/devtools_extensions/example/app_that_uses_foo/pubspec.yaml
+++ b/packages/devtools_extensions/example/app_that_uses_foo/pubspec.yaml

@@ -12,12 +12,14 @@
   flutter: '>=3.0.0'
 
 dependencies:
+  # ignore: dependencies, required for Flutter SDK.
   flutter:
     sdk: flutter
   dart_foo:
     path: ../packages_with_extensions/dart_foo/packages/dart_foo
   foo:
     path: ../packages_with_extensions/foo/packages/foo
+  material_ui: ^1.4.0
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/devtools_extensions/example/packages_with_extensions/dart_foo/packages/dart_foo_devtools_extension/lib/main.dart b/packages/devtools_extensions/example/packages_with_extensions/dart_foo/packages/dart_foo_devtools_extension/lib/main.dart
index 1ba9de6..6bc10f1 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/dart_foo/packages/dart_foo_devtools_extension/lib/main.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/dart_foo/packages/dart_foo_devtools_extension/lib/main.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_extensions/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   runApp(const DartFooDevToolsExtension());

diff --git a/packages/devtools_extensions/example/packages_with_extensions/dart_foo/packages/dart_foo_devtools_extension/pubspec.yaml b/packages/devtools_extensions/example/packages_with_extensions/dart_foo/packages/dart_foo_devtools_extension/pubspec.yaml
index e5e84eb..8e10c36 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/dart_foo/packages/dart_foo_devtools_extension/pubspec.yaml
+++ b/packages/devtools_extensions/example/packages_with_extensions/dart_foo/packages/dart_foo_devtools_extension/pubspec.yaml

@@ -17,8 +17,10 @@
     path: ../../../../../../devtools_app_shared
   devtools_extensions:
     path: ../../../../../../devtools_extensions 
+  # ignore: dependencies, required for Flutter SDK.
   flutter:
     sdk: flutter
+  material_ui: ^1.4.0
 
 flutter:
   uses-material-design: true

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo/lib/src/foo_widget.dart b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo/lib/src/foo_widget.dart
index 670e62a..be9542a 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo/lib/src/foo_widget.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo/lib/src/foo_widget.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'foo_controller.dart';
 

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo/pubspec.yaml b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo/pubspec.yaml
index d7a96fb..b23d888 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo/pubspec.yaml
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo/pubspec.yaml

@@ -12,6 +12,7 @@
 dependencies:
   flutter:
     sdk: flutter
+  material_ui: ^1.4.0
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/main.dart b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/main.dart
index 91f63ec..c41d449 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/main.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/main.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'src/foo_devtools_extension.dart';
 
 void main() {

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/common/ui.dart b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/common/ui.dart
index 73b5891..52bdc76 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/common/ui.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/common/ui.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// Header widget for each example section.
 class SectionHeader extends StatelessWidget {

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/devtools_event_example.dart b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/devtools_event_example.dart
index 41f14c2..0a90418 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/devtools_event_example.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/devtools_event_example.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_extensions/api.dart';
 import 'package:devtools_extensions/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// This widget shows an example of how you can register a custom event handler
 /// for any type of [DevToolsExtensionEventType].

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/devtools_extension_api_example.dart b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/devtools_extension_api_example.dart
index cc7cd06..3193608 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/devtools_extension_api_example.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/devtools_extension_api_example.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_extensions/api.dart';
 import 'package:devtools_extensions/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// This widget shows an example of how you can call public APIs exposed by
 /// [ExtensionManager].

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/dtd_example.dart b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/dtd_example.dart
index 1149022..34abdde 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/dtd_example.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/dtd_example.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_extensions/devtools_extensions.dart';
 import 'package:dtd/dtd.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:path/path.dart' as p;
 
 /// This widget shows an example of how you can call public APIs exposed by

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/expression_evaluation_example.dart b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/expression_evaluation_example.dart
index 837d4dc..4ad272c 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/expression_evaluation_example.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/expression_evaluation_example.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_extensions/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// A widget that shows an example of how to perform expression evaluations over
 /// the VM Service protocol.

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/service_extension_example.dart b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/service_extension_example.dart
index f82d677..e14e037 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/service_extension_example.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/feature_examples/service_extension_example.dart

@@ -11,7 +11,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_extensions/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// A widget that shows an example of how to call a service extension over the
 /// VM Service protocol.

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/foo_devtools_extension.dart b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/foo_devtools_extension.dart
index 16f2eaa..852fbcd 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/foo_devtools_extension.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/src/foo_devtools_extension.dart

@@ -4,7 +4,7 @@
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_extensions/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'common/ui.dart';
 import 'feature_examples/devtools_event_example.dart';

diff --git a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/pubspec.yaml b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/pubspec.yaml
index f7e2141..4d74da2 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/pubspec.yaml
+++ b/packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/pubspec.yaml

@@ -18,8 +18,10 @@
     path: ../../../../../../devtools_extensions 
   dtd: ^4.0.0
   path: ^1.8.0
+  # ignore: dependencies, required for Flutter SDK.
   flutter:
     sdk: flutter
+  material_ui: ^1.4.0
 
 flutter:
   uses-material-design: true

diff --git a/packages/devtools_extensions/example/packages_with_extensions/standalone_extension/lib/main.dart b/packages/devtools_extensions/example/packages_with_extensions/standalone_extension/lib/main.dart
index c4f399a..a59c303 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/standalone_extension/lib/main.dart
+++ b/packages/devtools_extensions/example/packages_with_extensions/standalone_extension/lib/main.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_extensions/devtools_extensions.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   runApp(const DartFooDevToolsExtension());

diff --git a/packages/devtools_extensions/example/packages_with_extensions/standalone_extension/pubspec.yaml b/packages/devtools_extensions/example/packages_with_extensions/standalone_extension/pubspec.yaml
index c58a4a8..bc39702 100644
--- a/packages/devtools_extensions/example/packages_with_extensions/standalone_extension/pubspec.yaml
+++ b/packages/devtools_extensions/example/packages_with_extensions/standalone_extension/pubspec.yaml

@@ -17,9 +17,11 @@
     path: ../../../../devtools_app_shared
   devtools_extensions:
     path: ../../../../devtools_extensions 
+  # ignore: dependencies, required for Flutter SDK.
   flutter:
     sdk: flutter
-
+  material_ui: ^1.4.0
+  
 flutter:
   uses-material-design: true
 

diff --git a/packages/devtools_extensions/integration_test/test/simulated_environment_test.dart b/packages/devtools_extensions/integration_test/test/simulated_environment_test.dart
index 7c50f4b..dc64aca 100644
--- a/packages/devtools_extensions/integration_test/test/simulated_environment_test.dart
+++ b/packages/devtools_extensions/integration_test/test/simulated_environment_test.dart

@@ -6,10 +6,10 @@
 import 'package:devtools_extensions/api.dart';
 import 'package:devtools_extensions/devtools_extensions.dart';
 import 'package:devtools_extensions/src/template/_simulated_devtools_environment/_simulated_devtools_environment.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:foo_devtools_extension/src/feature_examples/devtools_extension_api_example.dart';
 import 'package:integration_test/integration_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 // To run this test:
 // dart run integration_test/run_tests.dart --target=integration_test/test/simulated_environment_test.dart

diff --git a/packages/devtools_extensions/lib/src/template/_simulated_devtools_environment/_simulated_devtools_environment.dart b/packages/devtools_extensions/lib/src/template/_simulated_devtools_environment/_simulated_devtools_environment.dart
index f674c25..bd346da 100644
--- a/packages/devtools_extensions/lib/src/template/_simulated_devtools_environment/_simulated_devtools_environment.dart
+++ b/packages/devtools_extensions/lib/src/template/_simulated_devtools_environment/_simulated_devtools_environment.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:web/web.dart' hide Text, Clipboard;
 
 import '../../api/api.dart';

diff --git a/packages/devtools_extensions/lib/src/template/devtools_extension.dart b/packages/devtools_extensions/lib/src/template/devtools_extension.dart
index 5c9e43b..76bf9cb 100644
--- a/packages/devtools_extensions/lib/src/template/devtools_extension.dart
+++ b/packages/devtools_extensions/lib/src/template/devtools_extension.dart

@@ -14,8 +14,8 @@
 import 'package:devtools_shared/devtools_shared.dart';
 import 'package:devtools_shared/service.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:vm_service/vm_service.dart' hide Event;
 import 'package:web/web.dart' hide Text;
 

diff --git a/packages/devtools_extensions/pubspec.yaml b/packages/devtools_extensions/pubspec.yaml
index 4639c9c..66338ab 100644
--- a/packages/devtools_extensions/pubspec.yaml
+++ b/packages/devtools_extensions/pubspec.yaml

@@ -25,6 +25,7 @@
   io: ^1.0.4
   path: ^1.8.0
   logging: ^1.1.1
+  material_ui: ^1.4.0
   vm_service: '>=13.0.0 <16.0.0'
   web: ^1.0.0
   yaml: ^3.1.2

diff --git a/packages/devtools_shared/lib/src/extensions/extension_model.dart b/packages/devtools_shared/lib/src/extensions/extension_model.dart
index 4cb5b22..1f14661 100644
--- a/packages/devtools_shared/lib/src/extensions/extension_model.dart
+++ b/packages/devtools_shared/lib/src/extensions/extension_model.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 'package:flutter/material.dart';
+/// @docImport 'package:material_ui/material_ui.dart';
 library;
 
 import 'package:collection/collection.dart';

diff --git a/packages/devtools_test/lib/src/helpers/actions.dart b/packages/devtools_test/lib/src/helpers/actions.dart
index 39ed034..6bcc527 100644
--- a/packages/devtools_test/lib/src/helpers/actions.dart
+++ b/packages/devtools_test/lib/src/helpers/actions.dart

@@ -6,8 +6,8 @@
 
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import 'utils.dart';
 

diff --git a/packages/devtools_test/lib/src/helpers/finders.dart b/packages/devtools_test/lib/src/helpers/finders.dart
index 1b22b61..440ae86 100644
--- a/packages/devtools_test/lib/src/helpers/finders.dart
+++ b/packages/devtools_test/lib/src/helpers/finders.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:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 Finder findSubstring(String text) {
   return find.byWidgetPredicate((widget) {

diff --git a/packages/devtools_test/lib/src/helpers/wrappers.dart b/packages/devtools_test/lib/src/helpers/wrappers.dart
index a782b26..0a70c24 100644
--- a/packages/devtools_test/lib/src/helpers/wrappers.dart
+++ b/packages/devtools_test/lib/src/helpers/wrappers.dart

@@ -11,9 +11,9 @@
 import 'package:devtools_app/src/shared/primitives/query_parameters.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:meta/meta.dart';
 import 'package:provider/provider.dart';
 

diff --git a/packages/devtools_test/lib/src/integration_test/integration_test_utils.dart b/packages/devtools_test/lib/src/integration_test/integration_test_utils.dart
index 605df1e..6cd60eb 100644
--- a/packages/devtools_test/lib/src/integration_test/integration_test_utils.dart
+++ b/packages/devtools_test/lib/src/integration_test/integration_test_utils.dart

@@ -8,9 +8,9 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app/main.dart' as app;
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
+import 'package:material_ui/material_ui.dart';
 
 import '../helpers/actions.dart';
 import '../helpers/utils.dart';

diff --git a/packages/devtools_test/lib/src/mocks/generated_mocks_factories.dart b/packages/devtools_test/lib/src/mocks/generated_mocks_factories.dart
index f16f273..2da5cea 100644
--- a/packages/devtools_test/lib/src/mocks/generated_mocks_factories.dart
+++ b/packages/devtools_test/lib/src/mocks/generated_mocks_factories.dart

@@ -9,7 +9,7 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart' hide TimelineEvent;
 

diff --git a/packages/devtools_test/pubspec.yaml b/packages/devtools_test/pubspec.yaml
index 6e5d071..1162a7d 100644
--- a/packages/devtools_test/pubspec.yaml
+++ b/packages/devtools_test/pubspec.yaml

@@ -15,6 +15,8 @@
 
 dependencies:
   collection: ^1.15.0
+  # ignore: dependencies, required transitively by material_ui.
+  cupertino_ui: ^1.1.1
   dap: ^1.1.0
   devtools_app:
   devtools_app_shared:
@@ -27,6 +29,7 @@
     sdk: flutter
   integration_test:
     sdk: flutter
+  material_ui: ^1.4.0
   meta: ^1.9.1
   mockito: ^5.4.1
   path: ^1.8.0

diff --git a/pubspec.lock b/pubspec.lock
index a53662d..31b595d 100644
--- a/pubspec.lock
+++ b/pubspec.lock

@@ -193,6 +193,14 @@
       url: "https://pub.dev"
     source: hosted
     version: "3.0.7"
+  cupertino_ui:
+    dependency: transitive
+    description:
+      name: cupertino_ui
+      sha256: c23816577a1280cff409e989541767887011f8f1d8c1863a794ed308af46f2a9
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   dap:
     dependency: transitive
     description:
@@ -355,6 +363,11 @@
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  flutter_localizations:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_markdown:
     dependency: transitive
     description:
@@ -450,10 +463,10 @@
     dependency: transitive
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
+    version: "0.20.3"
   io:
     dependency: transitive
     description:
@@ -510,14 +523,6 @@
       url: "https://pub.dev"
     source: hosted
     version: "6.1.0"
-  listen:
-    dependency: transitive
-    description:
-      name: listen
-      sha256: "47501a08016a43fcad79252439d723f50f14f88fa7bfd8a177e0a417e5c9e1f2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
   logging:
     dependency: transitive
     description:
@@ -550,6 +555,14 @@
       url: "https://pub.dev"
     source: hosted
     version: "0.13.0"
+  material_ui:
+    dependency: transitive
+    description:
+      name: material_ui
+      sha256: "134ab2f0843545c4e661e4ba2753fe1bcf0753cb690d5a9ee4870638a40411e9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   meta:
     dependency: transitive
     description:
@@ -870,26 +883,26 @@
     dependency: transitive
     description:
       name: test
-      sha256: de5d145b0afff7921e5e788a880f52d7e5f3ae24068a202f6fd3b58e4ba26323
+      sha256: ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f
       url: "https://pub.dev"
     source: hosted
-    version: "1.32.0"
+    version: "1.31.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "0a10344e901e5b2e63819567951cb6a06673ed6b84f40462188ff5a0c41f371f"
+      sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.14"
+    version: "0.7.12"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "80f3fb49087454e07e7e07c67578cfdd156c8c3a5227d8b3f47c7b2d019c2e93"
+      sha256: d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.20"
+    version: "0.6.18"
   typed_data:
     dependency: transitive
     description:
@@ -974,10 +987,10 @@
     dependency: transitive
     description:
       name: vector_math
-      sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47
+      sha256: "92b9910f66ed1057fd4da7b040ae7c74cafacf885bdc81be496928d5049b032d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.3"
   vm_service:
     dependency: transitive
     description:
@@ -1083,5 +1096,5 @@
     source: hosted
     version: "2.2.4"
 sdks:
-  dart: ">=3.13.0-0 <4.0.0"
-  flutter: ">=3.44.0 <4.0.0"
+  dart: ">=3.13.0 <4.0.0"
+  flutter: ">=3.47.0 <4.0.0"

diff --git a/third_party/packages/widget_icons/example/lib/main.dart b/third_party/packages/widget_icons/example/lib/main.dart
index cc9c60e..3cc92dd 100644
--- a/third_party/packages/widget_icons/example/lib/main.dart
+++ b/third_party/packages/widget_icons/example/lib/main.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:widget_icons/widget_icons.dart';
 
 void main() {

diff --git a/third_party/packages/widget_icons/example/pubspec.yaml b/third_party/packages/widget_icons/example/pubspec.yaml
index 64a33c7..cef3b2b 100644
--- a/third_party/packages/widget_icons/example/pubspec.yaml
+++ b/third_party/packages/widget_icons/example/pubspec.yaml

@@ -9,10 +9,9 @@
 dependencies:
   flutter:
     sdk: flutter
-
+  material_ui: ^1.4.0
   widget_icons:
     path: ../
-
 dev_dependencies:
   flutter_test:
     sdk: flutter

diff --git a/third_party/packages/widget_icons/lib/widget_icons.dart b/third_party/packages/widget_icons/lib/widget_icons.dart
index 71cbfc8..d618ff2 100644
--- a/third_party/packages/widget_icons/lib/widget_icons.dart
+++ b/third_party/packages/widget_icons/lib/widget_icons.dart

@@ -4,7 +4,7 @@
 
 // ignore_for_file: constant_identifier_names
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/widgets.dart';
 
 class WidgetIcons {

diff --git a/third_party/packages/widget_icons/lib/widget_theme.dart b/third_party/packages/widget_icons/lib/widget_theme.dart
index 6980e73..f80f368 100644
--- a/third_party/packages/widget_icons/lib/widget_theme.dart
+++ b/third_party/packages/widget_icons/lib/widget_theme.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:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:widget_icons/widget_icons.dart';
 
 class WidgetTheme {

diff --git a/third_party/packages/widget_icons/pubspec.yaml b/third_party/packages/widget_icons/pubspec.yaml
index 0d7d600..6851a24 100644
--- a/third_party/packages/widget_icons/pubspec.yaml
+++ b/third_party/packages/widget_icons/pubspec.yaml

@@ -10,6 +10,7 @@
 dependencies:
   flutter:
     sdk: flutter
+  material_ui: ^1.4.0
 
 dev_dependencies:
   flutter_test: