Skip to content

Commit 405689b

Browse files
authored
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
1 parent bd2f846 commit 405689b

421 files changed

Lines changed: 491 additions & 446 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import 'package:devtools_app/src/screens/profiler/panes/cpu_flame_chart.dart';
1010
import 'package:devtools_app/src/screens/profiler/panes/method_table/method_table.dart';
1111
import 'package:devtools_test/helpers.dart';
1212
import 'package:devtools_test/test_data.dart';
13-
import 'package:flutter/material.dart';
1413
import 'package:flutter_test/flutter_test.dart';
14+
import 'package:material_ui/material_ui.dart';
1515

1616
class CpuProfilerScreenAutomator {
1717
const CpuProfilerScreenAutomator(this.controller);

‎packages/devtools_app/benchmark/test_infra/automators/_performance_automator.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import 'package:devtools_app/devtools_app.dart';
88
import 'package:devtools_test/helpers.dart';
99
import 'package:devtools_test/test_data.dart';
10-
import 'package:flutter/material.dart';
1110
import 'package:flutter_test/flutter_test.dart';
11+
import 'package:material_ui/material_ui.dart';
1212

1313
class PerformanceScreenAutomator {
1414
const PerformanceScreenAutomator(this.controller);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import 'package:devtools_app/devtools_app.dart';
88
import 'package:devtools_test/helpers.dart';
99
import 'package:devtools_test/test_data.dart';
1010
import 'package:flutter/foundation.dart';
11-
import 'package:flutter/material.dart';
1211
import 'package:flutter_test/flutter_test.dart';
12+
import 'package:material_ui/material_ui.dart';
1313
import 'package:web_benchmarks/client.dart';
1414

1515
import '../common.dart';

‎packages/devtools_app/benchmark/test_infra/devtools_recorder.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:devtools_app/devtools_app.dart';
66
import 'package:devtools_app/initialization.dart';
77
import 'package:devtools_app_shared/utils.dart';
8-
import 'package:flutter/material.dart';
8+
import 'package:material_ui/material_ui.dart';
99
import 'package:web_benchmarks/client.dart';
1010

1111
import 'automators/devtools_automator.dart';

‎packages/devtools_app/benchmark/web_bundle_size_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import 'package:path/path.dart' as path;
1111
import 'package:test/test.dart';
1212

1313
// Benchmark size in kB.
14-
const bundleSizeBenchmark = 5800;
15-
const gzipBundleSizeBenchmark = 1700;
14+
const bundleSizeBenchmark = 6000;
15+
const gzipBundleSizeBenchmark = 1750;
1616

1717
void main() {
1818
group('Web Compile', () {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import 'package:devtools_app/src/screens/debugger/codeview.dart';
99
import 'package:devtools_app/src/service/service_extension_widgets.dart';
1010
import 'package:devtools_test/helpers.dart';
1111
import 'package:devtools_test/integration_test.dart';
12-
import 'package:flutter/material.dart';
1312
import 'package:flutter_test/flutter_test.dart';
1413
import 'package:integration_test/integration_test.dart';
14+
import 'package:material_ui/material_ui.dart';
1515

1616
// To run the test while connected to a flutter-tester device:
1717
// 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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import 'package:devtools_app_shared/ui.dart';
1919
import 'package:devtools_shared/devtools_extensions.dart';
2020
import 'package:devtools_test/helpers.dart';
2121
import 'package:devtools_test/integration_test.dart';
22-
import 'package:flutter/material.dart';
2322
import 'package:flutter_test/flutter_test.dart';
2423
import 'package:integration_test/integration_test.dart';
24+
import 'package:material_ui/material_ui.dart';
2525

2626
// To run:
2727
// 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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import 'package:devtools_app/src/framework/scaffold/bottom_pane.dart';
77
import 'package:devtools_app/src/screens/memory/panes/control/widgets/primary_controls.dart';
88
import 'package:devtools_app/src/screens/memory/panes/diff/widgets/snapshot_list.dart';
99
import 'package:devtools_test/helpers.dart';
10-
import 'package:flutter/material.dart';
1110
import 'package:flutter_test/flutter_test.dart';
11+
import 'package:material_ui/material_ui.dart';
1212

1313
/// Prepares the UI of the memory screen for an integration test.
1414
Future<void> prepareMemoryUI(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import 'package:devtools_app/devtools_app.dart';
66
import 'package:devtools_app/src/screens/performance/panes/timeline_events/timeline_events_view.dart';
77
import 'package:devtools_test/helpers.dart';
88
import 'package:devtools_test/integration_test.dart';
9-
import 'package:flutter/material.dart';
109
import 'package:flutter_test/flutter_test.dart';
1110
import 'package:integration_test/integration_test.dart';
11+
import 'package:material_ui/material_ui.dart';
1212
import 'package:vm_service_protos/vm_service_protos.dart';
1313

1414
// To run:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import 'package:devtools_app/src/screens/performance/panes/timeline_events/perfe
77
import 'package:devtools_test/helpers.dart';
88
import 'package:devtools_test/integration_test.dart';
99
import 'package:devtools_test/test_data.dart';
10-
import 'package:flutter/material.dart';
1110
import 'package:flutter_test/flutter_test.dart';
1211
import 'package:integration_test/integration_test.dart';
12+
import 'package:material_ui/material_ui.dart';
1313

1414
// To run:
1515
// dart run integration_test/run_tests.dart --target=integration_test/test/offline/perfetto_test.dart

0 commit comments

Comments
 (0)