Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnpryan wants to merge 15 commits into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
faee1d7
Apply dart fix "migrate_design_widgets" for decoupling migration.
johnpryan Sep 22, 2026
4c828c7
Update pubspec.lock
johnpryan Sep 22, 2026
cd191d6
Specify material_ui and cupertino_ui package versions
johnpryan Sep 22, 2026
1234304
Merge branch 'master' of github.com:flutter/devtools into material_mi…
johnpryan Sep 23, 2026
137cd11
Update devtools_app_shared
johnpryan Sep 23, 2026
4e695c5
Pin package versions, update all packages
johnpryan Sep 23, 2026
47a589b
Pin material_ui to ^1.4.0
johnpryan Sep 23, 2026
8e1f61c
Add cupertino_ui to devtools_test
johnpryan Sep 23, 2026
b56611c
Remove cupertino_ui from devtools_test
johnpryan Sep 23, 2026
e28fbc9
Add DCM ignore for Flutter SDK import in Flutter apps
johnpryan Sep 23, 2026
cbb5ffa
Run dart fix --apply on devtools_test
johnpryan Sep 23, 2026
72727b0
Update widget_icons package to material_ui
johnpryan Sep 23, 2026
9a4c69c
Sort imports using dart fix --apply
johnpryan Sep 23, 2026
58f3df5
Specify material_ui version in example
johnpryan Sep 23, 2026
a02624f
Add cupertino_ui to devtools_test with ignore: dependencies
johnpryan Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion packages/devtools_app/benchmark/test_infra/automators/_cpu_profiler_automator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/benchmark/test_infra/automators/_performance_automator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/benchmark/test_infra/automators/devtools_automator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/benchmark/test_infra/devtools_recorder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/integration_test/test/live_connection/debugger_panel_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/integration_test/test/live_connection/devtools_extensions_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/integration_test/test/live_connection/memory_screen_helpers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion ...ls_app/integration_test/test/live_connection/performance_screen_event_recording_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/integration_test/test/offline/perfetto_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/initialization.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/extensions/embedded/_view_desktop.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/extensions/embedded/_view_web.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/extensions/embedded/view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/extensions/extension_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/extensions/extension_screen_controls.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/extensions/extension_settings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/home_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/initializer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/notifications_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/observer/disconnect_observer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/observer/memory_observer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/release_notes.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/scaffold/about_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/scaffold/app_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/scaffold/bottom_pane.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/scaffold/report_feedback_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/scaffold/scaffold.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/scaffold/settings_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/framework/scaffold/status_line.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/accessibility/accessibility_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/accessibility/overrides_pane.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/accessibility/semantics_tree_pane.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/app_size/app_size_table.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/app_size/code_size_attribution.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/debugger/breakpoints.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/debugger/call_stack.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' hide Stack;
import 'package:material_ui/material_ui.dart' hide Stack;
import 'package:vm_service/vm_service.dart';

import '../../shared/globals.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/debugger/codeview.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import 'dart:math' as math;
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';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/debugger/common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/debugger/controls.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' 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;
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,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/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;
Expand Down
Loading
Loading