Migrate from flutter/material.dart to material_ui/material_ui.dart

packages/devtools_app/benchmark/test_infra/automators/_cpu_profiler_automator.dart

@@ -10,8 +10,8 @@ import 'package:devtools_app/src/screens/profiler/panes/cpu_flame_chart.dart';
 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);

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);

packages/devtools_app/benchmark/test_infra/automators/devtools_automator.dart

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

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';

packages/devtools_app/benchmark/web_bundle_size_test.dart

@@ -11,8 +11,8 @@ import 'package:path/path.dart' as path;
 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', () {

packages/devtools_app/integration_test/test/live_connection/debugger_panel_test.dart

@@ -9,9 +9,9 @@ import 'package:devtools_app/src/screens/debugger/codeview.dart';
 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

packages/devtools_app/integration_test/test/live_connection/devtools_extensions_test.dart

@@ -19,9 +19,9 @@ import 'package:devtools_app_shared/ui.dart';
 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

packages/devtools_app/integration_test/test/live_connection/memory_screen_helpers.dart

@@ -7,8 +7,8 @@ import 'package:devtools_app/src/framework/scaffold/bottom_pane.dart';
 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(

packages/devtools_app/integration_test/test/live_connection/performance_screen_event_recording_test.dart

@@ -6,9 +6,9 @@ import 'package:devtools_app/devtools_app.dart';
 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:

packages/devtools_app/integration_test/test/offline/perfetto_test.dart

@@ -7,9 +7,9 @@ import 'package:devtools_app/src/screens/performance/panes/timeline_events/perfe
 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

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';

packages/devtools_app/lib/src/app.dart

@@ -12,7 +12,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/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 @@ class DevToolsAppState extends State<DevToolsApp> with AutoDisposeMixin {
             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,
+                ),
               ),
             ),
           ),

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';
 

packages/devtools_app/lib/src/extensions/embedded/_view_web.dart

@@ -10,7 +10,7 @@ import 'package:devtools_app_shared/utils.dart';
 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';

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;

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;

packages/devtools_app/lib/src/extensions/extension_screen_controls.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 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;

packages/devtools_app/lib/src/extensions/extension_settings.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 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;

packages/devtools_app/lib/src/framework/home_screen.dart

@@ -8,7 +8,7 @@ import 'package:devtools_app_shared/ui.dart';
 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';

packages/devtools_app/lib/src/framework/initializer.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 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;

packages/devtools_app/lib/src/framework/notifications_view.dart

@@ -6,8 +6,8 @@ import 'dart:async';
 
 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';

packages/devtools_app/lib/src/framework/observer/disconnect_observer.dart

@@ -7,7 +7,7 @@ import 'dart:async';
 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;

packages/devtools_app/lib/src/framework/observer/memory_observer.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 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;

packages/devtools_app/lib/src/framework/release_notes.dart

@@ -8,9 +8,9 @@ import 'dart:convert';
 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;

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;

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';

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';
 

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;

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';

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';

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;

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';

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';

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';

packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 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;

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';

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';